diff options
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/button')
7 files changed, 90 insertions, 90 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-ie.scss b/WebContent/VAADIN/themes/reindeer/button/button-ie.scss index db39bf5677..e0d6c35091 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-ie.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button-ie.scss @@ -1,6 +1,6 @@ -@mixin reindeer-button-ie($name : v-nativebutton) { +@mixin reindeer-button-ie($primaryStyleName : v-nativebutton) { -.v-ie8 .#{$name}-link { +.v-ie8 .#{$primaryStyleName}-link { padding: 0; text-align: left; } diff --git a/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss b/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss index 0d2060ddc6..2064cb1650 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss @@ -1,15 +1,15 @@ -@mixin reindeer-button-link-style($name : v-button) { +@mixin reindeer-button-link-style($primaryStyleName : v-button) { -.#{$name}.#{$name}-link, -.#{$name}.#{$name}-link:focus, -.#{$name}.#{$name}-link:active, -.#{$name}-link.v-pressed, -.v-disabled.#{$name}.#{$name}-link, -.#{$name}.#{$name}-link .#{$name}-wrap, -.#{$name}.#{$name}-link:focus .#{$name}-wrap, -.#{$name}.#{$name}-link:active .#{$name}-wrap, -.#{$name}-link.v-pressed .#{$name}-wrap, -.v-disabled.#{$name}.#{$name}-link .#{$name}-wrap { +.#{$primaryStyleName}.#{$primaryStyleName}-link, +.#{$primaryStyleName}.#{$primaryStyleName}-link:focus, +.#{$primaryStyleName}.#{$primaryStyleName}-link:active, +.#{$primaryStyleName}-link.v-pressed, +.v-disabled.#{$primaryStyleName}.#{$primaryStyleName}-link, +.#{$primaryStyleName}.#{$primaryStyleName}-link .#{$primaryStyleName}-wrap, +.#{$primaryStyleName}.#{$primaryStyleName}-link:focus .#{$primaryStyleName}-wrap, +.#{$primaryStyleName}.#{$primaryStyleName}-link:active .#{$primaryStyleName}-wrap, +.#{$primaryStyleName}-link.v-pressed .#{$primaryStyleName}-wrap, +.v-disabled.#{$primaryStyleName}.#{$primaryStyleName}-link .#{$primaryStyleName}-wrap { background: transparent; height: auto; padding: 0; @@ -17,12 +17,12 @@ line-height: inherit; } -.#{$name}.#{$name}-link.v-disabled, -.#{$name}.#{$name}-link.v-disabled .#{$name}-wrap { +.#{$primaryStyleName}.#{$primaryStyleName}-link.v-disabled, +.#{$primaryStyleName}.#{$primaryStyleName}-link.v-disabled .#{$primaryStyleName}-wrap { cursor: default; } -.#{$name}-link .#{$name}-caption { +.#{$primaryStyleName}-link .#{$primaryStyleName}-caption { line-height: inherit; font-weight: normal; color: #1b699f; @@ -30,7 +30,7 @@ text-shadow: none; } -.#{$name}-link:focus .#{$name}-caption { +.#{$primaryStyleName}-link:focus .#{$primaryStyleName}-caption { outline: 1px dotted #1b699f; } diff --git a/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss b/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss index f4cd726412..238a694e28 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss @@ -1,30 +1,30 @@ -@mixin reindeer-button-primary-style($name : v-button) { +@mixin reindeer-button-primary-style($primaryStyleName : v-button) { -.#{$name}-primary:focus { +.#{$primaryStyleName}-primary:focus { background-image: url(img/primary-left-focus.png); /** sprite-ref: buttons */ } -.#{$name}-primary:focus .#{$name}-wrap { +.#{$primaryStyleName}-primary:focus .#{$primaryStyleName}-wrap { background-image: url(img/primary-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ } -.#{$name}-primary:active, -.#{$name}-primary.v-pressed { +.#{$primaryStyleName}-primary:active, +.#{$primaryStyleName}-primary.v-pressed { background-image: url(img/primary-left-pressed.png); /** sprite-ref: buttons */ } -.#{$name}-primary:active .#{$name}-wrap, -.#{$name}-primary.v-pressed .#{$name}-wrap { +.#{$primaryStyleName}-primary:active .#{$primaryStyleName}-wrap, +.#{$primaryStyleName}-primary.v-pressed .#{$primaryStyleName}-wrap { background-image: url(img/primary-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ } -.#{$name}-primary, -.v-disabled.#{$name}-primary { +.#{$primaryStyleName}-primary, +.v-disabled.#{$primaryStyleName}-primary { background-image: url(img/primary-left.png); /** sprite-ref: buttons */ } -.#{$name}-primary .#{$name}-wrap, -.v-disabled.#{$name}-primary .#{$name}-wrap { +.#{$primaryStyleName}-primary .#{$primaryStyleName}-wrap, +.v-disabled.#{$primaryStyleName}-primary .#{$primaryStyleName}-wrap { background-image: url(img/primary-right.png); /** sprite-ref: buttons; sprite-alignment: right */ } @@ -34,32 +34,32 @@ /* Black style */ -.black .#{$name}-primary:focus { +.black .#{$primaryStyleName}-primary:focus { background-image: url(img/black/primary-left-focus.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-primary:focus .#{$name}-wrap { +.black .#{$primaryStyleName}-primary:focus .#{$primaryStyleName}-wrap { background-image: url(img/black/primary-right-focus.png); /** sprite-ref: black-buttons; sprite-alignment: right */ color: #eaf4fb; } -.black .#{$name}-primary:active, -.black .#{$name}-primary.v-pressed { +.black .#{$primaryStyleName}-primary:active, +.black .#{$primaryStyleName}-primary.v-pressed { background-image: url(img/black/primary-left-pressed.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-primary:active .#{$name}-wrap, -.black .#{$name}-primary.v-pressed .#{$name}-wrap { +.black .#{$primaryStyleName}-primary:active .#{$primaryStyleName}-wrap, +.black .#{$primaryStyleName}-primary.v-pressed .#{$primaryStyleName}-wrap { background-image: url(img/black/primary-right-pressed.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } -.black .#{$name}-primary, -.black .v-disabled.#{$name}-primary { +.black .#{$primaryStyleName}-primary, +.black .v-disabled.#{$primaryStyleName}-primary { background-image: url(img/black/primary-left.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-primary .#{$name}-wrap, -.black .v-disabled.#{$name}-primary .#{$name}-wrap { +.black .#{$primaryStyleName}-primary .#{$primaryStyleName}-wrap, +.black .v-disabled.#{$primaryStyleName}-primary .#{$primaryStyleName}-wrap { background-image: url(img/black/primary-right.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } diff --git a/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss b/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss index b141156ac8..5c9e8a32bb 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss @@ -1,37 +1,37 @@ -@mixin reindeer-button-small-style($name : v-button) { +@mixin reindeer-button-small-style($primaryStyleName : v-button) { -.#{$name}-small:focus { +.#{$primaryStyleName}-small:focus { background-image: url(img/small-left-focus.png); /** sprite-ref: buttons */ } -.#{$name}-small:focus .#{$name}-wrap { +.#{$primaryStyleName}-small:focus .#{$primaryStyleName}-wrap { background-image: url(img/small-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ } -.#{$name}-small:active, -.#{$name}-small.v-pressed { +.#{$primaryStyleName}-small:active, +.#{$primaryStyleName}-small.v-pressed { background-image: url(img/small-left-pressed.png); /** sprite-ref: buttons */ } -.#{$name}-small:active .#{$name}-wrap, -.#{$name}-small.v-pressed .#{$name}-wrap { +.#{$primaryStyleName}-small:active .#{$primaryStyleName}-wrap, +.#{$primaryStyleName}-small.v-pressed .#{$primaryStyleName}-wrap { background-image: url(img/small-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ } -.#{$name}-small, -.v-disabled.#{$name}-small { +.#{$primaryStyleName}-small, +.v-disabled.#{$primaryStyleName}-small { background-image: url(img/small-left.png); /** sprite-ref: buttons */ height: 20px; } -.#{$name}-small .#{$name}-wrap, -.v-disabled.#{$name}-small .#{$name}-wrap { +.#{$primaryStyleName}-small .#{$primaryStyleName}-wrap, +.v-disabled.#{$primaryStyleName}-small .#{$primaryStyleName}-wrap { background-image: url(img/small-right.png); /** sprite-ref: buttons; sprite-alignment: right */ height: 19px; padding: 1px 14px 0 8px; } -.#{$name}-small .#{$name}-caption { +.#{$primaryStyleName}-small .#{$primaryStyleName}-caption { font-weight: normal; } @@ -40,31 +40,31 @@ /* Black style */ -.black .#{$name}-small:focus { +.black .#{$primaryStyleName}-small:focus { background-image: url(img/black/small-left-focus.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-small:focus .#{$name}-wrap { +.black .#{$primaryStyleName}-small:focus .#{$primaryStyleName}-wrap { background-image: url(img/black/small-right-focus.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } -.black .#{$name}-small:active, -.black .#{$name}-small.v-pressed { +.black .#{$primaryStyleName}-small:active, +.black .#{$primaryStyleName}-small.v-pressed { background-image: url(img/black/small-left-pressed.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-small:active .#{$name}-wrap, -.black .#{$name}-small.v-pressed .#{$name}-wrap { +.black .#{$primaryStyleName}-small:active .#{$primaryStyleName}-wrap, +.black .#{$primaryStyleName}-small.v-pressed .#{$primaryStyleName}-wrap { background-image: url(img/black/small-right-pressed.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } -.black .#{$name}-small, -.black .v-disabled.#{$name}-small { +.black .#{$primaryStyleName}-small, +.black .v-disabled.#{$primaryStyleName}-small { background-image: url(img/black/small-left.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-small .#{$name}-wrap, -.black .v-disabled.#{$name}-small .#{$name}-wrap { +.black .#{$primaryStyleName}-small .#{$primaryStyleName}-wrap, +.black .v-disabled.#{$primaryStyleName}-small .#{$primaryStyleName}-wrap { background-image: url(img/black/small-right.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } diff --git a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss index f950060d4a..632340f228 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss @@ -1,29 +1,29 @@ -@mixin reindeer-button-standard($name : v-button) { +@mixin reindeer-button-standard($primaryStyleName : v-button) { -.#{$name}:focus { +.#{$primaryStyleName}:focus { background-image: url(img/left-focus.png); /** sprite-ref: buttons */ outline: none; } -.#{$name}:focus .#{$name}-wrap { +.#{$primaryStyleName}:focus .#{$primaryStyleName}-wrap { background-image: url(img/right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ outline: none; } -.#{$name}:active, -.#{$name}.v-pressed { +.#{$primaryStyleName}:active, +.#{$primaryStyleName}.v-pressed { background-image: url(img/left-pressed.png); /** sprite-ref: buttons */ outline: none; } -.#{$name}:active .#{$name}-wrap, -.#{$name}.v-pressed .#{$name}-wrap { +.#{$primaryStyleName}:active .#{$primaryStyleName}-wrap, +.#{$primaryStyleName}.v-pressed .#{$primaryStyleName}-wrap { background-image: url(img/right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ outline: none; } -.#{$name}, -.v-disabled.#{$name} { +.#{$primaryStyleName}, +.v-disabled.#{$primaryStyleName} { height: 26px; padding: 0 0 0 6px; background-color: transparent; @@ -33,8 +33,8 @@ cursor: default; } -.#{$name}-wrap, -.v-disabled.#{$name} .#{$name}-wrap { +.#{$primaryStyleName}-wrap, +.v-disabled.#{$primaryStyleName} .#{$primaryStyleName}-wrap { display: block; height: 22px; padding: 4px 15px 0 9px; @@ -44,7 +44,7 @@ background-image: url(img/right.png); /** sprite-ref: buttons; sprite-alignment: right */ } -.#{$name}-caption { +.#{$primaryStyleName}-caption { color: #222; text-shadow: #fff 0 1px 0; font-weight: bold; @@ -58,35 +58,35 @@ /************************** * Black style **************************/ -.black .#{$name}:focus { +.black .#{$primaryStyleName}:focus { background-image: url(img/black/left-focus.png); /** sprite-ref: black-buttons */ } -.black .#{$name}:focus .#{$name}-wrap { +.black .#{$primaryStyleName}:focus .#{$primaryStyleName}-wrap { background-image: url(img/black/right-focus.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } -.black .#{$name}:active, -.black .#{$name}.v-pressed { +.black .#{$primaryStyleName}:active, +.black .#{$primaryStyleName}.v-pressed { background-image: url(img/black/left-pressed.png); /** sprite-ref: black-buttons */ } -.black .#{$name}:active .#{$name}-wrap, -.black .#{$name}.v-pressed .#{$name}-wrap { +.black .#{$primaryStyleName}:active .#{$primaryStyleName}-wrap, +.black .#{$primaryStyleName}.v-pressed .#{$primaryStyleName}-wrap { background-image: url(img/black/right-pressed.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } -.black .#{$name}, -.black .v-disabled.#{$name} { +.black .#{$primaryStyleName}, +.black .v-disabled.#{$primaryStyleName} { background-image: url(img/black/left.png); /** sprite-ref: black-buttons */ } -.black .#{$name}-wrap, -.black .v-disabled.#{$name} .#{$name}-wrap { +.black .#{$primaryStyleName}-wrap, +.black .v-disabled.#{$primaryStyleName} .#{$primaryStyleName}-wrap { background-image: url(img/black/right.png); /** sprite-ref: black-buttons; sprite-alignment: right */ } -.black .#{$name}-caption { +.black .#{$primaryStyleName}-caption { color: #c9ccce; text-shadow: #121314 0 -1px 0; } diff --git a/WebContent/VAADIN/themes/reindeer/button/button.scss b/WebContent/VAADIN/themes/reindeer/button/button.scss index 7b61d1b213..2fd34ef2c8 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button.scss @@ -6,7 +6,7 @@ @import "button-small-style.scss"; @import "button-link-style.scss"; -@mixin reindeer-button($name : v-button) { +@mixin reindeer-button($primaryStyleName : v-button) { // TODO use $exclude @include reindeer-button-standard; @include reindeer-button-primary-style; diff --git a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss b/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss index bd6ca35627..ca7a16e88e 100644 --- a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss +++ b/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss @@ -1,9 +1,9 @@ /* Browser-specific corrections to the standard implementation */ @import "button-ie.scss"; -@mixin reindeer-nativebutton-link($name : v-nativebutton) { +@mixin reindeer-nativebutton-link($primaryStyleName : v-nativebutton) { -.#{$name}-link .#{$name}-caption { +.#{$primaryStyleName}-link .#{$primaryStyleName}-caption { line-height: inherit; font-weight: normal; color: #1b699f; @@ -11,15 +11,15 @@ text-shadow: none; } -.#{$name}-link:focus .#{$name}-caption { +.#{$primaryStyleName}-link:focus .#{$primaryStyleName}-caption { outline: 1px dotted #1b699f; } } -@mixin reindeer-nativebutton($name : v-nativebutton) { - @include reindeer-nativebutton-link($name); +@mixin reindeer-nativebutton($primaryStyleName : v-nativebutton) { + @include reindeer-nativebutton-link($primaryStyleName); /* Browser-specific corrections to the standard implementation */ - @include reindeer-button-ie($name); + @include reindeer-button-ie($primaryStyleName); }
\ No newline at end of file |