From 2324cf045e5125e29c0798d0cd975e97f7e7d023 Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Wed, 10 Oct 2012 11:03:00 +0100 Subject: [PATCH] MDL-37645 Generalise style for moodle-core-dialogues --- .../assets/skins/sam/notification.css | 25 --- lib/yui/notification/notification.js | 2 +- .../skins/sam => theme/base/pix}/sprite.png | Bin theme/base/style/core.css | 200 ++++++++++++++---- 4 files changed, 162 insertions(+), 65 deletions(-) delete mode 100644 lib/yui/notification/assets/skins/sam/notification.css rename {lib/yui/notification/assets/skins/sam => theme/base/pix}/sprite.png (100%) diff --git a/lib/yui/notification/assets/skins/sam/notification.css b/lib/yui/notification/assets/skins/sam/notification.css deleted file mode 100644 index 91fd8d212af..00000000000 --- a/lib/yui/notification/assets/skins/sam/notification.css +++ /dev/null @@ -1,25 +0,0 @@ -.moodle-dialogue-base .hidden, -.moodle-dialogue-base .moodle-dialogue-hidden {display:none;} -.moodle-dialogue-base .moodle-dialogue-lightbox {background-color:#AAA;} -.moodle-dialogue-base .moodle-dialogue {background-color:#666;border:0 solid #666;border-right-width:3px;border-bottom-width:3px;} -.moodle-dialogue-base .moodle-dialogue-wrap {background-color:#FFF;margin-top:-3px;margin-left:-3px;border:1px solid #555;height:auto;} -.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd {font-size:110%;color:inherit;font-weight:bold;text-align:left;padding:5px 6px;margin:0;border-bottom:1px solid #ccc;background:#f6f6f6;} -.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1{font-size:100%;font-weight:bold;margin:0;padding:0;display:inline;} -.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .yui3-widget-buttons {padding: 5px;} -.moodle-dialogue-base .closebutton {background-image:url(sprite.png);width:25px;height:15px;background-repeat:no-repeat;float:right;vertical-align:middle;display:inline-block;cursor:pointer;padding:0px;border-style:none;} -.moodle-dialogue-base .moodle-dialogue-bd {padding:5px; overflow: auto;} -.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-content {background:#FFF;padding:0px;} -.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft {padding:0px;} - -.moodle-dialogue-confirm .confirmation-dialogue {text-align:center;} -.moodle-dialogue-confirm .confirmation-message {margin:0.5em 1em;} -.moodle-dialogue-confirm .confirmation-dialogue input {min-width:80px;text-align:center;} - -.moodle-dialogue-exception .moodle-exception-message {text-align:center;margin:1em;} -.moodle-dialogue-exception .moodle-exception-param {margin-bottom:0.5em;} -.moodle-dialogue-exception .moodle-exception-param label {width:150px;font-weight:bold;} -.moodle-dialogue-exception .param-stacktrace label {display:block;background-color:#EEE;margin:0;padding:4px 1em;border:1px solid #ccc;border-bottom-width:0;} -.moodle-dialogue-exception .param-stacktrace pre {display:block;border:1px solid #ccc;background-color:#fff;height:200px;overflow:auto;} -.moodle-dialogue-exception .param-stacktrace .stacktrace-file {color:navy;display:inline-block;font-size:80%;margin:4px 0;} -.moodle-dialogue-exception .param-stacktrace .stacktrace-line {color:#AA0000;display:inline-block;font-size:80%;width:50px;margin:4px 1em;} -.moodle-dialogue-exception .param-stacktrace .stacktrace-call {color:#333;font-size:90%;padding-left:25px;margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #eee;} diff --git a/lib/yui/notification/notification.js b/lib/yui/notification/notification.js index 8969f6a9635..83d4f4ee454 100644 --- a/lib/yui/notification/notification.js +++ b/lib/yui/notification/notification.js @@ -401,4 +401,4 @@ M.core.confirm = CONFIRM; M.core.exception = EXCEPTION; M.core.ajaxException = AJAXEXCEPTION; -}, '@VERSION@', {requires:['base','node','panel','event-key', 'moodle-core-notification-skin', 'dd-plugin']}); +}, '@VERSION@', {requires:['base','node','panel','event-key', 'dd-plugin']}); diff --git a/lib/yui/notification/assets/skins/sam/sprite.png b/theme/base/pix/sprite.png similarity index 100% rename from lib/yui/notification/assets/skins/sam/sprite.png rename to theme/base/pix/sprite.png diff --git a/theme/base/style/core.css b/theme/base/style/core.css index f9bf057c1aa..9160201f583 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -867,8 +867,166 @@ sup {vertical-align: super;} #page-admin-grade-edit-scale-edit.dir-rtl .error input#id_name {margin-right: 170px;} .initialbar a {padding-right: 2px;} +/* Moodle Dialogue Settings (moodle-core-dialogue) */ +.moodle-dialogue-base .moodle-dialogue-lightbox { + background-color:#AAA; +} + +.moodle-dialogue-base .hidden, +.moodle-dialogue-base .moodle-dialogue-hidden {display:none;} +.moodle-dialogue-base .moodle-dialogue { + padding: 0; + margin: 0; + background: none; + border: none; + /* Override the z-index set incorrectly by the YUI dialogue */ + z-index: 600!important; +} + + +.moodle-dialogue-base .moodle-dialogue-wrap { + margin-top:-3px; + margin-left:-3px; + background-color: #FFFFFF; + border: 1px solid #CCCCCC; + border-radius:10px; + box-shadow: 5px 5px 20px 0px #666666; + -webkit-box-shadow: 5px 5px 20px 0px #666666; + -moz-box-shadow: 5px 5px 20px 0px #666666; +} + +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd { + margin:0; + padding:5px; + font-size:12px; + font-weight: normal; + letter-spacing: 1px; + color:#333333; + text-align: center; + text-shadow: 1px 1px 1px #FFFFFF; + border-radius: 10px 10px 0px 0px; + border-bottom: 1px solid #BBBBBB; + background: #CCCCCC; + background: -webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC)); + background: -moz-linear-gradient(top, #FFFFFF, #CCCCCC); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#CCCCCC')!important; + filter: dropshadow(color=#FFFFFF, offx=1, offy=1); +} + +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 { + margin:0; + padding:0; + display:inline; + font-size: 100%; + font-weight: bold; +} +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .yui3-widget-buttons { + padding: 5px; +} +.moodle-dialogue-base .closebutton { + width:25px; + height:15px; + float:right; + vertical-align:middle; + display:inline-block; + cursor:pointer; + padding:0px; + background-image:url([[pix:theme|sprite]]); + background-repeat:no-repeat; + border-style:none; +} +.dir-rtl .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .yui3-widget-buttons { + left: 0px; + right: auto; +} + +.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd { + overflow: auto; + padding: 1em; + line-height: 2em; + color: #555; + font-size: 12px; +} + +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-content { + padding:0px; + background:#FFF; +} + +.moodle-dialogue-confirm .confirmation-dialogue {text-align:center;} +.moodle-dialogue-confirm .confirmation-dialogue input {text-align:center;} +.moodle-dialogue-exception .moodle-exception-message {text-align:center} +.moodle-dialogue-exception .moodle-exception-param label {font-weight:bold;} +.moodle-dialogue-exception .param-stacktrace label { + background-color:#EEE; + border:1px solid #ccc; + border-bottom-width:0; +} + +.moodle-dialogue-exception .param-stacktrace pre { + border:1px solid #ccc; + background-color:#fff; +} + +.moodle-dialogue-exception .param-stacktrace .stacktrace-file { + color:navy + font-size:80% +} +.moodle-dialogue-exception .param-stacktrace .stacktrace-line { + color:#AA0000 + font-size:80% +} +.moodle-dialogue-exception .param-stacktrace .stacktrace-call { + color:#333 + font-size:90% + border-bottom:1px solid #eee +} + +.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft { + padding:0px; + margin: 0.7em 1em; + text-align: right; + background-color: #FFF; + font-size: 12px; +} + +.moodle-dialogue-confirm .confirmation-message {margin:0.5em 1em;} +.moodle-dialogue-confirm .confirmation-dialogue input {min-width:80px} +.moodle-dialogue-exception .moodle-exception-message {margin:1em;} +.moodle-dialogue-exception .moodle-exception-param {margin-bottom:0.5em;} +.moodle-dialogue-exception .moodle-exception-param label {width:150px;} +.moodle-dialogue-exception .param-stacktrace label { + display:block; + margin:0; + padding:4px 1em; +} +.moodle-dialogue-exception .param-stacktrace pre { + display:block; + height:200px; + overflow:auto; +} + +.moodle-dialogue-exception .param-stacktrace .stacktrace-file { + display:inline-block + margin:4px 0 +} +.moodle-dialogue-exception .param-stacktrace .stacktrace-line { + display:inline-block + width:50px + margin:4px 1em +} +.moodle-dialogue-exception .param-stacktrace .stacktrace-call { + padding-left:25px + margin-bottom:4px + padding-bottom:4px +} + + +/* Question Bank - Question Chooser "Close" button */ +#page-question-edit.dir-rtl a.container-close {right:auto;left:6px;} + /** - * Chooser Dialogue + * Chooser Dialogues (moodle-core-chooserdialogue) * * This CSS belong to the chooser dialogue which should work both with, and * without javascript enabled @@ -878,47 +1036,11 @@ sup {vertical-align: super;} .choosertitle { display:none; } - -.moodle-dialogue-base .moodle-dialogue { - background: none!important; - border: 0 none!important; +.moodle-dialogue.chooserdialogue .moodle-dialogue-content .moodle-dialogue-ft { + margin: 0; } -.chooserdialogue .moodle-dialogue-wrap { - height: auto; - background-color: #FFFFFF; - border: 1px solid #CCCCCC!important; - border-radius:10px; - box-shadow: 5px 5px 20px 0px #666666; - -webkit-box-shadow: 5px 5px 20px 0px #666666; - -moz-box-shadow: 5px 5px 20px 0px #666666; -} - -.chooserdialogue .moodle-dialogue-wrap .moodle-dialogue-hd { - font-size:12px!important; - font-weight: normal!important; - letter-spacing: 1px; - color:#333333!important; - text-align: center!important; - text-shadow: 1px 1px 1px #FFFFFF; - padding:5px 5px 5px 5px; - border-radius: 10px 10px 0px 0px; - border-bottom: 1px solid #BBBBBB!important; - background: #CCCCCC!important; - background: -webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC))!important; - background: -moz-linear-gradient(top, #FFFFFF, #CCCCCC)!important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#CCCCCC')!important; - filter: dropshadow(color=#FFFFFF, offx=1, offy=1); -} -/* Activity Chooser "Close" button */ -.dir-rtl .moodle-dialogue-base .closebutton {float: left;} -/* Question Bank - Question Chooser "Close" button */ -#page-question-edit.dir-rtl a.container-close {right:auto;left:6px;} - .chooserdialogue .moodle-dialogue-wrap .moodle-dialogue-bd { - font-size: 12px; - color: #555555; - overflow: auto; padding: 0px; background: #F2F2F2; border-bottom-left-radius: 10px;