Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 08:28:00 +0000 (16:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 08:28:00 +0000 (16:28 +0800)
Conflicts:
theme/base/style/core.css

1  2 
theme/base/style/core.css

@@@ -932,10 -944,10 +944,10 @@@ sup {vertical-align: super;
      top: 0px;
      right: 0px;
      bottom: 0px;
-     left: 18.5em;
+     left: 20.3em;
      margin: 0;
 -    padding: 2em 2em 2em 2.4em;
 -    background-color: white;
 +    padding: 1.6em;
 +    background-color: #FFFFFF;
      overflow-x: hidden;
      overflow-y: auto;
      max-height: 550px;
      -moz-box-shadow: 0px 0px 10px 0px #CCCCCC;
  }
  
- .initialbar a {padding-right: 2px;}
++.initialbar a {padding-right: 2px;}