Kyle Fiedler
|
9d14033f6b
|
Added some styles for the top navigation and for the sidebar navigation
|
2012-07-31 16:29:01 -04:00 |
|
Brittany Cheng
|
29d75057f2
|
fix font inheritance, update post control styles
|
2012-07-31 16:25:27 -04:00 |
|
Brittany Cheng
|
b12d887309
|
font sizing
|
2012-07-31 15:41:03 -04:00 |
|
Brittany Cheng
|
3d389c099e
|
new post control button and link styles
|
2012-07-31 15:05:07 -04:00 |
|
Kyle Fiedler
|
d30ae5389e
|
Added fix for videos start to zero out colors and mit styles
|
2012-07-31 14:18:42 -04:00 |
|
Brittany Cheng
|
ff4d0637f5
|
merging styles
|
2012-07-31 14:09:06 -04:00 |
|
Brittany Cheng
|
643316a10b
|
tag styles
|
2012-07-31 14:05:11 -04:00 |
|
Rocky Duan
|
c43d5d236a
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
Conflicts:
lms/static/coffee/src/discussion.coffee
|
2012-07-31 13:43:53 -04:00 |
|
Brittany Cheng
|
836242706f
|
buttons
|
2012-07-31 13:41:21 -04:00 |
|
Rocky Duan
|
401f57b81a
|
show new post form after clicking button
|
2012-07-31 13:40:26 -04:00 |
|
Brittany Cheng
|
48674d6fa5
|
search button style
|
2012-07-31 13:23:35 -04:00 |
|
Brittany Cheng
|
cf92f356c0
|
edit styles for tags, discussion votes, etc
|
2012-07-31 12:03:45 -04:00 |
|
Brittany Cheng
|
32cf7c6f66
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-31 11:26:17 -04:00 |
|
Kyle Fiedler
|
2bbb19790d
|
Fixed jquery ui image problem and added a base style sheet for lms to override fonts
|
2012-07-31 11:06:39 -04:00 |
|
Brittany Cheng
|
278483371b
|
fix merge conflicts
|
2012-07-31 10:30:26 -04:00 |
|
Brittany Cheng
|
6285f2a2be
|
discussion styles
|
2012-07-31 10:27:14 -04:00 |
|
Rocky Duan
|
6f44001813
|
basic editing functionality
|
2012-07-31 10:11:51 -04:00 |
|
Brittany Cheng
|
bba8e29733
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-30 18:36:23 -04:00 |
|
Brittany Cheng
|
a98c505ba8
|
fix merge conflicts
|
2012-07-30 18:36:06 -04:00 |
|
Rocky Duan
|
cef347226b
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-30 18:35:11 -04:00 |
|
Brittany Cheng
|
92cfded595
|
added color to error msg and borders to threads
|
2012-07-30 18:34:07 -04:00 |
|
David Ormsbee
|
e5fd92630d
|
Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors
Added styles for errors
|
2012-07-30 15:24:12 -07:00 |
|
Rocky Duan
|
d6b7707725
|
refactored reply rendering by using mustache
|
2012-07-30 18:19:04 -04:00 |
|
Kyle Fiedler
|
c611bd9228
|
added treeview
|
2012-07-30 17:39:44 -04:00 |
|
Kyle Fiedler
|
257ce0430f
|
Moved vendor sass files to css folder and included them in
|
2012-07-30 17:39:19 -04:00 |
|
Kyle Fiedler
|
7ab5bbfaef
|
Moved files and removed files
|
2012-07-30 17:37:53 -04:00 |
|
Kyle Fiedler
|
6cad5459b3
|
Start to refactor courseware scss
|
2012-07-30 17:37:11 -04:00 |
|
Brittany Cheng
|
91cb814ee0
|
merging with origin master
|
2012-07-30 16:28:49 -04:00 |
|
Kyle Fiedler
|
3bb82c41d2
|
Remove couse css file
|
2012-07-30 16:21:03 -04:00 |
|
Brittany Cheng
|
1b7e2b356e
|
edit layout of search box
|
2012-07-30 15:22:40 -04:00 |
|
Kyle Fiedler
|
b402cde650
|
Added some style for the dashboard message
|
2012-07-30 12:11:46 -04:00 |
|
Kyle Fiedler
|
c51f78bdfa
|
Added styles for course images to always the right dimentions
|
2012-07-30 12:09:30 -04:00 |
|
Kyle Fiedler
|
a040f4346e
|
Added styles for errors
|
2012-07-30 11:57:31 -04:00 |
|
Brittany Cheng
|
65730c2268
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-30 10:45:04 -04:00 |
|
Kyle Fiedler
|
d94fd1542d
|
Added Gemfile.lock to ignore
|
2012-07-30 09:50:24 -04:00 |
|
Rocky Duan
|
3ad309c2fd
|
forgot to include files & tiny styling fix
|
2012-07-29 17:40:11 -04:00 |
|
Rocky Duan
|
b92a180d25
|
add tags to threads & view threads by tags
|
2012-07-29 15:24:15 -04:00 |
|
Brittany Cheng
|
148d499bfe
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-27 14:43:43 -04:00 |
|
Brittany Cheng
|
aff57bf855
|
mostly font edits
|
2012-07-27 14:43:33 -04:00 |
|
Brittany Cheng
|
c5aa22ed65
|
Merge branch 'master' of github.com:MITx/mitx into discussion
|
2012-07-27 14:42:39 -04:00 |
|
Rocky Duan
|
7a53bc52ae
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-27 12:30:54 -04:00 |
|
Rocky Duan
|
fc4e21d4c4
|
use wmd editor for comments
|
2012-07-26 17:35:09 -04:00 |
|
Rocky Duan
|
b04a645685
|
make indentation the same
|
2012-07-26 11:11:45 -04:00 |
|
kimth
|
6631848b53
|
CodeMirror fix in the new scss org
|
2012-07-26 10:49:10 -04:00 |
|
Rocky Duan
|
9d2bccbee7
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-26 10:43:42 -04:00 |
|
Calen Pennington
|
73d6565fac
|
Merge remote-tracking branch 'origin/hotfix/1.0.1'
Conflicts:
common/djangoapps/student/views.py
|
2012-07-26 09:05:57 -04:00 |
|
Rocky Duan
|
63633ae1d3
|
files for wmd editor
|
2012-07-25 20:47:11 -04:00 |
|
Rocky Duan
|
9f1353b027
|
removed nonexisted scss links
|
2012-07-25 20:42:27 -04:00 |
|
Rocky Duan
|
52c7136493
|
Merge branch 'lol'
Conflicts:
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/lib/comment_client.py
lms/lib/datehelper
lms/static/sass/application.scss
lms/templates/discussion/index.html
lms/templates/news.html
|
2012-07-25 18:41:24 -04:00 |
|
Kyle Fiedler
|
8c079c8a72
|
Added styles for course images to always the right dimentions
|
2012-07-25 18:18:52 -04:00 |
|