Commit Graph

480 Commits

Author SHA1 Message Date
Kyle Fiedler
182dc1a66f fixed conflicts
--HG--
branch : kf-sidebar
2012-02-21 15:01:00 -05:00
Kyle Fiedler
5404e1228a added styles for other headers inthe sidebars
--HG--
branch : kf-sidebar
2012-02-21 14:25:59 -05:00
Kyle Fiedler
ccc3c710b3 Added consistant sidebar headers and made textbook sidebar close
--HG--
branch : kf-sidebar
2012-02-21 13:08:35 -05:00
Kyle Fiedler
3ce8557309 Merged heads 2012-02-20 17:24:56 -05:00
Kyle Fiedler
0e2216932a Added more style for askbot profile page 2012-02-20 17:24:20 -05:00
Reda Lemeden
a75ba51c46 Merged and resolved conflicts 2012-02-20 17:14:57 -05:00
Reda Lemeden
6c9540fe4e Minor styles changes and visual fixes to various parts of the app 2012-02-20 17:09:36 -05:00
Kyle Fiedler
02174ff62e Merged heads 2012-02-20 15:24:54 -05:00
Kyle Fiedler
576643da7e Added base styles for the askbot profile page 2012-02-20 15:24:35 -05:00
Reda Lemeden
b2d0b9b621 Merge with Head 2012-02-20 14:29:26 -05:00
Reda Lemeden
01ab182a8e Fixed bugs in the answer and question editing forms 2012-02-20 14:28:30 -05:00
Piotr Mitros
c94d68683e Merge 2012-02-20 13:26:39 -05:00
Piotr Mitros
0b3c9dc975 Integrate with mod-template (custom tags dir) 2012-02-20 13:25:34 -05:00
Piotr Mitros
349230c1fa Merge with capa fixed 2012-02-20 13:24:33 -05:00
Reda Lemeden
f6434f906c Merge with Head 2012-02-20 11:38:20 -05:00
Reda Lemeden
b8dcbaf36c Fixed visual bugs on the main question list + restyled author info in answer view 2012-02-20 11:37:39 -05:00
Kyle Fiedler
bf632da06f Add textbook nav on the bottom of the page too 2012-02-20 11:18:58 -05:00
Kyle Fiedler
d83a4d22f3 Added messaging for users with javascript diabled 2012-02-20 10:51:39 -05:00
Kyle Fiedler
c7e72c28e0 merged heads 2012-02-20 09:54:13 -05:00
Kyle Fiedler
c423e17cc3 Added style to remove enrollment form for IE7 and below and added a paragraph explainaing why 2012-02-20 09:53:40 -05:00
Piotr Mitros
2501b58305 Removed unnecessary symlinks. WARNING: Must update and push data before deploying
--HG--
branch : pmitros-mod-template
2012-02-20 07:13:16 -05:00
Piotr Mitros
47b0ca5564 Merge
--HG--
branch : pmitros-mod-template
2012-02-20 07:11:05 -05:00
Piotr Mitros
73322a5e6a Capa problems handle case sensitivity and give better errors
--HG--
branch : pmitros-capa-fixes
2012-02-19 17:03:29 -05:00
Piotr Mitros
0807cf8160 Updated FAQ 2012-02-19 14:03:12 -05:00
Piotr Mitros
3ef3c055af Profile page fixed 2012-02-19 10:39:18 -05:00
Piotr Mitros
47cd903cc2 Changed jpg to png, new TOC, correct starting/eding pages 2012-02-19 10:29:32 -05:00
Kyle Fiedler
a4258d29de Added to the Sass readme 2012-02-17 14:21:42 -05:00
Kyle Fiedler
b9d72ebbe2 fix footer for mobile styles 2012-02-17 14:04:23 -05:00
Kyle Fiedler
fd6214ab02 Merged heads 2012-02-17 13:52:23 -05:00
Kyle Fiedler
92afb78c54 Mobile styles 2012-02-17 13:43:04 -05:00
Bridger Maxwell
c4b05e28d9 Merge 2012-02-17 00:38:04 -05:00
Bridger Maxwell
67047cd151 Some changes for code review
--HG--
branch : bridger-dev
2012-02-17 00:37:45 -05:00
Bridger Maxwell
fdc4bd71be Added check for unsaved changes before navigating away from wiki edit page.
--HG--
branch : bridger-dev
2012-02-16 18:16:01 -05:00
Reda Lemeden
133ca2991f Merge 2012-02-16 17:30:45 -05:00
kaishin
78826ec070 Question view enhancements 2012-02-16 17:30:12 -05:00
Kyle Fiedler
d0418f216e Renable jquery ui on marketing 2012-02-16 15:16:43 -05:00
Kyle Fiedler
fdc2eef3b7 Merged heads 2012-02-16 15:00:31 -05:00
Kyle Fiedler
a3299901a9 added better titles and meta information to the marketing site 2012-02-16 15:00:17 -05:00
Piotr Mitros
e1cac8d258 Merge 2012-02-16 14:55:52 -05:00
Piotr Mitros
4ae1f53a29 Staff per-problem info 2012-02-16 14:52:47 -05:00
Kyle Fiedler
b1c578400a merged new navigation branch 2012-02-16 14:02:47 -05:00
Kyle Fiedler
b0614d121c Merged with default
--HG--
branch : templates-ky-new-nav
2012-02-16 14:02:15 -05:00
kaishin
77b6c86299 Styled the question edit form & sidebar 2012-02-16 12:42:28 -05:00
Reda Lemeden
c1676ba1af Merge with Head 2012-02-16 11:11:37 -05:00
kaishin
21d8f47ae5 Finished styling the sidebar 2012-02-16 11:10:59 -05:00
Kyle Fiedler
6d9606f4e8 some clean up
--HG--
branch : templates-ky-new-nav
2012-02-16 10:52:40 -05:00
Kyle Fiedler
df65d0e578 mobile edits
--HG--
branch : templates-ky-new-nav
2012-02-16 10:47:54 -05:00
Kyle Fiedler
12c1c8beb7 Merged with default
--HG--
branch : templates-ky-new-nav
2012-02-16 09:56:08 -05:00
Kyle Fiedler
44a5c69575 Added more style for main navigation
--HG--
branch : templates-ky-new-nav
2012-02-16 09:55:51 -05:00
Piotr Mitros
d0cd1f5e74 New TOS 2012-02-15 21:36:09 -05:00