Merge remote-tracking branch 'origin/szzh' into szzh

Conflicts: app/views/layouts/base_courses.html.erb public/stylesheets/courses.css
10 years ago · 5b624330cf
parent 0de97fb9ef 1a2edd9103
commit 5b624330cf
5 changed files with 2 additions and 0 deletions
--- a/public/images/course/syllabus.png
+++ b/public/images/course/syllabus.png
--- a/public/images/course/syllabus_icon.png
+++ b/public/images/course/syllabus_icon.png
--- a/public/images/course/syllabus_setting.png
+++ b/public/images/course/syllabus_setting.png
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@ -1309,3 +1309,4 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
 span.author { font-size: 0.9em; color: #888; }
 .ReplyToMessageInputContainer {width: 582px;float: left;}
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@ -907,3 +907,4 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 .list_style ol li{list-style-type: decimal;margin-left: 20px;}
 .list_style ul li{list-style-type: disc;margin-left: 20px;}
`@ -907,3 +907,4 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r`

	`.list_style ol li{list-style-type: decimal;margin-left: 20px;}`	`.list_style ol li{list-style-type: decimal;margin-left: 20px;}`
	`.list_style ul li{list-style-type: disc;margin-left: 20px;}`	`.list_style ul li{list-style-type: disc;margin-left: 20px;}`