Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2014-11-25 18:38:24 +01:00
commit 4ef19b1789
10 changed files with 8 additions and 17 deletions

3
.csslintrc Normal file
View File

@ -0,0 +1,3 @@
--errors=errors,duplicate-properties
--warnings=known-properties,display-property-grouping,empty-rules,important
--exclude-list=vendor/,lib/editor/tinymce/,lib/yuilib/,theme/bootstrapbase/style/

View File

@ -67,7 +67,6 @@
font-weight:normal;
line-height:1.2em;
font-size: 140%;
color: #fff;
width: 102%;
text-indent: 15px;
}

View File

@ -43,7 +43,7 @@
.ie6 .block_navigation .block_tree .tree_item {width:100%;}
/** Overide for RTL layout **/
.dir-rtl .block_navigation .block_tree li.depth_2 ul {padding-left:0;padding-right: 16px; padding-left: 0;}
.dir-rtl .block_navigation .block_tree li.depth_2 ul {padding-left: 0; padding-right: 16px;}
.dir-rtl .block_navigation .block_tree .type_activity > p.tree_item.branch.hasicon.active_tree_node,
.dir-rtl .block_navigation .block_tree .tree_item {padding-right: 21px;text-align:right;}

View File

View File

@ -41,7 +41,6 @@
#page-mod-scorm-player #scormnav {
position: absolute;
right: 5px;
top: 0px;
text-align: center;
top: 3px;
width: 100%;

View File

@ -1868,8 +1868,8 @@ body.jsenabled .formlisting {
#page-badges-view .collection { width: 90%; margin: 1em auto; }
#page-badges-index .collection { width: 85%; margin: 1em auto; }
table.collection th { font-size: inherit !important; border-width: 1px; border-style: solid; border-color: #CCCCCC; vertical-align: middle; padding-left: 5px; padding-right: 5px; vertical-align: top; text-align: center !important; }
table.collection td { border-width: 1px; border-style: solid; border-color: #CCCCCC; vertical-align: middle; padding-left: 5px; padding-right: 5px; vertical-align: top; }
table.collection th { font-size: inherit !important; border-width: 1px; border-style: solid; border-color: #CCCCCC; padding-left: 5px; padding-right: 5px; vertical-align: top; text-align: center !important; }
table.collection td { border-width: 1px; border-style: solid; border-color: #CCCCCC; padding-left: 5px; padding-right: 5px; vertical-align: top; }
table.collection > tbody > tr:nth-of-type(even) { background-color: #FFFFFF; }
table.collection > tbody > tr:nth-of-type(odd) { background-color: #F6F6F6; }
table.collection ul { margin: 0.5em 0.5em 0.5em 2em; }
@ -2127,15 +2127,6 @@ a:hover .caret {
}
}
@-ms-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
}
to {
background-position: 0 0;
}
}
@-o-keyframes progress-bar-stripes {
from {
background-position: 0 0;

View File

@ -180,7 +180,7 @@
.course-content .section-summary { border: 1px solid #DDD; margin-top: 5px; list-style: none; }
.course-content .section-summary .section-title { margin: 2px 5px 10px 5px; }
.course-content .section-summary .summarytext { margin: 2px 5px 2px 5px; }
.course-content .section-summary .section-summary-activities .activity-count {margin-right: 10px;color: #AAA; font-size: 12px; margin-right: 15px;}
.course-content .section-summary .section-summary-activities .activity-count {color: #AAA; font-size: 12px; margin-right: 15px;}
.course-content .section-summary .summary { margin-top: 5px; }
.course-content .single-section { margin-top: 1em; }
.course-content .single-section .section-navigation { display: block; padding: 0.5em; margin-bottom: -0.5em; }

View File

@ -201,7 +201,7 @@
margin:0.5em;padding:0.5em;text-align:center;-moz-border-radius:5px}
#page-grade-grading-manage .action:hover {text-decoration:none;background-color:#F6F6F6;}
#page-grade-grading-manage #actionresultmessagebox {background-color:#D2EBFF;width:60%;margin:1em auto 1em auto;text-align:center;
padding:0.5em;border:2px solid #CCC;text-align:center;-moz-border-radius:5px;position:relative}
padding:0.5em;border:2px solid #CCC;-moz-border-radius:5px;position:relative}
#page-grade-grading-manage #actionresultmessagebox span {position:absolute;right:0px;top:-1.2em;color:#666;font-size:80%}
#page-grade-grading-manage .definition-name .status {font-weight:normal;text-transform:uppercase;font-size:60%;padding:0.25em;border:1px solid #EEE;-moz-border-radius:5px;}
#page-grade-grading-manage .definition-name .status.ready {background-color:#e7f1c3;border-color:#AAEEAA;}

View File

@ -62,7 +62,6 @@ $THEME->sheets = array(
'admin',
'tables',
'popups',
'question',
);
////////////////////////////////////////////////////