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/form | |
parent | d04f8c826f5283765f52cf6b98b42a1ed8f2d6bc (diff) |
update dojo to 1.7.3
Diffstat (limited to 'lib/dijit/themes/claro/form')
-rw-r--r-- | lib/dijit/themes/claro/form/Button.css | 14 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Button.less | 10 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Checkbox.css | 8 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Checkbox.less | 8 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Common.css | 35 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Common.less | 30 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/NumberSpinner.css | 4 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/NumberSpinner.less | 6 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/RadioButton.css | 8 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/RadioButton.less | 8 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Select.css | 18 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Select.less | 6 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Slider.css | 33 | ||||
-rw-r--r-- | lib/dijit/themes/claro/form/Slider.less | 17 |
14 files changed, 124 insertions, 81 deletions
diff --git a/lib/dijit/themes/claro/form/Button.css b/lib/dijit/themes/claro/form/Button.css index e01a1d313..bc7c3dc18 100644 --- a/lib/dijit/themes/claro/form/Button.css +++ b/lib/dijit/themes/claro/form/Button.css @@ -41,12 +41,13 @@ .claro .dijitToggleButton .dijitButtonNode { /* rules for the dijit.form.*Button widgets (see also ComboButton section below) */ - border: 1px solid #769dc0; + border: 1px solid #759dc0; padding: 2px 4px 4px 4px; - background-image: url("images/button.png"); + background-image: url("../form/images/button.png"); background-position: center top; background-repeat: repeat-x; - background-color: #e9f4fe; + background-color: #e5f2fe; + color: #000000; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15); @@ -64,7 +65,7 @@ width: 15px; height: 15px; margin: 0 auto; - background-image: url("images/buttonArrows.png"); + background-image: url("../form/images/buttonArrows.png"); background-repeat: no-repeat; background-position: -51px 53%; } @@ -105,11 +106,12 @@ -moz-transition-duration: 0.2s; transition-duration: 0.2s; } -/* checked status */ +/* active, checked status */ .claro .dijitButtonActive .dijitButtonNode, .claro .dijitDropDownButtonActive .dijitButtonNode, .claro .dijitComboButtonActive .dijitButtonNode, -.claro .dijitToggleButtonActive .dijitButtonNode { +.claro .dijitToggleButtonActive .dijitButtonNode, +.claro .dijitStackController .dijitToggleButtonChecked .dijitButtonNode { background-color: #abd6ff; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); diff --git a/lib/dijit/themes/claro/form/Button.less b/lib/dijit/themes/claro/form/Button.less index b076d2a16..208e4de52 100644 --- a/lib/dijit/themes/claro/form/Button.less +++ b/lib/dijit/themes/claro/form/Button.less @@ -41,10 +41,11 @@ /* rules for the dijit.form.*Button widgets (see also ComboButton section below) */ border: 1px solid @button-border-color; padding:2px 4px 4px 4px; - background-image: url("images/button.png"); + background-image: url("../@{image-form-button}"); background-position: center top; background-repeat: repeat-x; background-color: @button-background-color; + color: @text-color; .border-radius(@button-border-radius); .box-shadow(0 1px 1px rgba(0,0,0,0.15)); } @@ -59,7 +60,7 @@ width: 15px; height: 15px; margin: 0 auto; - background-image:url("images/buttonArrows.png"); + background-image:url("../@{image-form-button-arrows}"); background-repeat:no-repeat; background-position:-51px 53%; } @@ -105,11 +106,12 @@ .transition-duration(.2s); } -/* checked status */ +/* active, checked status */ .claro .dijitButtonActive .dijitButtonNode, .claro .dijitDropDownButtonActive .dijitButtonNode, .claro .dijitComboButtonActive .dijitButtonNode, -.claro .dijitToggleButtonActive .dijitButtonNode { +.claro .dijitToggleButtonActive .dijitButtonNode, +.claro .dijitStackController .dijitToggleButtonChecked .dijitButtonNode { background-color: @button-pressed-background-color; .box-shadow(0 0 0 rgba(0,0,0,0)); .transition-duration(.1s); diff --git a/lib/dijit/themes/claro/form/Checkbox.css b/lib/dijit/themes/claro/form/Checkbox.css index 5765bb370..1c1a3c438 100644 --- a/lib/dijit/themes/claro/form/Checkbox.css +++ b/lib/dijit/themes/claro/form/Checkbox.css @@ -19,13 +19,13 @@ * .dijitCheckBoxDisabled|.dijitCheckBoxCheckedDisabled - for background image */ .claro .dijitToggleButton .dijitCheckBoxIcon { - background-image: url('../images/checkmarkNoBorder.png'); + background-image: url("../images/checkmarkNoBorder.png"); } .dj_ie6 .claro .dijitToggleButton .dijitCheckBoxIcon { - background-image: url('../images/checkmarkNoBorder.gif'); + background-image: url("../images/checkmarkNoBorder.gif"); } .claro .dijitCheckBox, .claro .dijitCheckBoxIcon { - background-image: url('images/checkboxRadioButtonStates.png'); + background-image: url("../form/images/checkboxRadioButtonStates.png"); /* checkbox sprite image */ background-repeat: no-repeat; @@ -35,7 +35,7 @@ padding: 0; } .dj_ie6 .claro .dijitCheckBox, .dj_ie6 .claro .dijitCheckBoxIcon { - background-image: url('images/checkboxAndRadioButtons_IE6.png'); + background-image: url("../form/images/checkboxAndRadioButtons_IE6.png"); /* checkbox sprite image */ } diff --git a/lib/dijit/themes/claro/form/Checkbox.less b/lib/dijit/themes/claro/form/Checkbox.less index 21769dca1..6ce444800 100644 --- a/lib/dijit/themes/claro/form/Checkbox.less +++ b/lib/dijit/themes/claro/form/Checkbox.less @@ -22,16 +22,16 @@ @import "../variables"; .claro .dijitToggleButton .dijitCheckBoxIcon { - background-image: url('../images/checkmarkNoBorder.png'); + background-image: url("../@{image-checkmark}"); } .dj_ie6 .claro .dijitToggleButton .dijitCheckBoxIcon { - background-image: url('../images/checkmarkNoBorder.gif'); + background-image: url("../@{image-checkmark-ie6}"); } .claro .dijitCheckBox, .claro .dijitCheckBoxIcon /* inside a toggle button */ { - background-image: url('images/checkboxRadioButtonStates.png'); /* checkbox sprite image */ + background-image: url("../@{image-form-checkbox-and-radios}"); /* checkbox sprite image */ background-repeat: no-repeat; width: 15px; height: 16px; @@ -41,7 +41,7 @@ .dj_ie6 .claro .dijitCheckBox, .dj_ie6 .claro .dijitCheckBoxIcon /* inside a toggle button */ { - background-image: url('images/checkboxAndRadioButtons_IE6.png'); /* checkbox sprite image */ + background-image: url("../@{image-form-checkbox-and-radios-ie6}"); /* checkbox sprite image */ } .claro .dijitCheckBox, diff --git a/lib/dijit/themes/claro/form/Common.css b/lib/dijit/themes/claro/form/Common.css index ab8bb5c3b..ce108c1ae 100644 --- a/lib/dijit/themes/claro/form/Common.css +++ b/lib/dijit/themes/claro/form/Common.css @@ -1,9 +1,12 @@ /* claro/form/Common.css */ /*========================= common css =========================*/ /* 'dijitTextBox' refers to 'dijit(TextBox|DateTextBox|CurrencyTextBox|...)' */ +.claro .dijitTextBox, .claro .dijitInputInner { + color: #000000; +} .claro .dijitTextBoxError .dijitValidationContainer { background-color: #d46464; - background-image: url('images/error.png'); + background-image: url("../form/images/error.png"); background-position: top center; border: solid #d46464 0; border-left-width: 1px; @@ -45,14 +48,14 @@ } /* hover */ .claro .dijitTextBoxHover, .claro .dijitTextBoxHover .dijitButtonNode { - border-color: #769dc0; + border-color: #759dc0; -webkit-transition-duration: 0.25s; -moz-transition-duration: 0.25s; transition-duration: 0.25s; } .claro .dijitTextBoxHover { - background-color: #e9f4fe; - background-image: url('images/textBox_back.png'); + background-color: #e5f2fe; + background-image: url("../form/images/textBox_back.png"); background-repeat: repeat-x; } /* error state */ @@ -64,21 +67,21 @@ } /* focused state */ .claro .dijitTextBoxFocused, .claro .dijitTextBoxFocused .dijitButtonNode { - border-color: #769dc0; + border-color: #759dc0; -webkit-transition-duration: 0.1s; -moz-transition-duration: 0.1s; transition-duration: 0.1s; } .claro .dijitTextBoxFocused { background-color: #ffffff; - background-image: url('images/textBox_back.png'); + background-image: url("../form/images/textBox_back.png"); background-repeat: repeat-x; } .claro .dijitTextBoxFocused .dijitInputContainer { background: #ffffff; } .claro .dijitTextBoxErrorFocused, .claro .dijitTextBoxErrorFocused .dijitButtonNode { - border-color: #ce4f4f; + border-color: #ce5050; } /* disabled state */ .claro .dijitTextBoxDisabled, .claro .dijitTextBoxDisabled .dijitButtonNode { @@ -87,12 +90,24 @@ .claro .dijitTextBoxDisabled, .claro .dijitTextBoxDisabled .dijitInputContainer { background-color: #efefef; background-image: none; +} +.claro .dijitTextBoxDisabled, .claro .dijitTextBoxDisabled .dijitInputInner { color: #818181; } +.dj_webkit .claro .dijitTextBoxDisabled input { + /* because WebKit lightens disabled input/textarea no matter what color you specify */ + + color: #757575; +} +.dj_webkit .claro textarea.dijitTextAreaDisabled { + /* because WebKit lightens disabled input/textarea no matter what color you specify */ + + color: #1b1b1b; +} /*========================= for special widgets =========================*/ /* Input boxes with an arrow (for a drop down) */ .claro .dijitComboBox .dijitArrowButtonInner { - background-image: url("images/commonFormArrows.png"); + background-image: url("../form/images/commonFormArrows.png"); background-position: -35px 53%; background-repeat: no-repeat; margin: 0; @@ -112,7 +127,7 @@ } .claro .dijitComboBox .dijitButtonNode { background-color: #efefef; - background-image: url("images/formHighlight.png"); + background-image: url("../form/images/formHighlight.png"); background-repeat: repeat-x; } /* Arrow "hover" effect: @@ -128,7 +143,7 @@ } /* Arrow Button change when drop down is open */ .claro .dijitComboBox .dijitHasDropDownOpen { - background-color: #7dbefa; + background-color: #7dbdfa; background-position: 0 -177px; padding: 1px; } diff --git a/lib/dijit/themes/claro/form/Common.less b/lib/dijit/themes/claro/form/Common.less index 729867a67..742a43ff7 100644 --- a/lib/dijit/themes/claro/form/Common.less +++ b/lib/dijit/themes/claro/form/Common.less @@ -6,9 +6,16 @@ /* 'dijitTextBox' refers to 'dijit(TextBox|DateTextBox|CurrencyTextBox|...)' */ +.claro .dijitTextBox, +.claro .dijitInputInner { + // .dijitInputInner selector needed for ValidationTextBox on IE6 because <input> doesn't inherit + // the color setting from the ancestor div.dijitTextBox + color: @text-color; +} + .claro .dijitTextBoxError .dijitValidationContainer { background-color: @erroricon-background-color; - background-image: url('images/error.png'); + background-image: url("../@{image-form-error}"); background-position: top center; border: solid @erroricon-background-color 0; border-left-width: 1px; @@ -60,7 +67,7 @@ } .claro .dijitTextBoxHover { background-color: @textbox-hovered-background-color; - background-image: url('images/textBox_back.png'); + background-image: url("../@{image-form-textbox-background}"); background-repeat: repeat-x; } @@ -82,7 +89,7 @@ } .claro .dijitTextBoxFocused { background-color: @textbox-focused-background-color; - background-image: url('images/textBox_back.png'); + background-image: url("../@{image-form-textbox-background}"); background-repeat: repeat-x; } .claro .dijitTextBoxFocused .dijitInputContainer { @@ -103,15 +110,26 @@ .claro .dijitTextBoxDisabled .dijitInputContainer { background-color: @textbox-disabled-background-color; background-image: none; +} +.claro .dijitTextBoxDisabled, +.claro .dijitTextBoxDisabled .dijitInputInner { color: @disabled-text-color; } +.dj_webkit .claro .dijitTextBoxDisabled input { + /* because WebKit lightens disabled input/textarea no matter what color you specify */ + color: darken(@disabled-text-color, 5%) +} +.dj_webkit .claro textarea.dijitTextAreaDisabled { + /* because WebKit lightens disabled input/textarea no matter what color you specify */ + color: darken(@disabled-text-color, 40%) +} /*========================= for special widgets =========================*/ /* Input boxes with an arrow (for a drop down) */ .claro .dijitComboBox .dijitArrowButtonInner { - background-image: url("images/commonFormArrows.png"); + background-image: url("../@{image-form-common-arrows}"); background-position:-35px 53%; background-repeat: no-repeat; margin: 0; @@ -136,7 +154,7 @@ .claro .dijitComboBox .dijitButtonNode { background-color: @arrowbutton-background-color; - background-image: url("images/formHighlight.png"); + background-image: url("../@{image-form-highlight}"); background-repeat:repeat-x; } @@ -191,4 +209,4 @@ } .dj_borderbox .claro .dijitComboBoxFocused .dijitHasDropDownOpen .dijitArrowButtonInner { width:16px; // when no border, then back to 16px just like content-box sizing -}
\ No newline at end of file +} diff --git a/lib/dijit/themes/claro/form/NumberSpinner.css b/lib/dijit/themes/claro/form/NumberSpinner.css index bc6e1aeb6..fcc804969 100644 --- a/lib/dijit/themes/claro/form/NumberSpinner.css +++ b/lib/dijit/themes/claro/form/NumberSpinner.css @@ -35,7 +35,7 @@ .claro .dijitSpinner .dijitArrowButton { width: auto; background-color: #efefef; - background-image: url("images/formHighlight.png"); + background-image: url("../form/images/formHighlight.png"); background-position: 0 0; background-repeat: repeat-x; overflow: hidden; @@ -54,7 +54,7 @@ border-bottom-width: 0; /* 2 top borders = 1 top+bottom border in ComboBox */ - background-image: url("images/commonFormArrows.png"); + background-image: url("../form/images/commonFormArrows.png"); background-repeat: no-repeat; height: 100%; width: 15px; diff --git a/lib/dijit/themes/claro/form/NumberSpinner.less b/lib/dijit/themes/claro/form/NumberSpinner.less index ca78afb35..1c79d3a37 100644 --- a/lib/dijit/themes/claro/form/NumberSpinner.less +++ b/lib/dijit/themes/claro/form/NumberSpinner.less @@ -37,7 +37,7 @@ .claro .dijitSpinner .dijitArrowButton { width:auto; background-color: @arrowbutton-background-color; - background-image: url("images/formHighlight.png"); + background-image: url("../@{image-form-highlight}"); background-position:0 0; background-repeat:repeat-x; overflow: hidden; @@ -53,7 +53,7 @@ .claro .dijitSpinner .dijitArrowButtonInner { border:solid 1px @arrowbutton-inner-border-color; border-bottom-width: 0; /* 2 top borders = 1 top+bottom border in ComboBox */ - background-image: url("images/commonFormArrows.png"); + background-image: url("../@{image-form-common-arrows}"); background-repeat: no-repeat; height: 100%; width:15px; @@ -147,4 +147,4 @@ * should be no empty space between dijitInputLayoutContainer and dijitSpinner*/ .dj_ie7 .claro .dijitSpinner { overflow:visible; -}
\ No newline at end of file +} diff --git a/lib/dijit/themes/claro/form/RadioButton.css b/lib/dijit/themes/claro/form/RadioButton.css index 4dc3ad47d..bad1854b4 100644 --- a/lib/dijit/themes/claro/form/RadioButton.css +++ b/lib/dijit/themes/claro/form/RadioButton.css @@ -19,15 +19,15 @@ * .dijitRadioDisabled|.dijitRadioCheckedDisabled - for background image */ .claro .dijitToggleButton .dijitRadio, .claro .dijitToggleButton .dijitRadioIcon { - background-image: url('images/checkboxRadioButtonStates.png'); + background-image: url("../form/images/checkboxRadioButtonStates.png"); } .dj_ie6 .claro .dijitToggleButton .dijitRadio, .dj_ie6 .claro .dijitToggleButton .dijitRadioIcon { - background-image: url('images/checkboxAndRadioButtons_IE6.png'); + background-image: url("../form/images/checkboxAndRadioButtons_IE6.png"); } .claro .dijitRadio, .claro .dijitRadioIcon { /* inside a toggle button */ - background-image: url('images/checkboxRadioButtonStates.png'); + background-image: url("../form/images/checkboxRadioButtonStates.png"); /* checkbox sprite image */ background-repeat: no-repeat; @@ -39,7 +39,7 @@ .dj_ie6 .claro .dijitRadio, .dj_ie6 .claro .dijitRadioIcon { /* inside a toggle button */ - background-image: url('images/checkboxAndRadioButtons_IE6.png'); + background-image: url("../form/images/checkboxAndRadioButtons_IE6.png"); /* checkbox sprite image */ } diff --git a/lib/dijit/themes/claro/form/RadioButton.less b/lib/dijit/themes/claro/form/RadioButton.less index 18f1cc163..f48cb67ec 100644 --- a/lib/dijit/themes/claro/form/RadioButton.less +++ b/lib/dijit/themes/claro/form/RadioButton.less @@ -23,17 +23,17 @@ .claro .dijitToggleButton .dijitRadio, .claro .dijitToggleButton .dijitRadioIcon { - background-image: url('images/checkboxRadioButtonStates.png'); + background-image: url("../@{image-form-checkbox-and-radios}"); } .dj_ie6 .claro .dijitToggleButton .dijitRadio, .dj_ie6 .claro .dijitToggleButton .dijitRadioIcon { - background-image: url('images/checkboxAndRadioButtons_IE6.png'); + background-image: url("../@{image-form-checkbox-and-radios-ie6}"); } .claro .dijitRadio, .claro .dijitRadioIcon { /* inside a toggle button */ - background-image: url('images/checkboxRadioButtonStates.png'); /* checkbox sprite image */ + background-image: url("../@{image-form-checkbox-and-radios}"); /* checkbox sprite image */ background-repeat: no-repeat; width: 15px; height: 15px; @@ -43,7 +43,7 @@ .dj_ie6 .claro .dijitRadio, .dj_ie6 .claro .dijitRadioIcon { /* inside a toggle button */ - background-image: url('images/checkboxAndRadioButtons_IE6.png'); /* checkbox sprite image */ + background-image: url("../@{image-form-checkbox-and-radios-ie6}"); /* checkbox sprite image */ } .claro .dijitRadio{ diff --git a/lib/dijit/themes/claro/form/Select.css b/lib/dijit/themes/claro/form/Select.css index a30ede640..bfbca4ec8 100644 --- a/lib/dijit/themes/claro/form/Select.css +++ b/lib/dijit/themes/claro/form/Select.css @@ -37,11 +37,11 @@ border: 1px solid #ffffff; border-top: none; background-color: #efefef; - background-image: url("images/formHighlight.png"); + background-image: url("../form/images/formHighlight.png"); background-repeat: repeat-x; } .claro .dijitSelect .dijitArrowButton .dijitArrowButtonInner { - background-image: url("images/commonFormArrows.png"); + background-image: url("../form/images/commonFormArrows.png"); background-position: -35px 70%; background-repeat: no-repeat; width: 16px; @@ -49,13 +49,13 @@ } /* hover status */ .claro .dijitSelectHover { - border: 1px solid #769dc0; - background-color: #e9f4fe; - background-image: url('images/textBox_back.png'); + border: 1px solid #759dc0; + background-color: #e5f2fe; + background-image: url("../form/images/textBox_back.png"); background-repeat: repeat-x; } .claro .dijitSelectHover .dijitButtonContents { - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSelectHover .dijitArrowButton { background-color: #abd6ff; @@ -65,10 +65,10 @@ } /* focused status */ .claro .dijitSelectFocused { - border: 1px solid #769dc0; + border: 1px solid #759dc0; } .claro .dijitSelectFocused .dijitButtonContents { - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSelectFocused .dijitArrowButton { background-color: #7dbefa; @@ -105,5 +105,5 @@ padding: 2px; } .claro .dijitSelectMenu .dijitMenuSeparatorTop { - border-bottom: 1px solid #769dc0; + border-bottom: 1px solid #759dc0; } diff --git a/lib/dijit/themes/claro/form/Select.less b/lib/dijit/themes/claro/form/Select.less index c429b2e48..0e7426112 100644 --- a/lib/dijit/themes/claro/form/Select.less +++ b/lib/dijit/themes/claro/form/Select.less @@ -44,12 +44,12 @@ border: 1px solid @arrowbutton-inner-border-color; border-top:none; background-color: @arrowbutton-background-color; - background-image: url("images/formHighlight.png"); + background-image: url("../@{image-form-highlight}"); background-repeat:repeat-x; } .claro .dijitSelect .dijitArrowButton .dijitArrowButtonInner { - background-image: url("images/commonFormArrows.png"); + background-image: url("../@{image-form-common-arrows}"); background-position:-35px 70%; background-repeat: no-repeat; width:16px; @@ -60,7 +60,7 @@ .claro .dijitSelectHover { border: 1px solid @hovered-border-color; background-color: @textbox-hovered-background-color; - background-image: url('images/textBox_back.png'); + background-image: url("../@{image-form-textbox-background}"); background-repeat: repeat-x; } diff --git a/lib/dijit/themes/claro/form/Slider.css b/lib/dijit/themes/claro/form/Slider.css index 5694e8c76..eb82e17ad 100644 --- a/lib/dijit/themes/claro/form/Slider.css +++ b/lib/dijit/themes/claro/form/Slider.css @@ -54,28 +54,31 @@ outline: 1px; } .claro .dijitSliderFocused .dijitSliderBar { - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderHover .dijitSliderBar { - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderDisabled .dijitSliderBar { background-image: none; border-color: #d3d3d3; } +.claro .dijitRuleLabel { + color: #000000; +} /* Horizontal Slider */ .claro .dijitRuleLabelsContainerH { padding: 2px 0; } .claro .dijitSlider .dijitSliderProgressBarH, .claro .dijitSlider .dijitSliderLeftBumper { - background-image: url("images/sliderHorizontal.png"); + background-image: url("../form/images/sliderHorizontal.png"); background-repeat: repeat-x; background-position: 0 -20px; border-color: #b5bcc7; background-color: #cfe5fa; } .claro .dijitSlider .dijitSliderRemainingBarH, .claro .dijitSlider .dijitSliderRightBumper { - background-image: url("images/sliderHorizontal.png"); + background-image: url("../form/images/sliderHorizontal.png"); background-repeat: repeat-x; background-position: 0 -11px; border-color: #b5bcc7; @@ -90,22 +93,22 @@ .claro .dijitSliderHover .dijitSliderProgressBarH, .claro .dijitSliderHover .dijitSliderLeftBumper { background-position: 0 -20px; background-color: #abd6ff; - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderHover .dijitSliderRemainingBarH, .claro .dijitSliderHover .dijitSliderRightBumper { background-position: 0 0; background-color: #ffffff; - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderFocused .dijitSliderProgressBarH, .claro .dijitSliderFocused .dijitSliderLeftBumper { background-position: 0 -30px; background-color: #abd6ff; - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderFocused .dijitSliderRemainingBarH, .claro .dijitSliderFocused .dijitSliderRightBumper { background-position: 0 -9px; background-color: #ffffff; - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderDisabled .dijitSliderProgressBarH, .claro .dijitSliderDisabled .dijitSliderLeftBumper { background-color: #d3d3d3; @@ -121,14 +124,14 @@ padding: 0 2px; } .claro .dijitSlider .dijitSliderProgressBarV, .claro .dijitSlider .dijitSliderBottomBumper { - background-image: url("images/sliderVertical.png"); + background-image: url("../form/images/sliderVertical.png"); background-repeat: repeat-y; background-position: -36px 0; border-color: #b5bcc7; background-color: #cfe5fa; } .claro .dijitSlider .dijitSliderRemainingBarV, .claro .dijitSlider .dijitSliderTopBumper { - background-image: url("images/sliderVertical.png"); + background-image: url("../form/images/sliderVertical.png"); background-repeat: repeat-y; background-position: -3px 0; border-color: #b5bcc7; @@ -169,7 +172,7 @@ border: 0; width: 18px; height: 16px; - background-image: url("images/sliderThumbs.png"); + background-image: url("../form/images/sliderThumbs.png"); background-repeat: no-repeat; background-position: 0 0; } @@ -192,7 +195,7 @@ border: 0; width: 18px; height: 16px; - background-image: url("images/sliderThumbs.png"); + background-image: url("../form/images/sliderThumbs.png"); background-repeat: no-repeat; background-position: -289px 0; } @@ -222,7 +225,7 @@ .claro .dijitSliderIncrementIconH, .claro .dijitSliderDecrementIconV, .claro .dijitSliderIncrementIconV { - background-image: url('images/commonFormArrows.png'); + background-image: url("../form/images/commonFormArrows.png"); background-repeat: no-repeat; background-color: #efefef; -moz-border-radius: 2px; @@ -248,7 +251,7 @@ .claro .dijitSliderHover .dijitSliderIncrementIconV { /* dijitSliderActive should be treated as dijitSliderHover since "clicking the slider" has no meaning */ - border: solid 1px #769dc0; + border: solid 1px #759dc0; background-color: #ffffff; } .claro .dijitSliderDecrementIconH { @@ -286,7 +289,7 @@ .claro .dijitSliderButtonContainerV .dijitSliderIncrementButtonActive, .claro .dijitSliderButtonContainerH .dijitSliderIncrementButtonActive { background-color: #abd6ff; - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitSliderButtonInner { visibility: hidden; diff --git a/lib/dijit/themes/claro/form/Slider.less b/lib/dijit/themes/claro/form/Slider.less index 82451b506..db0f8cb24 100644 --- a/lib/dijit/themes/claro/form/Slider.less +++ b/lib/dijit/themes/claro/form/Slider.less @@ -66,6 +66,9 @@ background-image: none; border-color: @disabled-border-color; } +.claro .dijitRuleLabel { + color: @text-color; +} /* Horizontal Slider */ @@ -74,7 +77,7 @@ } .claro .dijitSlider .dijitSliderProgressBarH, .claro .dijitSlider .dijitSliderLeftBumper{ - background-image: url("images/sliderHorizontal.png"); + background-image: url("../@{image-form-slider-horizontal}"); background-repeat:repeat-x; background-position:0 -20px; border-color: @border-color; @@ -82,7 +85,7 @@ } .claro .dijitSlider .dijitSliderRemainingBarH, .claro .dijitSlider .dijitSliderRightBumper{ - background-image: url("images/sliderHorizontal.png"); + background-image: url("../@{image-form-slider-horizontal}"); background-repeat:repeat-x; background-position:0 -11px; border-color: @border-color; @@ -135,7 +138,7 @@ } .claro .dijitSlider .dijitSliderProgressBarV, .claro .dijitSlider .dijitSliderBottomBumper{ - background-image: url("images/sliderVertical.png"); + background-image: url("../@{image-form-slider-vertical}"); background-repeat:repeat-y; background-position:-36px 0; border-color: @border-color; @@ -143,7 +146,7 @@ } .claro .dijitSlider .dijitSliderRemainingBarV, .claro .dijitSlider .dijitSliderTopBumper{ - background-image: url("images/sliderVertical.png"); + background-image: url("../@{image-form-slider-vertical}"); background-repeat:repeat-y; background-position:-3px 0; border-color: @border-color; @@ -191,7 +194,7 @@ border: 0; width: 18px; height: 16px; - background-image: url("images/sliderThumbs.png"); + background-image: url("../@{image-form-slider-thumbs}"); background-repeat:no-repeat; background-position:0 0; } @@ -215,7 +218,7 @@ border: 0; width: 18px; height: 16px; - background-image: url("images/sliderThumbs.png"); + background-image: url("../@{image-form-slider-thumbs}"); background-repeat:no-repeat; background-position:-289px 0; } @@ -248,7 +251,7 @@ .claro .dijitSliderIncrementIconH, .claro .dijitSliderDecrementIconV, .claro .dijitSliderIncrementIconV { - background-image: url('images/commonFormArrows.png'); + background-image: url("../@{image-form-common-arrows}"); background-repeat:no-repeat; background-color: @arrowbutton-background-color; .border-radius(2px); |