L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-38693-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2014-06-23 14:15:36 +08:00
parent 9c8c5f2d01 7b6bad24ee
commit 6e977fcdd6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/base/style/dock.css
+1 -1
View File
@@ -7,7 +7,7 @@
body.has_dock {margin-left:30px;}
/** For the dock itself */
#dock {width:30px;position:fixed;top:0px;left:0px;height:100%;background-color:#FFF;border-right:1px solid #000;z-index:11000;}
#dock {width:30px;position:fixed;top:0px;left:0px;height:100%;background-color:#FFF;border-right:1px solid #000;z-index:5000;}
#dock.nothingdocked {visibility: hidden;display:none;}
#dock .dockeditem .firstdockitem {margin-top:1em;}
#dock .dockedtitle {border-bottom:1px solid #000;border-top:1px solid #000;cursor:pointer;}
theme/upgrade.txt
+3
View File
@@ -22,6 +22,9 @@ Removed themes:
If you wish to keep your theme and its settings, download it from moodle.org and put it back in
the theme/ directory BEFORE UPGRADING.
Notes:
* z-index on #dock has been adjusted from 11000 to 5000 to prevent overlapping issues with fullscreen TinyMCE in Base theme.
=== 2.6 ===
Removed themes: