ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,624 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

152 Commits

Author SHA1 Message Date
Matthias Kretschmann 19173bc96d
add end of life component 2018-09-03 11:37:39 +02:00
Brett Sun d817b920b4 Use class to add overflow ellipsis instead of directly styling component 2015-12-23 10:20:56 +01:00
Brett Sun 441cf68fae Add initial print stylesheet overrides 2015-12-23 09:32:15 +01:00
Brett Sun 8687b393bf Add slight padding to bottom of app so it doesn't look cut off 2015-12-16 12:45:40 +01:00
Brett Sun 0084dbb8e4 Change piece filter text to be normal font-weight 2015-12-03 11:54:23 +01:00
Brett Sun 8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Tim Daubenschütz cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-22 13:38:49 +02:00
Tim Daubenschütz 61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
Tim Daubenschütz ba553455d2 Remove ascribe_scrollbar.scss 2015-10-21 10:56:24 +02:00
Tim Daubenschütz ca03fca14a Insert new information constants 2015-10-20 15:13:34 +02:00
Tim Daubenschütz 22a95f07fd Further cleanup 2015-10-20 15:10:18 +02:00
diminator f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +02:00
Tim Daubenschütz 702f1d29f3 Styling 2015-10-15 11:41:46 +02:00
Tim Daubenschütz a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-15 10:06:39 +02:00
diminator 317d2611ba spinners part2 
scrollbar

uploader styles

property blur
 2015-10-14 16:17:10 +02:00
diminator a457439347 sluice styling 2015-10-14 12:12:06 +02:00
Cevo b4b05b3161 information added to forms and delete form title changed, acl information component created, information text is added to the constants 2015-10-13 18:33:08 +02:00
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 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
Cevo 7b9424ca68 merging from master and resolving the conflicts in main.scss, master overrides 2015-09-29 11:59:18 +02:00
Cevo b6cfafc917 unused css class removed 2015-09-29 11:04:20 +02:00
Tim Daubenschütz df338ac746 Fix alignment for AclInformationButton 2015-09-29 10:31:13 +02:00
Cevo 661cb44b94 reached the spec with dirty tricks 2015-09-28 22:09:25 +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
vrde 6fd01b12a5 Fix mobile menu 2015-09-23 16:27:32 +02:00
vrde 1885440447 Landing now iterates over colors 2015-09-22 14:46:32 +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 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
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
Cevo 6a57a69e29 main.scss edited 2015-09-15 13:53:09 +02:00
Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
 2015-09-15 13:30:24 +02:00
Tim Daubenschütz f42f4a02f8 Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading 
Resolve merge conflicts with master for easier PR.

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-09-14 11:14:02 +02:00
diminator 6013303bd6 Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra 
Conflicts:
	js/components/ascribe_buttons/button_submit_close.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	sass/ascribe_media_player.scss
	sass/main.scss
 2015-09-10 17:45:51 +02:00
Tim Daubenschütz 801227cfee remove react-progress-bar for react-bootstrap progressbar 2015-09-09 14:11:52 +02:00
diminator 22aa0139ae terms and conditions page with accept/deny 
Needed: copyright societies in backend
 2015-09-07 12:03:59 +02:00
vrde 2f5c70eceb Remove unused ButtonSubmitOrClose and styles 2015-09-02 17:36:01 +02:00
diminator 92971a9f62 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 
Conflicts:
	sass/ascribe_accordion_list.scss
 2015-09-02 10:50:33 +02:00
diminator bfaf4886a4 notifications unoptimized 2015-09-01 14:45:14 +02:00
Tim Daubenschütz b5b1e36109 nested collapsible paragraphs 2015-09-01 14:00:06 +02:00
vrde d2adc7a388 Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss 
Conflicts:
	sass/main.scss
 2015-08-31 19:09:09 +02:00
vrde 99af814492 Lint scss 2015-08-31 19:04:47 +02:00
vrde 3f34fc680e Get rid of ascribe-btn-gray 2015-08-28 16:40:54 +02:00