1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Commit Graph

283 Commits

Author SHA1 Message Date
diminator
8d970a65c4 spinners in forms
button wide
2015-10-12 17:55:02 +02:00
diminator
aa7c4a57e5 refactored property from settings 2015-10-12 15:34:06 +02:00
diminator
aaa1a9a000 replaced fonts
replaced spinners WIP

renamed settings-property to property
2015-10-12 15:25:21 +02:00
diminator
790bf595d9 glyphs, spinner, piece list/edition table 2015-10-09 16:21:26 +02:00
diminator
dc8599830b updated glyphs, accordion pieces ok 2015-10-09 13:14:29 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
diminator
b7aaa9a4cf collection page + footer 2015-10-08 20:26:29 +02:00
diminator
71988d502d ascribe fonts
first cut layout

spinner
2015-10-08 11:12:15 +02:00
vrde
7a47cf0bfe WIP, preparing styles for the new corporate identity 2015-09-30 18:58:21 +02:00
Tim Daubenschütz
99d29449a3 style 404 page 2015-09-30 10:44:38 +02:00
Tim Daubenschütz
6a5b66bda5 fix alignment of download button and file type in fineuploader 2015-09-28 17:25:45 +02:00
Tim Daubenschütz
cb9acf71f4 Contract settings: break contract name on any character 2015-09-28 15:35:35 +02:00
Tim Daubenschütz
5b9d7eae65 Corrections on loan form 2015-09-28 15:14:45 +02:00
Tim Daubenschütz
40777cfeae Center dialog text for hashing files in file_drag_and_drop 2015-09-28 10:07:17 +02:00
Tim Daubenschütz
cfab59c027 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-25 16:23:22 +02:00
Tim Daubenschütz
f2b4c23bd7 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
	js/routes.js
2015-09-25 16:23:01 +02:00
Tim Daubenschütz
9080c84fa9 Implement word wrap for ContractSettings 2015-09-25 11:20:12 +02:00
vrde
6fd01b12a5 Fix mobile menu 2015-09-23 16:27:32 +02:00
TimDaubenschuetz
93e61cfff5 Merged in AD-943-add-custom-additional-fields (pull request #60)
Ad 943 add custom additional fields
2015-09-23 14:16:16 +02:00
TimDaubenschuetz
6e09d5bc16 Merged in AD-1049-fix-form-borders (pull request #78)
Fix form borders
2015-09-22 17:21:12 +02:00
vrde
172b5b7c5b Fix form borders 2015-09-22 17:11:38 +02:00
Tim Daubenschütz
1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
TimDaubenschuetz
dfc75824de Merged in AD-1045-revamp-flashy-landing-page (pull request #76)
Landing now iterates over colors
2015-09-22 15:18:19 +02:00
TimDaubenschuetz
30f2d75cb4 Merged in AD-1032-style-progress-and-notifications (pull request #74)
Add style for notification
2015-09-22 15:17:46 +02:00
vrde
259f4b10e3 Style progress bar 2015-09-22 15:13:48 +02:00
vrde
69f0753fc7 Fix color for "open" status for .btn-default 2015-09-22 15:02:36 +02:00
vrde
1885440447 Landing now iterates over colors 2015-09-22 14:46:32 +02:00
vrde
d4f637aa8a Add color for disabled buttons 2015-09-22 13:44:19 +02:00
Tim Daubenschütz
bd5aa266b1 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-22 13:38:31 +02:00
vrde
c7321359c9 Add style for notification 2015-09-22 13:37:31 +02:00
Tim Daubenschütz
a0ff5af62b Make style changes 2015-09-22 11:33:59 +02:00
vrde
865c21557c Add style for buttons 2015-09-21 16:23:18 +02:00
vrde
d0c46d4ca2 Fix hover/focus status on hambuger icon 2015-09-21 14:58:07 +02:00
vrde
9444cfb1bf Add styles for header 2015-09-21 14:53:58 +02:00
vrde
dd965653d6 Add style to loading button 2015-09-18 16:00:39 +02:00
vrde
7be3c8b469 Add style for signup and login 2015-09-18 15:36:01 +02:00
TimDaubenschuetz
4f55c63cf5 Merged in AD-997-prepare-landing-page (pull request #67)
Finish styling for landing page
2015-09-18 14:54:11 +02:00
vrde
03803ca61a Add active routes as css classes 2015-09-18 14:25:31 +02:00
vrde
c99c3492fb Add margin top to ascribe-wallet-app class 2015-09-18 14:02:31 +02:00
vrde
b76ffcde73 Finish styling for landing page 2015-09-18 13:46:15 +02:00
Tim Daubenschütz
a96aa1005f Make PieceListToolbar filters generic 2015-09-16 23:36:21 +02:00
Tim Daubenschütz
48508d5756 Implement filter display for piece list 2015-09-16 21:21:30 +02:00
Tim Daubenschütz
5c49fd6f14 implement ikonotv landing page according to mockups 2015-09-16 18:31:46 +02:00
Tim Daubenschütz
f16a012771 Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract
Sync with master

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-16 13:45:24 +02:00
Tim Daubenschütz
83b20e6472 First cut: Upload button for contract settings 2015-09-15 16:35:45 +02:00
Cevo
dceb087f20 q
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-09-15 14:06:44 +02:00
Cevo
8294016ebb main.scss edited 2015-09-15 14:04:16 +02:00
Tim Daubenschütz
497a330e1a Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 13:56:31 +02:00
Cevo
6a57a69e29 main.scss edited 2015-09-15 13:53:09 +02:00
Tim Daubenschütz
fbbbd1de89 Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
Fix merge conflicts

Conflicts:
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
	js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +02:00