diff options
author | Henri Sara <hesara@vaadin.com> | 2012-08-08 14:27:31 +0300 |
---|---|---|
committer | Henri Sara <hesara@vaadin.com> | 2012-08-08 14:44:49 +0300 |
commit | cfa455d6cfd4a535fd77cbc76637a57e7024e9ac (patch) | |
tree | cecb66492671ed20fa9865581da12930ed502047 /WebContent/VAADIN/themes/chameleon/components | |
parent | 620e096b45f27ecc5aa85d164ca8b81df000e593 (diff) | |
download | vaadin-framework-cfa455d6cfd4a535fd77cbc76637a57e7024e9ac.tar.gz vaadin-framework-cfa455d6cfd4a535fd77cbc76637a57e7024e9ac.zip |
Standard themes in SCSS form, updated CompileDefaultTheme (#9223)
Conversion performed for most themes trivial, just rename file and wrap
in a mixin. For chameleon compounds, also nesting used. In some cases,
related small files combined in a single SCSS file
Chameleon accordion and select contain fixes other than just a missing
semicolon.
Diffstat (limited to 'WebContent/VAADIN/themes/chameleon/components')
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/accordion/accordion.scss (renamed from WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css) | 8 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/button/button.scss (renamed from WebContent/VAADIN/themes/chameleon/components/button/button.css) | 4 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/components.css | 17 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/components.scss | 41 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss (renamed from WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/label/label.scss (renamed from WebContent/VAADIN/themes/chameleon/components/label/label.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss (renamed from WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css) | 4 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/notification/notification.scss (renamed from WebContent/VAADIN/themes/chameleon/components/notification/notification.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/panel/panel.scss (renamed from WebContent/VAADIN/themes/chameleon/components/panel/panel.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/popupview/popupview.scss (renamed from WebContent/VAADIN/themes/chameleon/components/popupview/popupview.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss (renamed from WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/selects/selects.scss (renamed from WebContent/VAADIN/themes/chameleon/components/selects/selects.css) | 7 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/slider/slider.scss (renamed from WebContent/VAADIN/themes/chameleon/components/slider/slider.css) | 4 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss (renamed from WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css) | 4 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/table/table.scss (renamed from WebContent/VAADIN/themes/chameleon/components/table/table.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss (renamed from WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss (renamed from WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css) | 4 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/tree/tree.scss (renamed from WebContent/VAADIN/themes/chameleon/components/tree/tree.css) | 6 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/chameleon/components/window/window.scss (renamed from WebContent/VAADIN/themes/chameleon/components/window/window.css) | 6 |
19 files changed, 123 insertions, 30 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.scss index 8fb7254008..f33577db9e 100644 --- a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css +++ b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.scss @@ -1,3 +1,5 @@ +@mixin chameleon-accordion { + .v-accordion { border: 1px solid #b3b3b3; } @@ -39,7 +41,7 @@ div.v-accordion-item-open .v-accordion-item-caption:active { .v-accordion-opaque .v-accordion-item-caption, .v-accordion-opaque .v-accordion-item-open { - border-none; + border: none; } .v-accordion-opaque .v-accordion-item-caption, @@ -73,4 +75,6 @@ div.v-accordion-item-open .v-accordion-item-caption:active { border-radius: 0; -webkit-border-radius: 0; -moz-border-radius: 0; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.css b/WebContent/VAADIN/themes/chameleon/components/button/button.scss index 1dffddb4c2..beeba2478f 100644 --- a/WebContent/VAADIN/themes/chameleon/components/button/button.css +++ b/WebContent/VAADIN/themes/chameleon/components/button/button.scss @@ -1,3 +1,5 @@ +@mixin chameleon-button { + .v-button:active, .v-ie8 .v-pressed.v-button, div.v-button-down { @@ -255,3 +257,5 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap { .v-button-icon-only .v-icon { margin-right: -.5em; } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/components.css b/WebContent/VAADIN/themes/chameleon/components/components.css deleted file mode 100644 index c497a4a323..0000000000 --- a/WebContent/VAADIN/themes/chameleon/components/components.css +++ /dev/null @@ -1,17 +0,0 @@ -@import "accordion/accordion.css"; -@import "button/button.css"; -@import "label/label.css"; -@import "menubar/menubar.css"; -@import "notification/notification.css"; -@import "panel/panel.css"; -@import "popupview/popupview.css"; -@import "progressindicator/progressindicator.css"; -@import "slider/slider.css"; -@import "splitpanel/splitpanel.css"; -@import "table/table.css"; -@import "textfield/textfield.css"; -@import "datefield/datefield.css"; /* datefield and selects must be after textfield */ -@import "selects/selects.css"; -@import "tabsheet/tabsheet.css"; -@import "tree/tree.css"; -@import "window/window.css";
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/components.scss b/WebContent/VAADIN/themes/chameleon/components/components.scss new file mode 100644 index 0000000000..45a313ed60 --- /dev/null +++ b/WebContent/VAADIN/themes/chameleon/components/components.scss @@ -0,0 +1,41 @@ +@import "accordion/accordion.scss"; +@import "button/button.scss"; +@import "label/label.scss"; +@import "menubar/menubar.scss"; +@import "notification/notification.scss"; +@import "panel/panel.scss"; +@import "popupview/popupview.scss"; +@import "progressindicator/progressindicator.scss"; +@import "slider/slider.scss"; +@import "splitpanel/splitpanel.scss"; +@import "table/table.scss"; +@import "textfield/textfield.scss"; +// datefield and selects must be after textfield +@import "datefield/datefield.scss"; +@import "selects/selects.scss"; +@import "tabsheet/tabsheet.scss"; +@import "tree/tree.scss"; +@import "window/window.scss"; + +@mixin chameleon-components { + + @include chameleon-accordion; + @include chameleon-button; + @include chameleon-label; + @include chameleon-menubar; + @include chameleon-notification; + @include chameleon-panel; + @include chameleon-popupview; + @include chameleon-progressindicator; + @include chameleon-slider; + @include chameleon-splitpanel; + @include chameleon-table; + @include chameleon-textfield; + // datefield and selects must be after textfield + @include chameleon-datefield; + @include chameleon-selects; + @include chameleon-tabsheet; + @include chameleon-tree; + @include chameleon-window; + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss index 3804ab52e0..2f9705ca58 100644 --- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css +++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss @@ -1,3 +1,5 @@ +@mixin chameleon-datefield { + .v-datefield-button { background: #dadada url(../../img/date-btn.png) repeat-x 50% 0; border: 1px solid gray; @@ -272,4 +274,6 @@ td.v-datefield-calendarpanel-nextyear { padding: 0; font-size: 0.9em; margin: 0; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/label/label.css b/WebContent/VAADIN/themes/chameleon/components/label/label.scss index f2d8e8ef69..7471242f70 100644 --- a/WebContent/VAADIN/themes/chameleon/components/label/label.css +++ b/WebContent/VAADIN/themes/chameleon/components/label/label.scss @@ -1,3 +1,5 @@ +@mixin chameleon-label { + /******************************************************************************* * Different headers ******************************************************************************/ @@ -124,4 +126,6 @@ body .v-label-loading { border-radius: 2px; -webkit-border-radius: 2px; -moz-border-radius: 2px; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss index 4f6be1b923..55ade4c060 100644 --- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css +++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss @@ -1,3 +1,5 @@ +@mixin chameleon-menubar { + .v-menubar { padding: 0 .4em; background: #c9c9c9 url(../../img/grad-light-top.png) repeat-x; @@ -22,3 +24,5 @@ background-image: url(../../img/grad-light-top2.png); background-position: 0 -1px; } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css b/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss index ee686912c5..9036c5c2d6 100644 --- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css +++ b/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss @@ -1,3 +1,5 @@ +@mixin chameleon-notification { + div.v-Notification { -moz-border-radius: 0; -webkit-border-radius: 0; @@ -61,4 +63,6 @@ div.v-Notification-system { color: #fff; border: none; background-color: #b40000; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css b/WebContent/VAADIN/themes/chameleon/components/panel/panel.scss index 0e5dcb8a38..88b3d7b804 100644 --- a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css +++ b/WebContent/VAADIN/themes/chameleon/components/panel/panel.scss @@ -1,3 +1,5 @@ +@mixin chameleon-panel { + .v-panel-caption { background: #b9dcff; font-size: 1.2em; @@ -117,4 +119,6 @@ div.v-panel-borderless .v-panel-deco-bubble { div.v-panel-borderless .v-panel-content-bubble { background: transparent; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/popupview/popupview.css b/WebContent/VAADIN/themes/chameleon/components/popupview/popupview.scss index ab270d7c4b..88e13cb46d 100644 --- a/WebContent/VAADIN/themes/chameleon/components/popupview/popupview.css +++ b/WebContent/VAADIN/themes/chameleon/components/popupview/popupview.scss @@ -1,3 +1,7 @@ +@mixin chameleon-popupview { + .v-popupview-popup { padding: .3em .4em; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss index c080c0fc43..6bacf31e3e 100644 --- a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss @@ -1,3 +1,5 @@ +@mixin chameleon-progressindicator { + .v-progressindicator-wrapper { border-radius: 2px; -webkit-border-radius: 2px; @@ -109,4 +111,6 @@ .v-progressindicator-indeterminate.bar.v-disabled .v-progressindicator-indicator { background: #fff; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss index 3c8496f0fe..5e21ddff35 100644 --- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css +++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss @@ -1,3 +1,5 @@ +@mixin chameleon-selects { + .v-filterselect { overflow: hidden; } @@ -86,7 +88,8 @@ body .v-filterselect-suggestpopup-big td { .v-filterselect-prevpage:active, .v-filterselect-nextpage:active { - background-image: (../../img/grad-dark-bottom2.png); + // TODO check - was missing a part of the rule + background-image: #c9c9c9 url(../../img/grad-dark-bottom2.png); background-position: left bottom; } @@ -161,3 +164,5 @@ body .v-filterselect-suggestpopup-big td { height: 100%; background-position: 100% -8px; } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css b/WebContent/VAADIN/themes/chameleon/components/slider/slider.scss index 6a430723e2..bef69b3472 100644 --- a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css +++ b/WebContent/VAADIN/themes/chameleon/components/slider/slider.scss @@ -1,3 +1,5 @@ +@mixin chameleon-slider { + .v-slider { border-top: 1px solid #9a9c9e; border-bottom: 1px solid #bdbfc1; @@ -54,3 +56,5 @@ margin: 0; margin-left: -5px; } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss index 1cb04bc29b..99f51edc01 100644 --- a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss @@ -1,3 +1,5 @@ +@mixin chameleon-splitpanel { + .v-splitpanel-hsplitter div, .v-splitpanel-vsplitter div { background: transparent url(../../img/split-handle.png) no-repeat 2px 50%; @@ -61,3 +63,5 @@ body .v-splitpanel-vsplitter-small-locked { background: transparent; overflow: hidden; } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.scss index 2bc52bc844..8ecc1878ae 100644 --- a/WebContent/VAADIN/themes/chameleon/components/table/table.css +++ b/WebContent/VAADIN/themes/chameleon/components/table/table.scss @@ -1,3 +1,5 @@ +@mixin chameleon-table { + .v-table-header-wrap, .v-table-header-drag { background: #c9c9c9 url(../../img/grad-light-top.png) repeat-x; @@ -160,4 +162,6 @@ div.v-table-focus-slot-right { div.v-table-borderless .v-table-body { background: transparent; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss index d1697c584a..258df79922 100644 --- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss @@ -1,3 +1,5 @@ +@mixin chameleon-tabsheet { + .v-tabsheet-spacertd div { border-color: #b3b3b3; border-left: none; @@ -155,4 +157,6 @@ .v-tabsheet-tabs-borderless .v-tabsheet-tabitem-selected, .v-tabsheet-tabs-borderless .v-tabsheet-tabitem-selected .v-caption { background-color: transparent; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss index 74882fa693..f8f3788c9e 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss @@ -1,3 +1,5 @@ +@mixin chameleon-textfield { + input.v-textfield, textarea.v-textarea, .v-filterselect { @@ -127,3 +129,5 @@ input.v-textfield-search[type=text], .v-filterselect-search { padding-left: 17px; } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/tree/tree.css b/WebContent/VAADIN/themes/chameleon/components/tree/tree.scss index 64f59c116a..fc80f51a2a 100644 --- a/WebContent/VAADIN/themes/chameleon/components/tree/tree.css +++ b/WebContent/VAADIN/themes/chameleon/components/tree/tree.scss @@ -1,3 +1,5 @@ +@mixin chameleon-tree { + .v-tree-node-caption { margin-left: 16px; } @@ -19,4 +21,6 @@ .v-tree-connectors .v-tree-node-caption { padding-bottom: 1px; - }
\ No newline at end of file + } + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.css b/WebContent/VAADIN/themes/chameleon/components/window/window.scss index 6ca8622a76..f1a6b5e529 100644 --- a/WebContent/VAADIN/themes/chameleon/components/window/window.css +++ b/WebContent/VAADIN/themes/chameleon/components/window/window.scss @@ -1,3 +1,5 @@ +@mixin chameleon-window { + .v-window-closebox { width: 14px; height: 15px; @@ -50,4 +52,6 @@ width: 14px; height: 14px; bottom: 0; - }
\ No newline at end of file + } + +}
\ No newline at end of file |