Permalink
Browse files

Merge branch 'MDL-39080_M23' of git://github.com/kordan/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
danpoltawski committed Apr 16, 2013
2 parents 17c980c + bec7d18 commit 387dc90072dbca39690e0bddfd323be7d85c2dfe
Showing with 11 additions and 9 deletions.
  1. +11 −9 theme/formal_white/style/block.css
@@ -7,7 +7,7 @@
.block .header .title {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;clear:both;line-height:2em;background-color:#E3DFD4;}
.block .header .title .commands {padding-left:0.3em;text-align:right;}
.block .content {background-color:[[setting:blockcontentbgc]];}
-.block img.icon {padding-right:0}
+.block img.icon {padding-right:5px}
/* block login */
.block_login .btn {margin-top:0.5em;text-align:center;}
@@ -16,11 +16,6 @@
.block_login #login_username, .block_login #login_password {margin:4px 0 4px [[static:lb_fieldsmargin]];}
.block_login #login_username, .block_login #login_password {width:[[static:lb_fieldswidth]];}
-/* block_settings */
-.block_settings .block_tree .tree_item a:link,
-.block_settings .block_tree .tree_item a:visited,
-.block_settings .block_tree .tree_item a:active,
-
/* block_navigation */
/*.block_navigation .block_tree li.type_category.contains_branch>p span {
padding-left: 20px;
@@ -35,9 +30,16 @@
background-repeat: no-repeat;
background-position: 0 -1px;
}*/
+
+/* block_settings links */
+/* block_navigation links */
+.block_settings .block_tree .tree_item a:link,
+.block_settings .block_tree .tree_item a:visited,
+.block_settings .block_tree .tree_item a:active,
.block_navigation .block_tree .tree_item a:link,
.block_navigation .block_tree .tree_item a:visited,
-.block_navigation .block_tree .tree_item a:active {
- color:#000;
-}
+.block_navigation .block_tree .tree_item a:active {color:#000;}
+
.block_navigation .block_tree .tree_item {padding-left:19px}
+
+.block.list_block .unlist > li > .column {margin-top:3px; margin-bottom:3px;}

0 comments on commit 387dc90

Please sign in to comment.