Merge branch 'MDL-33789_master' of git://github.com/kordan/moodle

alseambusher · Oct 2, 2012 · 497359f · 497359f
2 parents c38e18e + 9e8e9eb
commit 497359f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/theme/formal_white/style/course.css b/theme/formal_white/style/course.css
@@ -91,9 +91,7 @@
 .categorylist .category .name,
 .categorylist .category .image,
 .categorylist .course .name,
-.categorylist .course .info {
-    margin: 0.1em;
-}
+.categorylist .course .info {margin: 0.1em;}
 
 /* Course and category combo list on front page */
 .course_category_tree .controls {margin-bottom:5px;text-align:right;float:right;}
@@ -115,14 +113,10 @@
 
 /* Publication */
 #page-course-publish-metadata .metadatatext {width:400px;}
-#page-course-publish-metadata .hubscreenshot {
-    display:inline;
-    float:left;
-    margin-right:10px;
-}
+#page-course-publish-metadata .hubscreenshot {display:inline;float:left;margin-right:10px;}
 #page-course-publish-metadata .hubscreenshot img {vertical-align:bottom;}
 #page-course-publish-metadata .hubdescription {}
 #page-course-publish-metadata .hubinfo {display:block; margin-bottom:20px;}
 #page-course-publish-metadata .hublink {}
 #page-course-publish-backup .courseuploadtextinfo {text-align:center;}
-#page-course-publish-backup .sharecoursecontinue  {text-align:center;}
+#page-course-publish-backup .sharecoursecontinue  {text-align:center;}
diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css
@@ -43,7 +43,7 @@ h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;}
 #dock #dockeditempanel .dockeditempanel_hd .commands {position:absolute;right:0.3em;top:0.25em;}
 
 /* navbar */
-.navbar {width:auto;padding-top:0.35em;padding-bottom:0.15em;background-image:url([[pix:theme|bg_bread]]);background-color:#AB9D80;}
+.navbar {width:auto;background-image:url([[pix:theme|bg_bread]]);background-repeat:repeat-x;line-height:29px;} /* 30 pixel is the height if bg_bread */
 .navbar li span {color:#E3DFD4;}
 .navbar li a:link, .navbar li a:visited {color:white;}