Commit Graph

649 Commits (bcc1abed009a4350b5116e94050c71ea28b424c0)

Author SHA1 Message Date
Andromeda Yelton 17a9847b66 segregating learn_more area css fully into learnmore.less 2013-03-28 10:38:57 -04:00
Andromeda Yelton af0d42b9ff removed unused sharing features 2013-03-27 15:06:28 -04:00
Andromeda Yelton eab5aa72bc images needed for as seen on section 2013-03-27 10:34:00 -04:00
Andromeda Yelton 5c2b639e98 as seen on section 2013-03-27 10:33:47 -04:00
Andromeda Yelton 6e801e6841 adding bookish activity to main content area 2013-03-26 14:55:50 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
eric c26f9e1505 merge from master 2013-03-22 16:39:23 -04:00
Andromeda Yelton e4a39647b9 expand and rename who's ungluing what area 2013-03-22 15:47:03 -04:00
Andromeda Yelton 750ced0686 Merge branch 'improve_registration' of github.com:Gluejar/regluit into improve_registration
Conflicts:
	static/css/book_panel.css
	static/css/registration2.css
2013-03-22 11:25:06 -04:00
Andromeda Yelton edb174fc96 Merge branch 'master' into improve_registration
Conflicts:
	frontend/templates/pledge_complete.html
	static/css/sitewide2.css
