From cc3041f933f231ef274e606fe97f713468f2e3b0 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 4 Apr 2013 23:25:10 +0300 Subject: Maximize/restore icons for Chameleon, Liferay, Runo (#3400) Change-Id: Ibbeed5b5925442f966841c0f5d2ea3dbfe9007bb --- .../themes/chameleon/components/window/window.scss | 34 +++++++++++++++------ .../VAADIN/themes/chameleon/img/maximize.png | Bin 0 -> 1207 bytes WebContent/VAADIN/themes/chameleon/img/restore.png | Bin 0 -> 1200 bytes .../themes/liferay/window/maximize_sprites.png | Bin 0 -> 1291 bytes .../themes/liferay/window/restore_sprites.png | Bin 0 -> 1441 bytes .../VAADIN/themes/liferay/window/window.scss | 28 ++++++++++++----- .../VAADIN/themes/runo/window/img/maximize.png | Bin 0 -> 388 bytes .../VAADIN/themes/runo/window/img/restore.png | Bin 0 -> 569 bytes WebContent/VAADIN/themes/runo/window/window.scss | 26 +++++++++++----- 9 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 WebContent/VAADIN/themes/chameleon/img/maximize.png create mode 100644 WebContent/VAADIN/themes/chameleon/img/restore.png create mode 100644 WebContent/VAADIN/themes/liferay/window/maximize_sprites.png create mode 100644 WebContent/VAADIN/themes/liferay/window/restore_sprites.png create mode 100644 WebContent/VAADIN/themes/runo/window/img/maximize.png create mode 100644 WebContent/VAADIN/themes/runo/window/img/restore.png (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.scss b/WebContent/VAADIN/themes/chameleon/components/window/window.scss index e9524745f8..92ada43c90 100644 --- a/WebContent/VAADIN/themes/chameleon/components/window/window.scss +++ b/WebContent/VAADIN/themes/chameleon/components/window/window.scss @@ -1,25 +1,39 @@ @mixin chameleon-window($primaryStyleName : v-window) { -.#{$primaryStyleName}-closebox { +.#{$primaryStyleName}-closebox, +.#{$primaryStyleName}-restorebox, +.#{$primaryStyleName}-maximizebox { width: 14px; height: 15px; overflow: hidden; - text-indent: -50px; - background: transparent url(../../img/close-btn.png) no-repeat; vertical-align: middle; margin: 0; top: .3em; - right: .4em; z-index: 2; + &:hover { + background-position: 0 -25px; } - -.#{$primaryStyleName}-closebox:hover { - background-position: 0 -25px; + &:active { + background-position: 0 -50px; } +} +.#{$primaryStyleName}-closebox { + text-indent: -50px; + background: transparent url(../../img/close-btn.png) no-repeat; + right: .4em; +} +.#{$primaryStyleName}-restorebox, +.#{$primaryStyleName}-maximizebox { + right: 1.8em; +} + +.#{$primaryStyleName}-restorebox { + background: transparent url(../../img/restore.png) no-repeat; +} +.#{$primaryStyleName}-maximizebox { + background: transparent url(../../img/maximize.png) no-repeat; +} -.#{$primaryStyleName}-closebox:active { - background-position: 0 -50px; - } .#{$primaryStyleName} { background-image: none; diff --git a/WebContent/VAADIN/themes/chameleon/img/maximize.png b/WebContent/VAADIN/themes/chameleon/img/maximize.png new file mode 100644 index 0000000000..5c6488d1a5 Binary files /dev/null and b/WebContent/VAADIN/themes/chameleon/img/maximize.png differ diff --git a/WebContent/VAADIN/themes/chameleon/img/restore.png b/WebContent/VAADIN/themes/chameleon/img/restore.png new file mode 100644 index 0000000000..55d004fe53 Binary files /dev/null and b/WebContent/VAADIN/themes/chameleon/img/restore.png differ diff --git a/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png b/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png new file mode 100644 index 0000000000..06510063cd Binary files /dev/null and b/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png differ diff --git a/WebContent/VAADIN/themes/liferay/window/restore_sprites.png b/WebContent/VAADIN/themes/liferay/window/restore_sprites.png new file mode 100644 index 0000000000..41ccfaf79f Binary files /dev/null and b/WebContent/VAADIN/themes/liferay/window/restore_sprites.png differ diff --git a/WebContent/VAADIN/themes/liferay/window/window.scss b/WebContent/VAADIN/themes/liferay/window/window.scss index 54bfb37938..583a81d9e4 100644 --- a/WebContent/VAADIN/themes/liferay/window/window.scss +++ b/WebContent/VAADIN/themes/liferay/window/window.scss @@ -42,21 +42,35 @@ height: 5px; } +.v-window-restorebox, +.v-window-maximizebox, .v-window-closebox { - background: url(closebutton_sprites.png) no-repeat scroll 0 0 transparent; position: absolute; width: 24px; height: 24px; - right: 9px; top: 8px; + &:hover { + background-position: 0 -24px; + } + &:active { + background-position: 0 -48px; + } + } - -.v-window-closebox:hover { - background-position: 0 -24px; +.v-window-closebox { + right: 9px; + background: url(closebutton_sprites.png) no-repeat scroll 0 0 transparent; } -.v-window-closebox:active { - background-position: 0 -48px; +.v-window-restorebox, +.v-window-maximizebox { + right: 36px; +} +.v-window-restorebox { + background: url(restore_sprites.png) no-repeat scroll 0 0 transparent; +} +.v-window-maximizebox { + background: url(maximize_sprites.png) no-repeat scroll 0 0 transparent; } .v-window-resizebox { diff --git a/WebContent/VAADIN/themes/runo/window/img/maximize.png b/WebContent/VAADIN/themes/runo/window/img/maximize.png new file mode 100644 index 0000000000..c7a1a8d418 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/window/img/maximize.png differ diff --git a/WebContent/VAADIN/themes/runo/window/img/restore.png b/WebContent/VAADIN/themes/runo/window/img/restore.png new file mode 100644 index 0000000000..15ac00ddb2 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/window/img/restore.png differ diff --git a/WebContent/VAADIN/themes/runo/window/window.scss b/WebContent/VAADIN/themes/runo/window/window.scss index db153243e9..da597d769a 100644 --- a/WebContent/VAADIN/themes/runo/window/window.scss +++ b/WebContent/VAADIN/themes/runo/window/window.scss @@ -56,13 +56,17 @@ .#{$primaryStyleName}-restorebox { position: absolute; top: 21px; - width: 12px; height: 12px; background: transparent url(img/close.png); } .#{$primaryStyleName}-closebox { + width: 12px; + height: 12px; right: 24px; background: transparent url(img/close.png); + &:hover { + background-position: 0 -12px; + } } .#{$primaryStyleName}-maximizebox, @@ -70,17 +74,25 @@ right: 42px; } -.#{$primaryStyleName}-maximizebox { - background: transparent url(img/maximize.png); -} - .#{$primaryStyleName}-restorebox { + width: 15px; + height: 14px; + background: transparent url(img/restore.png); + &:hover { + background-position: 0 -14px; + } } +.#{$primaryStyleName}-maximizebox { + width: 13px; + height: 12px; -.#{$primaryStyleName}-closebox:hover { - background-position: 0 -12px; + background: transparent url(img/maximize.png); + &:hover { + background-position: 0 -12px; + } } + .#{$primaryStyleName}-modalitycurtain { background: #fff; } -- cgit v1.2.3