Rocky Duan
|
ab6cf914a0
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
Conflicts:
lms/templates/discussion/_thread.html
|
2012-08-10 17:59:19 -07:00 |
|
Brittany Cheng
|
5b6e3997af
|
fixed ul courseware
|
2012-08-10 17:58:18 -07:00 |
|
Brittany Cheng
|
f44358ab78
|
merge tom's styles
|
2012-08-10 17:52:07 -07:00 |
|
Tom Giannattasio
|
538185173a
|
added truncation for super long titles
|
2012-08-10 11:48:07 -04:00 |
|
Tom Giannattasio
|
022c65a6b4
|
fixed class name header bug
|
2012-08-10 11:40:16 -04:00 |
|
Tom Giannattasio
|
ced521c17d
|
cleaned up textbook nav styles
|
2012-08-09 14:44:50 -04:00 |
|
Tom Giannattasio
|
3d3ee02e52
|
started textbook nav styles
|
2012-08-09 12:16:13 -04:00 |
|
Tom Giannattasio
|
e82582e329
|
added course name to global nav bar
|
2012-08-09 11:17:26 -04:00 |
|
Tom Giannattasio
|
5c14a1ce65
|
added admin controls to main post and comments
|
2012-08-08 16:42:19 -04:00 |
|
Kyle Fiedler
|
971ec9891e
|
Added new selections styles
|
2012-08-08 16:27:48 -04:00 |
|
Kyle Fiedler
|
ccc1f1dfd5
|
Removed padding and added line-height for the tutorials
|
2012-08-08 16:27:48 -04:00 |
|
Kyle Fiedler
|
17d072711b
|
Make the sidebar links more standard, and remove some of their styling
|
2012-08-08 16:27:47 -04:00 |
|
Tom Giannattasio
|
9b9bb22cda
|
tightened white space; fixed double margin in comments
|
2012-08-08 14:36:19 -04:00 |
|
Brittany Cheng
|
3ec658df56
|
merge tom's styles, warning: LOTS OF STUFF BROKE
|
2012-08-08 12:45:40 -04:00 |
|
Tom Giannattasio
|
dc5b8b51c4
|
placeholder and button color updates
|
2012-08-08 11:08:58 -04:00 |
|
Tom Giannattasio
|
10ff6af3bb
|
discussion sidebar additions; inline text editor example
|
2012-08-08 10:56:59 -04:00 |
|
Arjun Singh
|
d8a1b5d574
|
adding some styling so that the syllabus lists display reasonably
|
2012-08-08 02:59:15 -04:00 |
|
Rocky Duan
|
f3d44225cc
|
Merge branch 'brittany' of github.com:dementrock/mitx into brittany
|
2012-08-07 18:51:18 -04:00 |
|
Rocky Duan
|
2fb02f1a73
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/urls.py
|
2012-08-07 16:58:14 -04:00 |
|
Brittany Cheng
|
1f1ea8ad5e
|
left nav styles
|
2012-08-07 16:56:53 -04:00 |
|
Brittany Cheng
|
0fba4d9848
|
left nav styles
|
2012-08-07 16:54:13 -04:00 |
|
Brittany Cheng
|
67777ef5a2
|
left nav styles
|
2012-08-07 16:52:32 -04:00 |
|
Brittany Cheng
|
9ae21a878a
|
recent activity
|
2012-08-07 16:21:19 -04:00 |
|
Brittany Cheng
|
338a6788c8
|
recent activity
|
2012-08-07 16:11:24 -04:00 |
|
Tom Giannattasio
|
d6e969a8c0
|
added collapsed state for text editor
|
2012-08-07 15:46:18 -04:00 |
|
Brittany Cheng
|
39dc6a63da
|
cleanup css
|
2012-08-07 14:41:28 -04:00 |
|
Tom Giannattasio
|
6295bc3bc5
|
label font changes
|
2012-08-07 14:41:20 -04:00 |
|
Brittany Cheng
|
ed8595ad95
|
error styles
|
2012-08-07 14:31:04 -04:00 |
|
Tom Giannattasio
|
8c366e2d59
|
tweaking the text editor
|
2012-08-07 14:25:05 -04:00 |
|
Brittany Cheng
|
7962813014
|
info styles
|
2012-08-07 13:53:57 -04:00 |
|
Brittany Cheng
|
49840933c0
|
error handling
|
2012-08-07 13:48:43 -04:00 |
|
Brittany Cheng
|
391d173018
|
similar posts styles
|
2012-08-07 12:05:01 -04:00 |
|
Tom Giannattasio
|
d5302a0bd0
|
thread updates: follow/unfollow, grid tweaks
|
2012-08-07 12:00:17 -04:00 |
|
Kyle Fiedler
|
dd6ec19e80
|
Make the modal window work in the courseware
|
2012-08-07 11:59:49 -04:00 |
|
Brittany Cheng
|
4b9358fb72
|
similar posts styles
|
2012-08-07 11:55:31 -04:00 |
|
Brittany Cheng
|
5bec964606
|
Merge branch 'master' of github.com:dementrock/mitx into discussion3
|
2012-08-07 11:36:34 -04:00 |
|
Rocky Duan
|
6c2f53a495
|
to make it appear at least normal..
|
2012-08-07 11:28:52 -04:00 |
|
Tom Giannattasio
|
00a72cf86a
|
updated thread styles: voting, actions, comments, sort
|
2012-08-07 11:27:13 -04:00 |
|
Brittany Cheng
|
1fb0e352b4
|
blank slate
|
2012-08-07 11:10:24 -04:00 |
|
Tom Giannattasio
|
2135ed5015
|
added vote arrows
|
2012-08-07 10:16:08 -04:00 |
|
Brittany Cheng
|
92ca7ff240
|
link styles
|
2012-08-06 18:42:00 -04:00 |
|
Tom Giannattasio
|
6cdd3a7ec2
|
started thread styles
|
2012-08-06 18:17:21 -04:00 |
|
Brittany Cheng
|
981fc90afb
|
new post styles
|
2012-08-06 17:59:10 -04:00 |
|
Tom Giannattasio
|
43a70d8994
|
a few main discussion page tweaks
|
2012-08-06 17:04:24 -04:00 |
|
Rocky Duan
|
39ae9343e8
|
merged brittany's branch & fixed stuff
|
2012-08-06 16:15:36 -04:00 |
|
Kyle Fiedler
|
e90103abdf
|
Reset styles for profile page and some for the info page
|
2012-08-06 16:08:41 -04:00 |
|
Kyle Fiedler
|
ac960ab9df
|
Add images for book and fix styles for wiki
|
2012-08-06 16:08:40 -04:00 |
|
Kyle Fiedler
|
a090d62339
|
Add styles for next last page in textbook
|
2012-08-06 16:08:40 -04:00 |
|
Kyle Fiedler
|
e40c6b3812
|
Reset some styles for the textbook
|
2012-08-06 16:08:40 -04:00 |
|
Kyle Fiedler
|
29b8577346
|
Fix styles in the handouts sidebar
|
2012-08-06 16:08:40 -04:00 |
|