2013-03-22 11:22:23 -04:00
thatandromeda 543adf2bc4 Merge pull request #144 from Gluejar/fix_bookpanel_button
Fix bookpanel read it now button [#45869489]
2013-03-22 07:48:56 -07:00
eric a5a000ef7f triple sign-in form when non-logged-in user tries to pledge 2013-03-21 14:24:11 -04:00
eric cc48ef8362 merge from master 2013-03-21 08:44:43 -04:00
eric 6de3b806a6 change name of book_panel stylesheet to force reload on deployment 2013-03-19 14:53:11 -04:00
eric b2327e5094 use .one-border-radius 2013-03-19 13:15:50 -04:00
eric af8c3ff1fd merge from master 2013-03-19 10:02:06 -04:00
eric e2ab3d75a8 Big merge from master 2013-03-19 09:40:18 -04:00
eric bd9a746422 merge in master 2013-03-18 21:50:22 -04:00
eric 26848b1774 Nudge up the button text size AMAP 2013-03-18 17:04:00 -04:00
thatandromeda f3b48fa9a9 Merge pull request #142 from Gluejar/fix_stripe_spinny_thing
one line js fix to stop the spinny thing when stripe reports an error
2013-03-15 12:55:41 -07:00
Andromeda Yelton dc8dea0768 moving countdown out of context to models.py, standardizing button appearance 2013-03-15 15:51:17 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
Andromeda Yelton 2da23dbd64 Merge branch 'master' into work_page_CTAs
Conflicts:
	frontend/templates/work.html
	frontend/views.py
	static/css/campaign.css
2013-03-12 15:59:24 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
Andromeda Yelton fae6c8f3a9 reverting to earlir add-wishlist functionality 2013-03-12 14:48:20 -04:00
eric 57ebbc087e merge master into work_page_CTAs 2013-03-11 22:39:48 -04:00
eric 4e8f1b2fdc reshuffle back of bookpanel to allow front bottom buttons to be clicked 2013-03-11 15:38:04 -04:00
eric 303c53c82e While I'm looking at this, make the cvc input a password [#41678953] 2013-03-08 18:50:35 -05:00
eric 800d0ffdeb cleanup of css and js imports, also mapping 2013-03-08 14:16:24 -05:00
eric 62627a80cf fix "next" behavior, poor sign-up/pledge flow [#40841931]
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
eric 90d15b5c9b modify .errorlist style to round both corners- more flexible 2013-03-07 21:54:32 -05:00
eric 339d4653ab migrate and clean urls 2013-03-07 21:53:32 -05:00
eric 80536a491a superlogin- failed logins check for socialauth and if so, as user to use it
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
eric 2153a6c589 added hover to message icon, moved css and js to files 2013-03-04 23:25:22 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric 989fff8926 Added unglue.it search at top of search page [finish #37199475] 2013-03-01 12:07:15 -05:00
Andromeda Yelton 7e6efeda7c pledge buttons have embiggened border and color change on hover 2013-02-18 12:08:35 -05:00
Andromeda Yelton f674278b02 mouseover shows exact percent of goal 2013-02-18 11:58:38 -05:00
eric f23ad3a9cb oh, so that's how this works! [fix #44116341] 2013-02-08 18:21:16 -05:00
Andromeda Yelton 61b2859a02 testing all the edge cases and editing accordingly 2013-02-08 15:55:43 -05:00
Andromeda Yelton ffe4ea2943 needs to bind to actions on big green button. also, streamliniing 2013-02-08 15:55:28 -05:00
Andromeda Yelton a060cf0f51 improving gradient 2013-02-07 14:10:00 -05:00
Andromeda Yelton cf58570c2e moving informational and call-to-action elements of work page 2013-02-07 13:37:54 -05:00
Andromeda Yelton 145ba865db fade back in feedback div, streamline syntax, make sure to bind to hijax links in footer too 2013-02-07 09:10:46 -05:00
Andromeda Yelton c761d5819d first pass at moving big button 2013-02-06 16:26:07 -05:00
Andromeda Yelton 1afdd5e21f bugfixing 2013-02-04 12:09:38 -05:00
Andromeda Yelton b952bbb897 now can bind to download links not present at page creation, so needs delegated event handling 2013-02-04 12:09:29 -05:00
Andromeda Yelton 8c07df1fb1 making load of books ajaxy to spare reload of rest of page 2013-02-04 11:28:58 -05:00
eric 028e16866c resolve conflicts for merge master into libraries 2013-01-24 17:08:40 -05:00
Andromeda Yelton b895b86d21 libraries page has content 2013-01-21 12:02:35 -05:00
Andromeda Yelton 95ae064e81 also need some content 2013-01-21 10:33:25 -05:00
Andromeda Yelton a870408d68 we need this in the refactor too 2013-01-16 13:42:39 -05:00
Andromeda Yelton ed28106a1e factoring out some shared css 2013-01-16 13:08:37 -05:00
Andromeda Yelton e00b43870c it would be great if the embed thing actually worked 2013-01-16 13:08:21 -05:00
Andromeda Yelton 5fb880c9da sharing options on download page 2013-01-16 12:50:20 -05:00
thatandromeda db8977ca16 Merge pull request #107 from Gluejar/book_panel_nits
Book panel nits
2013-01-10 06:36:56 -08:00
Andromeda Yelton 9b2928bd0a moar tutorials 2013-01-09 13:07:03 -05:00
Andromeda Yelton 869d89b7ad for coordinating Less settings 2013-01-04 16:18:51 -05:00
Andromeda Yelton 6285f3e286 why were these not minified 2013-01-03 16:33:35 -05:00
Andromeda Yelton 8ec5f7e2a2 one more tutorial while I'm at it 2013-01-03 13:58:17 -05:00
Andromeda Yelton c2bc4f6b68 tidying visibly wrong things 2013-01-02 16:10:32 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
Andromeda Yelton 0a86448d98 addressing CSS comments and also fixing some invalid html
Conflicts:

	frontend/templates/unglued_list.html
	static/css/book_panel.css
	static/css/lists.css
	static/less/lists.less
2013-01-02 15:51:21 -05:00
Andromeda Yelton b7ae54948e line up icons better and more clearly indicate status of books with successful campaigns
Conflicts:

	frontend/templates/book_panel.html
	static/css/book_panel.css
2013-01-02 15:50:13 -05:00
Andromeda Yelton 4ac487a7c9 unwinding useful changes from discarded two-tab model 2013-01-02 15:48:49 -05:00
Andromeda Yelton 26b2f0c00f Merge branch 'master' into list_tab_vertical_centering 2013-01-02 15:36:10 -05:00
Andromeda Yelton cc4f748e36 update all list pages to have two-line tab content 2013-01-02 15:35:42 -05:00
eshellman a6186e3bc6 Merge pull request #90 from Gluejar/prettier_acks
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
eric e305a1ee74 Merge branch 'master' into prettier_acks 2013-01-02 10:53:05 -05:00
Andromeda Yelton 4c1b64c154 update successful books in unglued tab on other tabbed pages 2012-12-31 14:57:01 -05:00
Andromeda Yelton 83d3e5ba82 position lightbox relative to top of viewport, allow for scrolling 2012-12-31 09:49:09 -05:00
Andromeda Yelton 7a0e2bfbd8 addressing ul, li, dt, dd comments 2012-12-19 10:22:11 -05:00
Andromeda Yelton 4a307a1e00 addressing CSS comments and also fixing some invalid html 2012-12-17 14:23:23 -05:00
Andromeda Yelton ab2d3d51b6 Merge branch 'master' into unglued_books_tab 2012-12-14 10:46:11 -05:00
Andromeda Yelton 73266f07eb line up icons better and more clearly indicate status of books with successful campaigns 2012-12-14 10:45:16 -05:00
Andromeda Yelton b001aefeeb separating unglued and PD works on ready-to-read page 2012-12-13 15:25:01 -05:00
Andromeda Yelton 658783306c Merge branch 'master' into prettier_acks
Conflicts:
	frontend/templates/front_matter.html
2012-12-11 13:18:57 -05:00
Andromeda Yelton f2b715f3e8 syntax error 2012-12-11 13:06:45 -05:00
Andromeda Yelton 3dfc81dd5e fix [#40374577] 2012-11-30 12:28:45 -05:00
Andromeda Yelton 37bc427a75 prettifying acks page, make it easier to read 2012-11-30 10:20:13 -05:00
Andromeda Yelton 6098940970 this should have made it in to the loader graphic branch and didn't somehow... 2012-11-29 10:54:28 -05:00
Andromeda Yelton 1cd50d716f display submit buttons as loading gifs for transactions that might take a while 2012-11-27 13:32:25 -05:00
eric 54a8a31c8c Merge branch 'master' into pledge_sidebar 2012-11-21 17:00:33 -05:00
eric e1c2862f1a prevent line break in user_menu 2012-11-21 16:58:10 -05:00
Andromeda Yelton b615a7598d fix CSS in case of short usernames 2012-11-20 16:05:52 -05:00
Andromeda Yelton 7fcd0ba3af change css filenames so that we can force user refresh 2012-11-20 14:26:06 -05:00
Andromeda Yelton a2abb92038 makes pledge action clearer by describing in more contexts and using Pledge rather than Support 2012-11-20 09:56:04 -05:00
Raymond Yee 570394aa3d Merge pull request #81 from Gluejar/clarify_acks_more
Clarify acks more -- looks good
2012-11-19 10:17:11 -08:00
Andromeda Yelton b6fa40a281 fixing errors in display of underlying page elements when lightboxed 2012-11-19 13:03:21 -05:00
Andromeda Yelton e5edbd1897 all a font sizes should now be inherited 2012-11-19 11:23:44 -05:00
Andromeda Yelton 5af0adcc01 desuckify other line spacing 2012-11-16 15:54:05 -05:00
Andromeda Yelton 34fad5bc11 increase line spacing for things with lots of text 2012-11-16 15:48:58 -05:00
Andromeda Yelton 1ff7b5be58 standardize appearance of login/account forms 2012-11-16 15:47:19 -05:00
Andromeda Yelton bc56a1b56b making signin box prettier 2012-11-14 10:32:03 -05:00
Andromeda Yelton 5056396b86 addressing comments, checking all /accounts/ urls for styling 2012-11-12 10:39:33 -05:00
Andromeda Yelton 2dc20d18ec Merge branch 'master' into hijaxify_signin 2012-11-12 10:10:59 -05:00
Andromeda Yelton 097241493c separating out rest of hijax vs non-hijax styling 2012-11-07 15:56:37 -05:00
Andromeda Yelton c5ed14b6dc further rectifying css 2012-11-07 15:34:10 -05:00
Andromeda Yelton 67ab8a8729 embiggening google signin 2012-11-07 15:11:13 -05:00
Andromeda Yelton 0e0b81808c prettifying google signup handling 2012-11-07 15:03:27 -05:00
Andromeda Yelton d9905df303 first pass at hijaxifying signin link 2012-11-07 14:58:40 -05:00
Andromeda Yelton affa8239c3 more prettifying 2012-11-07 13:45:19 -05:00
Andromeda Yelton 929c4d1a13 now the nav menu is prettier 2012-11-07 13:40:05 -05:00
Andromeda Yelton 304ddb6bdc add badge to avatar when there are unseen notifications 2012-11-06 10:06:10 -05:00
Andromeda Yelton 2d4740f037 round user avatar corners sitewide, not just on pages with supporter layout 2012-11-06 09:53:56 -05:00
Andromeda Yelton 30b4381cf0 don't set font size for a if you want it to inherit 2012-11-06 09:36:09 -05:00
Andromeda Yelton 9b1b968ac2 font-size: inherit, it is the best 2012-11-06 09:34:50 -05:00
Andromeda Yelton f4505ca561 embiggen header font 2012-11-06 09:30:41 -05:00
thatandromeda 1a83b6cfc4 Merge pull request #73 from Gluejar/clarify_acknowledgements
Clarify acknowledgements
2012-10-24 09:14:12 -07:00
thatandromeda 08e49036d1 Merge pull request #74 from Gluejar/fix_nav_menu
Fix nav menu
2012-10-24 09:13:43 -07:00
Andromeda Yelton 89b92b4dba add acknowledgements to support menu 2012-10-24 11:25:17 -04:00
Andromeda Yelton a8727c6612 css tweaks 2012-10-19 16:29:37 -04:00
Andromeda Yelton 104992612b first pass at making things visually distinct if there are notifications 2012-10-19 15:01:06 -04:00
Andromeda Yelton 1bf4743667 making notifications prettier 2012-10-19 12:19:56 -04:00
Andromeda Yelton 11aac359e6 adding drop-down menu 2012-10-19 12:01:28 -04:00
Andromeda Yelton 15367a8b54 syntax error 2012-10-19 12:01:18 -04:00
Andromeda Yelton 17bfb3c58c remove no-longer=used ack_link, get data from form values 2012-10-18 14:17:11 -04:00
Andromeda Yelton 02145b22b5 feedback button obscures useful things like profile add, is less important now anyway 2012-10-16 10:20:58 -04:00
Andromeda Yelton 82e0e17017 stopgap for [#37714043] 2012-10-14 15:20:55 -04:00
Andromeda Yelton 1a5d28369b this was only meant to hit input textboxes, not submit button 2012-10-14 11:36:31 -04:00
eric 82a35d0ec2 simplified reconcile_pledge javascript a bit
I went over this with a fine-tooth comb looking for a bug that wasn't
there
2012-10-12 22:31:18 -04:00
Andromeda Yelton dd7334b54b explanation of CVC [#36797599] 2012-10-12 14:57:38 -04:00
Andromeda Yelton f98fc0b7a6 widening CC number box, rounding all corners on error display [#36797599] 2012-10-12 14:23:54 -04:00
Andromeda Yelton cc4c190d73 adding address collection to fund_the_pledge 2012-10-11 13:49:56 -04:00
Andromeda Yelton 6893b549a2 first pass at adding address collection 2012-10-10 14:23:02 -04:00
Andromeda Yelton 839ce0496f Merge branch 'master' into collect_address_info
Conflicts:
	static/css/sitewide.css
	static/less/sitewide.less
2012-10-10 10:26:48 -04:00
Andromeda Yelton 5b1f673a6f deactivate pledge box, handle nonprofit.is_on better 2012-10-09 16:11:57 -04:00
Andromeda Yelton 2bea7e89f4 Merge branch 'master' into pledge_pretty_stick
Conflicts:
	frontend/templates/pledge.html
	static/css/pledge.css
	static/less/pledge.less
2012-10-05 15:06:37 -04:00
Andromeda Yelton 920f856bcd prettifying 2012-10-05 15:05:15 -04:00
thatandromeda b9ac8523d2 Merge pull request #36 from Gluejar/new_rh_instructions
New rh instructions
2012-10-05 09:20:31 -07:00
Andromeda Yelton bc87b559fc adding value to pledge box by clicking on premium needs to also activate acknowledgements 2012-10-05 12:00:20 -04:00
Andromeda Yelton dc268bd217 if pledge box is empty, clicking on nontrivial pledge will fill [#36325899] 2012-10-05 11:53:58 -04:00
Andromeda Yelton 487724dc91 improving campaign launch instructions 2012-10-05 11:30:49 -04:00
Andromeda Yelton 5ca4d5c4c8 improving layout of premium addition 2012-10-04 12:08:40 -04:00
Andromeda Yelton e99a88c103 Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges 2012-10-03 16:28:51 -04:00
eric d439106cf4 badge outline to thin gray 2012-10-03 16:20:43 -04:00
Andromeda Yelton 4ea8dbdfac anonymity needs to adhere to whole pledge and be communicated clearly regardless of amount if we're doing badges 2012-10-03 16:02:51 -04:00
Andromeda Yelton 2cdb945812 finishing new layout 2012-10-03 13:44:33 -04:00
Andromeda Yelton 757a3469b5 let's use css for borders 2012-10-03 13:15:46 -04:00
eric 113148d6a9 swapped badges, deleted empty badge, added title to edit icon 2012-10-03 12:17:23 -04:00
Andromeda Yelton ae857b3c8f restyle badges and edit profile function 2012-10-03 10:59:57 -04:00
eric deb67de0b8 Revert "try this placement of the star"
This reverts commit e4cccc277f.
2012-10-03 08:57:35 -04:00
Andromeda Yelton e4cccc277f try this placement of the star 2012-10-02 14:17:26 -04:00
Andromeda Yelton 2371aad994 update FAQ to reflect new payment system 2012-10-02 09:18:44 -04:00
Andromeda Yelton d54f45d511 further aesthetic refinements 2012-10-01 15:53:41 -04:00
eric 33e652881c Merge branch 'master' into pledged_badges 2012-10-01 15:38:52 -04:00
Andromeda Yelton 6a6045e9ab first pass at prettifying stripe process 2012-10-01 15:31:17 -04:00
eric bf212ed165 prettier stars matching site colors 2012-10-01 15:10:45 -04:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch
Relaunch
2012-09-28 07:55:07 -07:00
eshellman f327db6efd Merge pull request #19 from Gluejar/improvify_download_page
Improvify download page with readmill [finish #36156381]
2012-09-26 13:04:39 -07:00