diff options
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/button')
3 files changed, 28 insertions, 12 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss b/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss index a5ec4422eb..0d2060ddc6 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss @@ -22,8 +22,7 @@ cursor: default; } -.#{$name}-link .#{$name}-caption, -.v-nativebutton-link .v-nativebutton-caption { +.#{$name}-link .#{$name}-caption { line-height: inherit; font-weight: normal; color: #1b699f; @@ -31,8 +30,7 @@ text-shadow: none; } -.#{$name}-link:focus .#{$name}-caption, -.v-nativebutton-link:focus .v-nativebutton-caption { +.#{$name}-link:focus .#{$name}-caption { outline: 1px dotted #1b699f; } diff --git a/WebContent/VAADIN/themes/reindeer/button/button.scss b/WebContent/VAADIN/themes/reindeer/button/button.scss index 9f7e761a1b..7b61d1b213 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button.scss +++ b/WebContent/VAADIN/themes/reindeer/button/button.scss @@ -6,17 +6,10 @@ @import "button-small-style.scss"; @import "button-link-style.scss"; -/* Browser-specific corrections to the standard implementation */ -@import "button-ie.scss"; - -@mixin reindeer-button { +@mixin reindeer-button($name : v-button) { // TODO use $exclude @include reindeer-button-standard; @include reindeer-button-primary-style; @include reindeer-button-small-style; @include reindeer-button-link-style; - - /* Browser-specific corrections to the standard implementation */ - @include reindeer-button-ie; - } diff --git a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss b/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss new file mode 100644 index 0000000000..bd6ca35627 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss @@ -0,0 +1,25 @@ +/* Browser-specific corrections to the standard implementation */ +@import "button-ie.scss"; + +@mixin reindeer-nativebutton-link($name : v-nativebutton) { + +.#{$name}-link .#{$name}-caption { + line-height: inherit; + font-weight: normal; + color: #1b699f; + font-size: 12px; + text-shadow: none; + } + +.#{$name}-link:focus .#{$name}-caption { + outline: 1px dotted #1b699f; + } + +} + +@mixin reindeer-nativebutton($name : v-nativebutton) { + @include reindeer-nativebutton-link($name); + + /* Browser-specific corrections to the standard implementation */ + @include reindeer-button-ie($name); +}
\ No newline at end of file |