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

MDL-42660 Filepicker: Fix padding etc on filepicker/manager toolbars

Browse Source 
Conflicts:

	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Jason Fowler
2013-11-07 12:15:11 +08:00
committed by Damyon Wiese
parent f897dbcb24
commit 525d094a47
4 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
+1 -1
View File
@@ -12,7 +12,7 @@
.dir-rtl .moodleSkin .mceToolbar select,
.moodleSkin .mceToolbar a.mceButton { display:block; height: 30px; width: 30px; margin: 0; padding: 0; }
.moodleSkin .mceToolbar a span.mceIcon { height: 30px; width: 30px; margin: 0; }
.moodleSkin .mceToolbar a span.mceIcon img { padding: 7px 7px; }
.moodleSkin .mceToolbar a span.mceIcon img { padding: 7px; }
.moodleSkin .mceToolbar .mceGroupStart + td,
.moodleSkin .mceToolbar .mceToolbarStart + td,
.moodleSkin .mceToolbar .mceGroupStart + td a,
theme/base/style/filemanager.css
+12 -13
View File
@@ -32,8 +32,8 @@ background:#E2E2E2;filter:progid:DXImageTransform.Microsoft.gradient(startColors
.dir-rtl .file-picker .fp-repo-area {border-left:1px solid #BBBBBB;border-right:none;float:right;}
.file-picker .fp-repo-items {float:left;width:693px;}
.dir-rtl .file-picker .fp-repo-items {float:right;}
.file-picker .fp-navbar {background:#F2F2F2;min-height:48px;border-bottom:1px solid #BBBBBB;padding:5px 8px;}
.file-picker .fp-content {background:#FFFFFF;clear:both;overflow:auto;height:432px;}
.file-picker .fp-navbar {background:#F2F2F2;min-height:40px;border-bottom:1px solid #BBBBBB;}
.file-picker .fp-content {background:#FFFFFF;clear:both;overflow:auto;height:452px;}
.filepicker.moodle-dialogue-fullscreen .file-picker .fp-content {width:100%;}
.file-picker .fp-content-loading {height:100%;width:100%;display:table;text-align:center;}
@@ -70,14 +70,14 @@ background:#E2E2E2;filter:progid:DXImageTransform.Microsoft.gradient(startColors
.dir-rtl .fp-toolbar {float:right;}
.fp-toolbar.empty {display:none;}
.fp-toolbar .disabled {display:none;}
.file-picker .fp-toolbar div, .fp-navbar .filemanager-toolbar .fp-toolbar div {float:left;margin:9px 0 9px 9px;background:#FFFFFF;border:1px solid #CCCCCC;border-bottom:1px solid #B3B3B3;border-radius:4px;width:40px;height:30px;}
.file-picker .fp-toolbar div, .fp-navbar .filemanager-toolbar .fp-toolbar div {float:left;margin:4px 0 4px 4px;background:#FFFFFF;border:1px solid #CCCCCC;border-bottom:1px solid #B3B3B3;border-radius:4px;width:30px;height:30px;}
.fp-toolbar div {display:block;}
.fp-toolbar a {display:block;height:30px;width:40px;}
.fp-toolbar a {display:block;height:30px;width:30px;}
.fp-toolbar a:hover {background-image:radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);background-color:#ebebeb;}
.fp-toolbar a:active {background-image:radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%);background-color:#dfdfdf;}
.dir-rtl .fp-navbar .filemanager-toolbar .fp-toolbar div {margin:9px 9px 9px 0;}
.dir-rtl .fp-navbar .filemanager-toolbar .fp-toolbar div {margin:4px 4px 4px 0;}
.file-picker .fp-toolbar div.disabled {display:none;}
.fp-toolbar img {vertical-align:-15%;margin:7px 12px;}
.fp-toolbar img {vertical-align:-15%;margin:7px;}
.file-picker .fp-toolbar .fp-tb-search {width:235px;height:30px;}
.file-picker .fp-toolbar .fp-tb-search .fp-def-search {border:0;background:transparent;margin:0;padding:0;width:235px;}
.dir-rtl .file-picker .fp-toolbar .fp-tb-search {width:242px;}
@@ -86,14 +86,13 @@ background:#E2E2E2;filter:progid:DXImageTransform.Microsoft.gradient(startColors
.dir-rtl .fp-toolbar img {vertical-align:-35%;}
.dir-rtl .file-picker .fp-viewbar, .dir-rtl .fp-navbar .filemanager-toolbar .fp-viewbar {float:left;}
.dir-rtl .file-picker .fp-viewbar {margin-left:0;}
.file-picker .fp-viewbar, .fp-navbar .filemanager-toolbar .fp-viewbar {float:right;margin:9px; background:white;border:1px solid #CCCCCC;border-radius:4px;border-bottom:1px solid #B3B3B3;height:30px;}
.fp-viewbar .fp-vb-icons, .fp-viewbar .fp-vb-details, .fp-viewbar .fp-vb-tree {width:40px;height:30px;display:block;float:left;border-right:1px solid #CCCCCC;}
.file-picker .fp-viewbar, .fp-navbar .filemanager-toolbar .fp-viewbar {float:right;margin:4px; background:white;border:1px solid #CCCCCC;border-radius:4px;border-bottom:1px solid #B3B3B3;height:30px;}
.fp-viewbar .fp-vb-icons, .fp-viewbar .fp-vb-details, .fp-viewbar .fp-vb-tree {width:30px;height:30px;display:block;float:left;border-right:1px solid #CCCCCC;}
.fp-viewbar a.fp-vb-icons {border-radius:4px 0 0 4px;}
.fp-viewbar .fp-vb-tree {border-right:0;border-radius:0 4px 4px 0;}
.fp-viewbar a img {margin:7px 12px;}
.fp-viewbar a:hover {background-image:radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);background-color:#ebebeb;}
.fp-viewbar a:active {background-image:radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%);background-color:#dfdfdf;}
.fp-viewbar a.checked {background-color:#dfdfdf;}
.fp-viewbar a img {margin:7px;}
.fp-viewbar a.checked:hover, .fp-viewbar a:hover {background-image:radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);background-color:#ebebeb;}
.fp-viewbar a.checked, .fp-viewbar a:active {background-image:radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%);background-color:#dfdfdf;}
.fp-viewbar.disabled a {opacity:.45;background:none;cursor:default;}
.file-picker .fp-clear-left {clear:left;}
@@ -284,7 +283,7 @@ a.ygtvspacer:hover {color:transparent;text-decoration:none;}
*/
.fp-restrictions{text-align:right;}
.filemanager .fp-navbar {background:#F2F2F2;border-top:1px solid #BBBBBB;border-left:1px solid #BBBBBB;border-right:1px solid #BBBBBB;}
.filemanager-toolbar {min-height:50px;}
.filemanager-toolbar {min-height:40px;}
.fp-pathbar {border-top:1px solid #BBBBBB;padding:5px 8px 1px;min-height:20px;}
.filemanager .fp-pathbar.empty {display:none;}
theme/bootstrapbase/less/moodle/filemanager.less
+16 -18
View File
@@ -105,17 +105,17 @@
.file-picker .fp-navbar {
background: #F2F2F2;
border-bottom: 1px solid #BBBBBB;
min-height: 48px;
min-height: 40px;
}
.file-picker .fp-navbar .fp-viewbar {
margin: 9px;
margin: 4px;
}
.file-picker .fp-content {
background: #FFFFFF;
clear: both;
overflow: auto;
height: 432px;
height: 452px;
}
.filepicker.moodle-dialogue-fullscreen .file-picker .fp-content {
width: 100%;
@@ -134,7 +134,7 @@
text-align: right;
}
.dir-rtl .file-picker .fp-toolbar {
padding: 9px;
padding: 4px;
}
.dir-rtl .file-picker .fp-list {
text-align: right;
@@ -204,12 +204,12 @@
.fp-toolbar div {
display: block;
float: left;
margin-right: 9px;
margin-right: 4px;
}
.dir-rtl .fp-toolbar div {
display: block;
float: right;
margin-left: 9px;
margin-left: 4px;
margin-right: 0px;
}
.fp-toolbar img {
@@ -236,7 +236,7 @@
background: white;
}
.fp-repo-items fp-viewbar {
margin: 9px;
margin: 4px;
}
.dir-rtl .fp-toolbar img {
vertical-align: -35%;
@@ -246,17 +246,19 @@
}
.fp-viewbar a {
width: 40px;
width: 30px;
height: 30px;
border-right: 1px solid #CCC;
display: block;
float:left;
}
.fp-viewbar a.checked:hover,
.fp-viewbar a:hover {
background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);
background-color: #ebebeb;
}
.fp-viewbar a.checked,
.fp-viewbar a:active {
background-image: radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%);
background-color: #dfdfdf;
@@ -270,11 +272,7 @@
border-radius: 0 4px 4px 0;
}
.fp-viewbar a img {
margin: 7px 12px;
}
.fp-viewbar a.checked {
background-color: #dfdfdf;
margin: 7px;
}
.fp-viewbar.disabled a {
@@ -794,7 +792,7 @@ a.ygtvspacer:hover {
border-bottom: none;
}
.filemanager-toolbar{
padding: 9px;
padding: 4px;
overflow: hidden;
}
.fp-pathbar {
@@ -804,7 +802,7 @@ a.ygtvspacer:hover {
}
.file-picker .fp-toolbar {
padding: 9px;
padding: 4px;
}
.fp-toolbar .fp-btn-add,
@@ -819,7 +817,7 @@ a.ygtvspacer:hover {
border-bottom: 1px solid #B3B3B3;
border-radius: 4px;
background: white;
width: 40px;
width: 30px;
height: 30px;
}
@@ -842,7 +840,7 @@ a.ygtvspacer:hover {
.fp-tb-refresh a
{
display: block;
width: 40px;
width: 30px;
height: 30px;
border-radius: 4px;
}
@@ -854,7 +852,7 @@ a.ygtvspacer:hover {
.fp-tb-manage img,
.fp-tb-logout img,
.fp-tb-refresh img {
margin: 7px 12px;
margin: 7px;
}
.filemanager .fp-pathbar.empty {
theme/bootstrapbase/style/moodle.css
+1 -1
View File
File diff suppressed because one or more lines are too long