Commit Graph

66833 Commits

Author SHA1 Message Date
kaishin
1e4951dc88 Started restyling the sidebar 2012-02-15 10:37:05 -05:00
Reda Lemeden
daea47cce1 Made the search icon smaller 2012-02-15 10:33:01 -05:00
kaishin
edf870305a Merge with head 2012-02-15 10:21:41 -05:00
kaishin
899c73bd74 Added a search icon 2012-02-15 10:21:16 -05:00
Kyle Fiedler
016a1705c9 Made calc answer input whole width 2012-02-15 10:08:36 -05:00
Kyle Fiedler
d287a110f8 Made calc answer input whole width 2012-02-15 10:08:14 -05:00
Kyle Fiedler
a21f01f468 Added more style for the progress list
--HG--
branch : templates-profilecleanup
2012-02-15 09:51:18 -05:00
Kyle Fiedler
efac674084 Merged in default and fixed conflicts
--HG--
branch : templates-profilecleanup
2012-02-15 09:37:47 -05:00
Kyle Fiedler
3939a84a72 Fixed header bug and calculator bug in firefox 2012-02-15 09:32:55 -05:00
Kyle Fiedler
de3fd877e5 Fixed header bug and calculator bug in firefox 2012-02-15 09:32:23 -05:00
Kyle Fiedler
b73755d8e9 Merged templates-ernie-html5-buttontoggle 2012-02-15 09:11:51 -05:00
Kyle Fiedler
1830fb8000 Merged static-ernie-html5-buttontoggle 2012-02-15 09:10:58 -05:00
Kyle Fiedler
2dcdaccb97 Merged in default
--HG--
branch : static-ernie-html5-buttontoggle
2012-02-15 09:10:15 -05:00
Kyle Fiedler
5842284a94 Merged defualt
--HG--
branch : templates-ernie-html5-buttontoggle
2012-02-15 08:59:58 -05:00
Piotr Mitros
a8bcd38b04 merge 2012-02-14 17:40:57 -05:00
Piotr Mitros
d946621915 Fixed course check 2012-02-14 17:40:46 -05:00
David Ormsbee
a5b9372e4f document inability to run evaluator with non-float variables 2012-02-14 16:50:18 -05:00
kaishin
f1fc649eee Fixed the tag div properties 2012-02-14 15:24:31 -05:00
Kyle Fiedler
3a25e96a2c Fixed padding on discussions 2012-02-14 14:35:49 -05:00
Kyle Fiedler
50bdad914b merged refactor branch 2012-02-14 14:16:03 -05:00
Kyle Fiedler
cbefe16061 Added in Redas changes
--HG--
branch : kf-refactor-scss
2012-02-14 14:14:22 -05:00
Reda Lemeden
364680a0ea Merge with Head 2012-02-14 13:58:37 -05:00
Reda Lemeden
92f2927fe5 Redesigned the question tag filtering & navigation 2012-02-14 13:57:16 -05:00
Kyle Fiedler
d6b96ae1f1 Major refactor of scss
--HG--
branch : kf-refactor-scss
2012-02-14 13:55:06 -05:00
David Ormsbee
ed9f2f421b sort keys so evaluation takes longer terms first - vars like 'e2' will be substituted in before mathematical constants like 'e' 2012-02-14 12:10:09 -05:00
David Ormsbee
8174e49690 echo change in 1a68a3047124 to remove outdated call to modules.get_module_class
--HG--
branch : pmitros-mod-template
2012-02-14 11:49:47 -05:00
Kyle Fiedler
7e0d9b0d43 Update bourbon
--HG--
branch : kf-refactor-scss
2012-02-14 11:40:23 -05:00
Kyle Fiedler
48650b131b Changed amazon link 2012-02-14 11:31:23 -05:00
Kyle Fiedler
892ca165eb Added minified scss and removed padding from slider title when closed
--HG--
branch : static-close_sidebar
2012-02-14 11:08:48 -05:00
Kyle Fiedler
02f99ec65c Remove old Sass readme and add new onw
--HG--
branch : close_sidebar
2012-02-14 11:05:16 -05:00
Kyle Fiedler
11071c6f2c Merge with default
--HG--
branch : close_sidebar
2012-02-14 10:57:55 -05:00
Kyle Fiedler
453a72af96 Changed padding on close and changed so only the a closes sidebar
--HG--
branch : close_sidebar
2012-02-14 10:57:34 -05:00
Piotr Mitros
e3e1a37bc2 Missed commit for custom tags 2012-02-13 20:24:08 -05:00
Reda Lemeden
3176123c7c Started redesigning the question filtering and navigation 2012-02-13 18:52:00 -05:00
Piotr Mitros
56858e6498 Undid Kyle's Chrome bug fix, since it resulted in worse Firefox bugs 2012-02-13 18:42:13 -05:00
Piotr Mitros
6e9c320a5a Major bug -- using obsolete ID type in modx_render. Minor bug -- profile page broken 2012-02-13 18:05:23 -05:00
Kyle Fiedler
ea65a57931 Fixed header clashing with button
--HG--
branch : static-close_sidebar
2012-02-13 17:32:00 -05:00
Kyle Fiedler
0cb2f28173 fix header clashing with close button
--HG--
branch : close_sidebar
2012-02-13 17:31:33 -05:00
Piotr Mitros
647407ad45 hg ignore update 2012-02-13 17:20:33 -05:00
Kyle Fiedler
67df4d4226 Added style for header in sidebar
--HG--
branch : static-close_sidebar
2012-02-13 17:15:29 -05:00
Kyle Fiedler
24f4ec363a Added style for header in sidebar
--HG--
branch : close_sidebar
2012-02-13 17:15:05 -05:00
Piotr Mitros
c943065931 Merge with template view 2012-02-13 17:11:09 -05:00
Piotr Mitros
20ada529f6 Help file added to static views 2012-02-13 17:10:52 -05:00
Piotr Mitros
9ab2f59130 Removed debug print code for merge
--HG--
branch : pmitros-mod-template
2012-02-13 17:07:31 -05:00
Piotr Mitros
44e124c46f Removed file system hackery
--HG--
branch : pmitros-mod-template
2012-02-13 17:06:16 -05:00
Piotr Mitros
7c5d93a514 Commented out debug print statements for possible merge
--HG--
branch : pmitros-mod-template
2012-02-13 16:46:01 -05:00
Piotr Mitros
31c63455e1 Slightly better text 2012-02-13 16:42:38 -05:00
Kyle Fiedler
3ee53f68b0 Merged with default
--HG--
branch : close_sidebar
2012-02-13 16:39:32 -05:00
Piotr Mitros
caa2ed9195 Removed comments and obsolet error codes 2012-02-13 16:36:48 -05:00
Kyle Fiedler
1b9f3c1f67 merge 2012-02-13 16:32:31 -05:00