diff options
author | Marc Englund <marc@vaadin.com> | 2012-11-23 12:32:08 +0200 |
---|---|---|
committer | Marc Englund <marc@vaadin.com> | 2012-11-23 12:50:53 +0200 |
commit | bd2caa54a548d7284e91cb7e87472deb2dcec42d (patch) | |
tree | f800bc5a9a4f847b22637106ea848b3397d5ec05 /WebContent/VAADIN/themes/reindeer/window | |
parent | 8b90d2e2d32e63411e44932fffbe8a06cf1dcb8b (diff) | |
download | vaadin-framework-bd2caa54a548d7284e91cb7e87472deb2dcec42d.tar.gz vaadin-framework-bd2caa54a548d7284e91cb7e87472deb2dcec42d.zip |
Change sass compoent @mixin parameter from $name to $primaryStyleName, fixes #10294
Change-Id: I548fdd3b0295db980bc4d769826e7c149ec0b3b3
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/window')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/window/window.scss | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.scss b/WebContent/VAADIN/themes/reindeer/window/window.scss index c3ad0fc9be..7ba6b01675 100644 --- a/WebContent/VAADIN/themes/reindeer/window/window.scss +++ b/WebContent/VAADIN/themes/reindeer/window/window.scss @@ -1,25 +1,25 @@ -@mixin reindeer-window($name : v-window) { +@mixin reindeer-window($primaryStyleName : v-window) { -.#{$name} { +.#{$primaryStyleName} { background: transparent; } -.#{$name}-wrap { +.#{$primaryStyleName}-wrap { border: 1px solid #808386; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.v-sa .#{$name}-wrap, -.v-op .#{$name}-wrap { +.v-sa .#{$primaryStyleName}-wrap, +.v-op .#{$primaryStyleName}-wrap { border-color: rgba(0,0,0,.2); } -.#{$name}-outerheader { +.#{$primaryStyleName}-outerheader { padding: 12px 32px 0 14px; height: 37px; background: black repeat-x; background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } -.#{$name}-header { +.#{$primaryStyleName}-header { font-weight: bold; font-size: 12px; line-height: normal; @@ -30,24 +30,24 @@ text-overflow: ellipsis; -ms-text-overflow: ellipsis; } -.#{$name}-error .#{$name}-header { +.#{$primaryStyleName}-error .#{$primaryStyleName}-header { padding-left: 13px; background: transparent url(../common/icons/error.png) no-repeat 0 50%; } -.#{$name}-resizebox { +.#{$primaryStyleName}-resizebox { width: 15px; height: 15px; cursor: se-resize; background: transparent; background-image: url(img/resize.png); /** sprite-ref: verticals */ } -.#{$name}-footer { +.#{$primaryStyleName}-footer { background-color:white; background-repeat: repeat-x; background-image: url(img/footer-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ height: 15px; } -.#{$name}-closebox { +.#{$primaryStyleName}-closebox { top: 12px; right: 10px; width: 15px; @@ -55,16 +55,16 @@ background: transparent; background-image: url(img/close.png); /** sprite-ref: verticals */ } -.#{$name}-closebox:hover { +.#{$primaryStyleName}-closebox:hover { background-image: url(img/close-hover.png); /** sprite-ref: verticals */ } -.#{$name}-closebox:active { +.#{$primaryStyleName}-closebox:active { background-image: url(img/close-pressed.png); /** sprite-ref: verticals */ } -.#{$name}-contents { +.#{$primaryStyleName}-contents { background: #fff; } -.#{$name}-modalitycurtain { +.#{$primaryStyleName}-modalitycurtain { background: #56595b; } @@ -77,43 +77,43 @@ Light style window ----------------------------- **/ -.#{$name}-light .#{$name}-outerheader { +.#{$primaryStyleName}-light .#{$primaryStyleName}-outerheader { background: transparent; padding: 15px 32px 0 18px; height: 23px; } -.#{$name}-light .#{$name}-header { +.#{$primaryStyleName}-light .#{$primaryStyleName}-header { font-size: 16px; color: #292e34; text-shadow: none; } -.#{$name}-light .#{$name}-resizebox { +.#{$primaryStyleName}-light .#{$primaryStyleName}-resizebox { width: 12px; height: 12px; background-image: url(img/resize-light.png); /** sprite-ref: verticals */ } -.#{$name}-light .#{$name}-footer { +.#{$primaryStyleName}-light .#{$primaryStyleName}-footer { background: transparent; height: 12px; } -.#{$name}-light .#{$name}-closebox { +.#{$primaryStyleName}-light .#{$primaryStyleName}-closebox { right: 1px; top: 17px; width: 19px; height: 15px; background-image: url(img/close-light.png); /** sprite-ref: verticals */ } -.#{$name}-light .#{$name}-closebox:hover { +.#{$primaryStyleName}-light .#{$primaryStyleName}-closebox:hover { background-image: url(img/close-light-hover.png); /** sprite-ref: verticals */ } -.#{$name}-light .#{$name}-closebox:active { +.#{$primaryStyleName}-light .#{$primaryStyleName}-closebox:active { background-image: url(img/close-light-pressed.png); /** sprite-ref: verticals */ } -.#{$name}-light .#{$name}-contents { +.#{$primaryStyleName}-light .#{$primaryStyleName}-contents { background: transparent; } /* This must be the last sprite added to the verticals-sprite image */ -.#{$name}-light .#{$name}-wrap2 { +.#{$primaryStyleName}-light .#{$primaryStyleName}-wrap2 { background: #f7f7f8 repeat-x; background-image: url(img/content-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } @@ -123,27 +123,27 @@ Black style window ----------------------------- **/ -.#{$name}-black .#{$name}-wrap { +.#{$primaryStyleName}-black .#{$primaryStyleName}-wrap { border-color: #2e3030; border-radius: 8px; -webkit-border-radius: 8px; -moz-border-radius: 8px; overflow: hidden; } -.v-sa .#{$name}-black .#{$name}-wrap, -.v-op .#{$name}-black .#{$name}-wrap { +.v-sa .#{$primaryStyleName}-black .#{$primaryStyleName}-wrap, +.v-op .#{$primaryStyleName}-black .#{$primaryStyleName}-wrap { border-color: rgba(0,0,0,.8); } -.#{$name}-black .#{$name}-wrap2 { +.#{$primaryStyleName}-black .#{$primaryStyleName}-wrap2 { background-color: #1d2021; -moz-border-radius: 7px; -webkit-border-radius: 7px; } -.v-sa .#{$name}-black .#{$name}-wrap2, -.v-op .#{$name}-black .#{$name}-wrap2 { +.v-sa .#{$primaryStyleName}-black .#{$primaryStyleName}-wrap2, +.v-op .#{$primaryStyleName}-black .#{$primaryStyleName}-wrap2 { background-color: rgba(29,32,33,.9); } -.#{$name}-black .#{$name}-outerheader { +.#{$primaryStyleName}-black .#{$primaryStyleName}-outerheader { height: auto; padding: 7px 14px; height: 15px; @@ -157,27 +157,27 @@ overflow: hidden; border: none; } -.#{$name}-black .#{$name}-header { +.#{$primaryStyleName}-black .#{$primaryStyleName}-header { font-size: 12px; font-weight: normal; color: #dddfe1; } -.#{$name}-black .#{$name}-closebox { +.#{$primaryStyleName}-black .#{$primaryStyleName}-closebox { top: 8px; } -.#{$name}-black .#{$name}-footer { +.#{$primaryStyleName}-black .#{$primaryStyleName}-footer { background: transparent; border: none; height: 14px; } -.#{$name}-black .#{$name}-resizebox { +.#{$primaryStyleName}-black .#{$primaryStyleName}-resizebox { background: transparent no-repeat; background-image: url(img/black/resize.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */ width: 14px; height: 14px; } /* Must be last to make this image last in the sprites */ -.#{$name}-black .#{$name}-contents { +.#{$primaryStyleName}-black .#{$primaryStyleName}-contents { border: none; background: transparent repeat-x; background-image: url(img/black/content-bg.png); /** sprite-ref: black-verticals; sprite-alignment: repeat */ |