Commit Graph

6104 Commits (foundationworkpage)

Author SHA1 Message Date
jonahmania 55d63dc984 Add basic menu 2018-02-13 12:25:00 -05:00
jonahmania 28151eaa2d Update header layout 2018-02-07 23:56:59 -05:00
Jonah Mania 8af37b8d2f
Merge pull request #54 from EbookFoundation/book-breakpoint
Use breakpoint mixin on book page
2018-02-06 14:48:45 -05:00
Nicholas Antonov c99b19fe72 Fix breakpoints 2018-02-06 14:47:44 -05:00
Nicholas Antonov a334a718ef
Merge pull request #57 from EbookFoundation/removeFoundationDocs
Remove extra docs
2018-02-06 13:42:28 -05:00
jonahmania e6a8662412 Remove extra docs 2018-02-06 13:34:59 -05:00
Nicholas Antonov bddb9eafb8
Merge pull request #56 from EbookFoundation/foundationworkpage
Foundationworkpage
2018-02-06 13:26:10 -05:00
Jonah Mania af3a2e5a8b
Merge pull request #55 from EbookFoundation/start-script
Add script to start server
2018-02-06 13:18:21 -05:00
jonahmania a16e82e0f5 Merge branch 'newfoundation' into foundationworkpage 2018-02-06 13:16:30 -05:00
jonahmania 29dceb1a64 Add rights information 2018-02-06 13:15:43 -05:00
Nicholas Antonov 021d04304e Add script to start server 2018-02-06 13:00:37 -05:00
jonahmania 29d8858c21 merge newfoundation 2018-02-01 00:14:38 -05:00
Jonah Mania bb85948fe6
Merge pull request #52 from EbookFoundation/worklayout
fix comments centering
2018-02-01 00:12:19 -05:00
Nicholas Antonov ec3d63655a fix comments centering 2018-02-01 00:01:38 -05:00
Jonah Mania 40a4897c4a
Merge pull request #51 from EbookFoundation/worklayout
Worklayout
2018-01-31 23:05:08 -05:00
Nicholas Antonov 995e54109d Center book text 2018-01-31 22:55:57 -05:00
Nicholas Antonov 7b27fcebfb Fix booksidebar 2018-01-31 22:40:09 -05:00
Nicholas Antonov 156f21b02c
Merge pull request #50 from EbookFoundation/styleboys
Styleboys
2018-01-30 16:41:40 -05:00
jonahmania 0cdfddf061 Merge newfoundation 2018-01-30 16:17:56 -05:00
Jonah Mania 87d5ffff0a
Merge pull request #49 from EbookFoundation/addfoundation
Addfoundation
2018-01-30 15:41:36 -05:00
Nicholas Antonov d2ef78038d Commit foundation files 2018-01-30 15:36:03 -05:00
jonahmania 2edb1e5911 Add styles 2018-01-30 15:31:51 -05:00
Nicholas Antonov f56a26d142 Merge remote-tracking branch 'origin/addfoundation' into addfoundation 2018-01-30 14:39:11 -05:00
Nicholas Antonov e85eb85b9c remove submodule directory 2018-01-30 14:38:43 -05:00
jonahmania 9db0941bb4 Fix merge conflict 2018-01-30 14:16:37 -05:00
jonahmania a82571a1f3 Made reactive grid 2018-01-30 14:12:28 -05:00
Jonah Mania 5948d33d20
Merge pull request #47 from EbookFoundation/addfoundation
Add all foundation styles
2018-01-30 14:01:35 -05:00
Nicholas Antonov 08e09b7653
readd campaign css 2018-01-30 14:00:49 -05:00
Nicholas Antonov 47f81b141a Include all of foundation 2018-01-30 13:48:53 -05:00
jonahmania 6924640596 Add book side bar 2018-01-30 13:02:49 -05:00
Nicholas Antonov 5d51759a92 add files (imports fail) 2018-01-30 12:40:50 -05:00
jonahmania 72ed2c2804 Add basic grid layout 2018-01-24 17:21:42 -05:00
Nicholas Antonov 7438b5c217 Fix names and add scss for work page 2017-12-07 16:55:16 -05:00
Nicholas Antonov 893d8abc4a Make django scss preprocessor work 2017-12-07 16:33:10 -05:00
Nicholas Antonov 894f2d282f Ignore maps as well 2017-12-07 16:31:27 -05:00
Nicholas Antonov 551b7c27e1 ignore scss generated by transpiler 2017-12-07 16:30:27 -05:00
Nicholas Antonov aa87776948 Add requirements without versions 2017-12-05 18:51:34 -05:00
Nicholas Antonov 9513514beb Start adding sass preprocessor 2017-12-05 18:46:18 -05:00
eshellman 9eebb833ef
Merge pull request #45 from EbookFoundation/ignore-celerybeat-schedule
Ignore celerybeat schedule
2017-11-13 09:56:50 -05:00
Nicholas Antonov 198dadd952 Ignore celerybeat schedule 2017-11-10 19:08:21 -05:00
John Kelly 56645495e9
Merge pull request #44 from EbookFoundation/fixReadme
Fix package names in readme
2017-11-10 16:21:45 -05:00
jonahmania 77898be7b4 Fix package names in readme 2017-11-10 16:08:11 -05:00
John Kelly b87918a6ab
Merge pull request #43 from Gluejar/master
always good to keep dev branches from diverging too much
2017-11-01 20:00:23 -04:00
eshellman 52c9632f53
Merge pull request #714 from Gluejar/edit-bugs
fix bugs in edition and ebook edit
2017-10-30 21:14:30 -04:00
eric a345566680 add file input handling to filetype js 2017-10-30 21:13:38 -04:00
eric d04ebbb694 also add http ids 2017-10-30 19:52:21 -04:00
eric b4184b4ddc also save the work title 2017-10-30 19:23:11 -04:00
eshellman 9216f40356
Merge pull request #713 from EbookFoundation/master
Master
2017-10-30 12:57:45 -04:00
eshellman 74216ed45c
Merge pull request #42 from EbookFoundation/jkelly/update-devpy
Change dev.py defaults and update README
2017-10-30 12:51:51 -04:00
John Kelly 4a617363fe Change defaults in dev.py to use mysql and redis, and add more detail to README 2017-10-29 18:40:35 -04:00