From cfa455d6cfd4a535fd77cbc76637a57e7024e9ac Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 8 Aug 2012 14:27:31 +0300 Subject: 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. --- .../VAADIN/themes/reindeer/menubar/menubar.css | 72 -------------------- .../VAADIN/themes/reindeer/menubar/menubar.scss | 76 ++++++++++++++++++++++ 2 files changed, 76 insertions(+), 72 deletions(-) delete mode 100644 WebContent/VAADIN/themes/reindeer/menubar/menubar.css create mode 100644 WebContent/VAADIN/themes/reindeer/menubar/menubar.scss (limited to 'WebContent/VAADIN/themes/reindeer/menubar') diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css deleted file mode 100644 index 165eacc840..0000000000 --- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css +++ /dev/null @@ -1,72 +0,0 @@ -.v-menubar { - height: 23px; - background: #323336 repeat-x; - background-image: url(img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ - color: #d1d3d6; - text-shadow: rgba(0,0,0,.9) 0 1px 0; - padding: 0 8px; -} -.v-menubar .v-menubar-menuitem { - padding: 3px 8px; - height: 17px; - line-height: 16px; -} -.v-menubar .v-menubar-menuitem:hover { - color: #fff; -} -.v-menubar-submenu { - background: #f8f8f9; - border: none; - border-radius: 3px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -o-border-radius: 3px; - overflow: hidden; - padding: 4px 0; -} -.v-menubar-submenu .v-menubar-menuitem { - padding: 1px 26px 1px 10px; - line-height: 16px; -} -.v-menubar-submenu .v-menubar-menuitem-caption .v-icon { - vertical-align: middle; -} -.v-menubar .v-menubar-menuitem-selected, -.v-menubar-submenu .v-menubar-menuitem-selected { - background: #4d749f repeat-x; - background-image: url(../common/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ - color: #fff; - text-shadow: 0 1px 0 #3b5a7a; -} -.v-menubar .v-menubar-menuitem-selected { - background-image: url(img/menu-sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */ -} -.v-menubar-submenu .v-menubar-submenu-indicator { - background: transparent url(img/submenu-icon.png) no-repeat right 70%; - width: 26px; - height: 16px; - text-indent: -9999px; -} -.v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator { - background-image: url(img/submenu-icon-hover.png); -} - -/* Checkboxes for checkable/checked menu items */ -.v-menubar-submenu-check-column .v-menubar-menuitem { - padding-left: 6px; -} -.v-menubar-submenu-check-column .v-menubar-menuitem-caption { - padding-left: 18px; -} -.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { - background: transparent url(img/checked.png) no-repeat left; -} -.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption { - background: transparent url(img/unchecked.png) no-repeat left; -} -.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { - background: transparent url(img/checked-selected.png) no-repeat left; -} -.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption { - background: transparent url(img/unchecked-selected.png) no-repeat left; -} diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss b/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss new file mode 100644 index 0000000000..78f4a9fa45 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss @@ -0,0 +1,76 @@ +@mixin reindeer-menubar { + +.v-menubar { + height: 23px; + background: #323336 repeat-x; + background-image: url(img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + color: #d1d3d6; + text-shadow: rgba(0,0,0,.9) 0 1px 0; + padding: 0 8px; +} +.v-menubar .v-menubar-menuitem { + padding: 3px 8px; + height: 17px; + line-height: 16px; +} +.v-menubar .v-menubar-menuitem:hover { + color: #fff; +} +.v-menubar-submenu { + background: #f8f8f9; + border: none; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -o-border-radius: 3px; + overflow: hidden; + padding: 4px 0; +} +.v-menubar-submenu .v-menubar-menuitem { + padding: 1px 26px 1px 10px; + line-height: 16px; +} +.v-menubar-submenu .v-menubar-menuitem-caption .v-icon { + vertical-align: middle; +} +.v-menubar .v-menubar-menuitem-selected, +.v-menubar-submenu .v-menubar-menuitem-selected { + background: #4d749f repeat-x; + background-image: url(../common/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + color: #fff; + text-shadow: 0 1px 0 #3b5a7a; +} +.v-menubar .v-menubar-menuitem-selected { + background-image: url(img/menu-sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */ +} +.v-menubar-submenu .v-menubar-submenu-indicator { + background: transparent url(img/submenu-icon.png) no-repeat right 70%; + width: 26px; + height: 16px; + text-indent: -9999px; +} +.v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator { + background-image: url(img/submenu-icon-hover.png); +} + +/* Checkboxes for checkable/checked menu items */ +.v-menubar-submenu-check-column .v-menubar-menuitem { + padding-left: 6px; +} +.v-menubar-submenu-check-column .v-menubar-menuitem-caption { + padding-left: 18px; +} +.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { + background: transparent url(img/checked.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption { + background: transparent url(img/unchecked.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { + background: transparent url(img/checked-selected.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption { + background: transparent url(img/unchecked-selected.png) no-repeat left; +} + +} \ No newline at end of file -- cgit v1.2.3