From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dijit/themes/soria/Toolbar.css | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'lib/dijit/themes/soria/Toolbar.css') diff --git a/lib/dijit/themes/soria/Toolbar.css b/lib/dijit/themes/soria/Toolbar.css index 4eb55a4e1..8af426a11 100644 --- a/lib/dijit/themes/soria/Toolbar.css +++ b/lib/dijit/themes/soria/Toolbar.css @@ -2,55 +2,64 @@ border-bottom: 1px solid #ccc; background:#eaeaea url("images/titleBar.png") repeat-x top left; } + +/* setting a min-height on ditor toolbar */ .dj_ie6 .soria .dijitToolbar { height: 10px; } + .soria .dijitToolbar .dijitButtonNode, .soria .dijitToolbar .dijitComboButton .dijitButtonContents, .soria .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; border: none; font-size: 12px; } + .soria .dijitToolbar .dijitButton, .soria .dijitToolbar .dijitToggleButton, .soria .dijitToolbar .dijitDropDownButton, .soria .dijitToolbar .dijitComboButton .dijitButtonContents, .soria .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - padding: 1px; + padding: 1px; /* on hover etc., margin replaced w/border */ } + .soria .dijitToolbar .dijitButtonChecked, .soria .dijitToolbar .dijitToggleButtonChecked { background-color:#d8e5f8; border:1px solid #316ac5; - padding: 0px; + padding: 0; } + .soria .dijitToolbar .dijitButtonCheckedHover, .soria .dijitToolbar .dijitToggleButtonCheckedHover { background-color:#9abbea; border:1px solid #316ac5; - padding: 0px; + padding: 0; } + .soria .dijitToolbar .dijitButtonHover, .soria .dijitToolbar .dijitToggleButtonHover, .soria .dijitToolbar .dijitDropDownButtonHover, .soria .dijitToolbar .dijitComboButton .dijitButtonContentsHover, .soria .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover { - + /* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */ border: 1px solid #316ac5; - padding: 0px; + padding: 0; background-color:#9abbea; } + .soria .dijitToolbar label { padding: 3px 3px 0 6px; } + .dj_ie .soria .dijitToolbar .dijitComboButton .dijitButtonContentsFocused, .dj_ie .soria .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused { - + /* focus border doesn't appear on for IE, so need to add it manually */ border: 1px #777 dotted !important; - padding: 0px; + padding: 0; } -- cgit v1.2.3