diff options
author | Andrew Dolgov <[email protected]> | 2012-08-14 18:59:10 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-08-14 18:59:18 +0400 |
commit | 1354d17270961fff662d40f90521223f8fd0d73b (patch) | |
tree | e9266be71587e47c800303446e968a6d3565e2cf /lib/dijit/themes/claro/Toolbar.css | |
parent | d04f8c826f5283765f52cf6b98b42a1ed8f2d6bc (diff) |
update dojo to 1.7.3
Diffstat (limited to 'lib/dijit/themes/claro/Toolbar.css')
-rw-r--r-- | lib/dijit/themes/claro/Toolbar.css | 55 |
1 files changed, 43 insertions, 12 deletions
diff --git a/lib/dijit/themes/claro/Toolbar.css b/lib/dijit/themes/claro/Toolbar.css index a9e6f4f5e..18c605c66 100644 --- a/lib/dijit/themes/claro/Toolbar.css +++ b/lib/dijit/themes/claro/Toolbar.css @@ -29,8 +29,12 @@ .claro .dijitToolbar label { padding: 0 3px 0 6px; } -/** override claro/form/Button.css **/ -.claro .dijitToolbar .dijitButtonNode { +/** override claro/form/Button.css, and also ComboBox down arrow **/ +.claro .dijitToolbar .dijitButton .dijitButtonNode, +.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, +.claro .dijitToolbar .dijitComboButton .dijitButtonNode, +.claro .dijitToolbar .dijitToggleButton .dijitButtonNode, +.claro .dijitToolbar .dijitComboBox .dijitButtonNode { border-width: 0; /* on hover/active, border-->1px, padding-->1px */ @@ -51,16 +55,43 @@ background-repeat: repeat-x; background-color: rgba(171, 214, 255, 0); } -.dj_ie .claro .dijitToolbar .dijitButtonNode { +.dj_ie .claro .dijitToolbar .dijitButton .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitComboButton .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitToggleButton .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitComboBox .dijitButtonNode { background-color: transparent; /* for IE, which doesn't understand rgba(...) */ } -.dj_ie6 .claro .dijitToolbar .dijitButtonNode { +.dj_ie6 .claro .dijitToolbar .dijitButton .dijitButtonNode, +.dj_ie6 .claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, +.dj_ie6 .claro .dijitToolbar .dijitComboButton .dijitButtonNode, +.dj_ie6 .claro .dijitToolbar .dijitToggleButton .dijitButtonNode, +.dj_ie6 .claro .dijitToolbar .dijitComboBox .dijitButtonNode { background: none; - /* because background-color: transparent above doesn't work */ + /* because background-color: transparent above doesn't work on IE*/ } +/* hover status */ +.dj_ie .claro .dijitToolbar .dijitButtonHover .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitComboButton .dijitButtonNodeHover, +.dj_ie .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover, +.dj_ie .claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode { + /* button should still turn blue on hover, so need to override .dj_ie rules above */ + + background-color: #abd6ff; +} +/* active status */ +.dj_ie .claro .dijitToolbar .dijitButtonActive .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode, +.dj_ie .claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode { + /* button should still turn blue on press, so need to override .dj_ie rules above */ + + background-color: #abd6ff; +} .claro .dijitToolbar .dijitComboButton .dijitStretch { /* no rounded border on side adjacent to arrow */ @@ -88,7 +119,7 @@ } .claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode, .claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton { background-position: 0 0; - background-color: #f4ffff; + background-color: #f3ffff; } .claro .dijitToolbar .dijitComboButtonHover .dijitButtonNodeHover, .claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButtonHover { background-color: #abd6ff; @@ -96,7 +127,7 @@ /* active status */ .claro .dijitToolbar .dijitButtonActive .dijitButtonNode, .claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode, .claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode { border-width: 1px; - background-color: #7dbefa; + background-color: #7dbdfa; background-position: 0 -177px; padding: 1px; } @@ -108,15 +139,15 @@ padding: 0; } .claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode, .claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton { - background-color: #f4ffff; + background-color: #f3ffff; background-position: 0 -177px; padding: 2px; } .claro .dijitToolbar .dijitComboButtonActive .dijitButtonNodeActive { - background-color: #7dbefa; + background-color: #7dbdfa; } .claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButtonActive { - background-color: #7dbefa; + background-color: #7dbdfa; } /* Avoid double border between button and arrow */ .claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton, .claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton { @@ -135,7 +166,7 @@ border-width: 1px; border-style: solid; background-image: none; - border-color: #769dc0; + border-color: #759dc0; background-color: #ffffff; padding: 1px; } @@ -145,7 +176,7 @@ .claro .dijitToolbarSeparator { /* separator icon in the editor sprite */ - background: url('../../icons/images/editorIconsEnabled.png'); + background: url("../../icons/images/editorIconsEnabled.png"); } /* Toolbar inside of disabled Editor */ .claro .dijitDisabled .dijitToolbar { |