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/nihilo/Toolbar.css | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'lib/dijit/themes/nihilo/Toolbar.css') diff --git a/lib/dijit/themes/nihilo/Toolbar.css b/lib/dijit/themes/nihilo/Toolbar.css index aeee9e4ed..1c3e32702 100644 --- a/lib/dijit/themes/nihilo/Toolbar.css +++ b/lib/dijit/themes/nihilo/Toolbar.css @@ -2,32 +2,38 @@ border-bottom: 1px solid #ccc; background:#eaeaea url("images/titleBar.png") repeat-x top left; } + +/* setting a min-height on ditor toolbar */ .dj_ie6 .nihilo .dijitToolbar { height: 10px; } + .nihilo .dijitToolbar .dijitButtonNode, .nihilo .dijitToolbar .dijitComboButton .dijitButtonContents, .nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; border: none; font-size: 12px; } + .nihilo .dijitToolbar .dijitButton, .nihilo .dijitToolbar .dijitToggleButton, .nihilo .dijitToolbar .dijitDropDownButton, .nihilo .dijitToolbar .dijitComboButton .dijitButtonContents, .nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - padding: 1px; + padding: 1px; /* on hover etc., margin replaced w/border */ } + .nihilo .dijitToolbar .dijitButtonChecked, .nihilo .dijitToolbar .dijitToggleButtonChecked { background-color:#ffeeb9; border:1px solid #f7c95c; padding: 0; } + .nihilo .dijitToolbar .dijitButtonCheckedHover, .nihilo .dijitToolbar .dijitToggleButtonCheckedHover { @@ -35,22 +41,25 @@ border:1px solid #f7c95c; padding: 0; } + .nihilo .dijitToolbar .dijitButtonHover, .nihilo .dijitToolbar .dijitToggleButtonHover, .nihilo .dijitToolbar .dijitDropDownButtonHover, .nihilo .dijitToolbar .dijitComboButton .dijitButtonContentsHover, .nihilo .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 #f7c95c; padding: 0; background-color:#ffe284; } + .nihilo .dijitToolbar label { padding: 3px 3px 0 6px; } + .dj_ie .nihilo .dijitToolbar .dijitComboButton .dijitButtonContentsFocused, .dj_ie .nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused { - + /* focus border doesn't appear on for IE, so need to add it manually */ border: 1px #555 dotted !important; - padding: 0px; -} + padding: 0; +} \ No newline at end of file -- cgit v1.2.3