diff options
author | Andrew Dolgov <[email protected]> | 2011-11-08 20:40:44 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-11-08 20:40:44 +0400 |
commit | 81bea17aefb26859f825b9293c7c99192874806e (patch) | |
tree | fb244408ca271affa2899adb634788802c9a89d8 /lib/dijit/themes/claro/Toolbar.css | |
parent | 870a70e109ac9e80a88047044530de53d0404ec7 (diff) |
upgrade Dojo to 1.6.1
Diffstat (limited to 'lib/dijit/themes/claro/Toolbar.css')
-rw-r--r-- | lib/dijit/themes/claro/Toolbar.css | 233 |
1 files changed, 129 insertions, 104 deletions
diff --git a/lib/dijit/themes/claro/Toolbar.css b/lib/dijit/themes/claro/Toolbar.css index 2189dcd4d..a9e6f4f5e 100644 --- a/lib/dijit/themes/claro/Toolbar.css +++ b/lib/dijit/themes/claro/Toolbar.css @@ -1,133 +1,158 @@ - +/* Toolbar + * + * Styling Toolbar means styling the toolbar container and the widget inside toolbar (dijitToolbar) + * + * 1. toolbar (default styling): + * .dijitToolbar - styles for outer container + * + * 2. widget inside toolbar + * .dijitToolbar .dijitButtonNode - Button widget + * .dijitComboButton - ComboButton widget + * .dijitDropDownButton - DropDownButton widget + * .dijitToggleButton - ToggleButton widget + * + * 3. hovered widget inside toolbar (ie, mouse hover on the widget inside) + * .dijitToolbar .dijitButtonNodeHover - styles for hovered Button widget + * + * 4. actived widget inside toolbar (ie, mouse down on the widget inside) + * .dijitToolbar .dijitButtonNodeActive - mouse down on Button widget + */ .claro .dijitToolbar { - border-bottom: 1px solid #b5bcc7; - background-color: #f1f1f1; - background-image: url("images/commonHighlight.png"); - background-position:0px 0px; - background-repeat:repeat-x; - padding: 2px 0px 2px 4px; - zoom: 1; + border-bottom: 1px solid #b5bcc7; + background-color: #efefef; + background-image: url("images/commonHighlight.png"); + background-position: 0 0; + background-repeat: repeat-x; + padding: 2px 0 2px 4px; + zoom: 1; } .claro .dijitToolbar label { - padding: 0px 3px 0 6px; + padding: 0 3px 0 6px; } +/** override claro/form/Button.css **/ .claro .dijitToolbar .dijitButtonNode { - border:none; - padding: 2px; - background-image: url("images/commonHighlight.png"); - background-position:0 -30px; - background-repeat:repeat-x; - background-color:rgba(171,214,255,0); - border-radius: 2px; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - -moz-box-shadow: none; - -webkit-box-shadow: none; - -webkit-transition-property:background-color; - -webkit-transition-duration:.3s, .35s; -} -.claro .dijitToolbar .dijitComboButton .dijitButtonNode{ - padding: 3px 2px 3px 2px; + border-width: 0; + /* on hover/active, border-->1px, padding-->1px */ + + padding: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + transition-property: background-color; + -webkit-transition-duration: 0.3s, 0.35s; + -moz-transition-duration: 0.3s, 0.35s; + transition-duration: 0.3s, 0.35s; + background-image: url("images/commonHighlight.png"); + background-position: 0 -30px; + background-repeat: repeat-x; + background-color: rgba(171, 214, 255, 0); } .dj_ie .claro .dijitToolbar .dijitButtonNode { - background-color: transparent; + background-color: transparent; + /* for IE, which doesn't understand rgba(...) */ + } .dj_ie6 .claro .dijitToolbar .dijitButtonNode { - background: none; + background: none; + /* because background-color: transparent above doesn't work */ + } -.claro .dijitToolbar .dijitComboBox .dijitButtonNode { - padding: 0px; +.claro .dijitToolbar .dijitComboButton .dijitStretch { + /* no rounded border on side adjacent to arrow */ + + -moz-border-radius: 2px 0 0 2px; + border-radius: 2px 0 0 2px; } -.claro .dijitToolbar .dijitComboButton { - padding: 1px; +.claro .dijitToolbar .dijitComboButton .dijitArrowButton { + /* no rounded border on side adjacent to button */ + + -moz-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; +} +.claro .dijitToolbar .dijitComboBox .dijitButtonNode { + padding: 0; } +/* hover status */ .claro .dijitToolbar .dijitButtonHover .dijitButtonNode, .claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode, -.claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode { - background-position:0 0; - border:solid 1px #769dc0; - background-color: #abd6ff; - padding: 1px; -} -.claro .dijitToolbar .dijitComboButtonHover { - background-color: #abd6ff; - border: solid 1px #769dc0; - padding: 0px; -} -.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode, -.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton { - background-position:0 0; - padding: 2px; -} -.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton { - background-color: #7dd6fa; -} -.claro .dijitToolbar .dijitButtonActive .dijitButtonNode, -.claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode, -.claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode { - border:solid 1px #769dc0; - background-color:#7dbefa; - background-position:0px -177px; - padding: 1px; +.claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode, +.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode { + background-position: 0 0; + border-width: 1px; + background-color: #abd6ff; + padding: 1px; +} +.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode, .claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton { + background-position: 0 0; + background-color: #f4ffff; +} +.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNodeHover, .claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButtonHover { + background-color: #abd6ff; +} +/* active status */ +.claro .dijitToolbar .dijitButtonActive .dijitButtonNode, .claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode, .claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode { + border-width: 1px; + background-color: #7dbefa; + background-position: 0 -177px; + padding: 1px; } .claro .dijitToolbar .dijitComboButtonActive { - -webkit-transition-duration:.2s; - border: solid 1px #769dc0; - padding: 0px; + -webkit-transition-duration: 0.2s; + -moz-transition-duration: 0.2s; + transition-duration: 0.2s; + border-width: 1px; + padding: 0; } -.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode { - background-color: #7dbefa; - background-position:0px -177px; - padding: 2px; +.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode, .claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton { + background-color: #f4ffff; + background-position: 0 -177px; + padding: 2px; } -.claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonActive { - background-color: #7dbefa; +.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNodeActive { + background-color: #7dbefa; } -.claro .dijitToolbar .dijitToggleButtonChecked .dijitButtonNode { - border-color: #769dc0; - background-color:#fff; - padding: 1px; +.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButtonActive { + background-color: #7dbefa; } -.dj_ie6 .claro .dijitToolbar .dijitButtonContents, -.dj_ie7 .claro .dijitToolbar .dijitButtonContents { - margin: -2px 0; - padding: 0; +/* Avoid double border between button and arrow */ +.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton, .claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton { + border-left-width: 0; } -.dj_ie6 .claro .dijitToolbar { - background-image: none; +.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton { + padding-left: 2px; + /* since there's no left border, don't reduce from 2px --> 1px */ + } -.dj_ie6 .claro .dijitToolbar .dijitButtonNode { - margin: 1px; - border: none; -} -.dj_ie6 .claro .dijitToolbar .dijitButtonHover .dijitButtonNode, -.dj_ie6 .claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitButtonNodeHover, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover, -.dj_ie6 .claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode, -.dj_ie6 .claro .dijitToolbar .dijitButtonActive .dijitButtonNode, -.dj_ie6 .claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitButtonNodeActive, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonActive, -.dj_ie6 .claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode, +/* toggle button checked status */ .claro .dijitToolbar .dijitToggleButtonChecked .dijitButtonNode { - margin: 0; - border-width: 1px; - border-style: solid; - background-image: none; + margin: 0; + /* remove margin and add a border */ + + border-width: 1px; + border-style: solid; + background-image: none; + border-color: #769dc0; + background-color: #ffffff; + padding: 1px; } -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitButtonNodeHover, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitButtonNodeActive, -.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonActive { - padding: 1px; +.dj_ie6 .claro .dijitToolbar { + background-image: none; } .claro .dijitToolbarSeparator { - - background: url('../../icons/images/editorIconsEnabled.png'); + /* separator icon in the editor sprite */ + + background: url('../../icons/images/editorIconsEnabled.png'); } +/* Toolbar inside of disabled Editor */ .claro .dijitDisabled .dijitToolbar { - background:none; - background-color:#f5f5f5; - border-bottom: 1px solid #d3d3d3; + background: none; + background-color: #efefef; + border-bottom: 1px solid #d3d3d3; +} +.claro .dijitToolbar .dijitComboBoxDisabled .dijitArrowButtonInner { + background-position: 0 50%; } |