From 4b1bddf625a8d3aa4e7db3cb4a7c17c44138cf64 Mon Sep 17 00:00:00 2001
From: Sauli Tähkäpää <sauli@vaadin.com>
Date: Fri, 26 Dec 2014 13:34:49 +0200
Subject: Determine window header margin size depending on visible buttons.
 (#15408)

Breaking changes: maximizebox and closebox are moved inside outerheader
element.

Change-Id: I909e3a012a632461ab20d51fab37602b1b6ceb12
---
 WebContent/VAADIN/themes/base/window/window.scss      |  1 +
 WebContent/VAADIN/themes/valo/components/_window.scss | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'WebContent/VAADIN')

diff --git a/WebContent/VAADIN/themes/base/window/window.scss b/WebContent/VAADIN/themes/base/window/window.scss
index 4e414379cf..bdc16999b0 100644
--- a/WebContent/VAADIN/themes/base/window/window.scss
+++ b/WebContent/VAADIN/themes/base/window/window.scss
@@ -82,6 +82,7 @@ div.#{$primaryStyleName}-header {
 	height: 0;
 }
 .#{$primaryStyleName}-resizebox-disabled,
+.#{$primaryStyleName}-closebox-disabled,
 .#{$primaryStyleName}-restorebox-disabled,
 .#{$primaryStyleName}-maximizebox-disabled {
 	cursor: default;
diff --git a/WebContent/VAADIN/themes/valo/components/_window.scss b/WebContent/VAADIN/themes/valo/components/_window.scss
index 52f57df183..0b01949593 100644
--- a/WebContent/VAADIN/themes/valo/components/_window.scss
+++ b/WebContent/VAADIN/themes/valo/components/_window.scss
@@ -143,6 +143,17 @@ $v-window-modality-curtain-background-color: #222 !default;
     color: blend-normal(rgba(valo-font-color($v-window-background-color), .7), $v-window-background-color);
   }
 
+  //Adjust header margin according to visible buttons on header
+  .#{$primary-stylename}-restorebox-disabled,
+  .#{$primary-stylename}-maximizebox-disabled {
+    ~ .#{$primary-stylename}-closebox ~ .#{$primary-stylename}-header {
+      margin-right: $v-unit-size;
+    }
+    ~ .#{$primary-stylename}-closebox-disabled ~ .#{$primary-stylename}-header {
+      margin-right: round($v-unit-size/3);
+    }
+  }
+
   .#{$primary-stylename}-closebox,
   .#{$primary-stylename}-maximizebox,
   .#{$primary-stylename}-restorebox {
@@ -201,6 +212,8 @@ $v-window-modality-curtain-background-color: #222 !default;
     }
   }
 
+  .#{$primary-stylename}-closebox-disabled,
+  .#{$primary-stylename}-resizebox-disabled,
   .#{$primary-stylename}-restorebox-disabled,
   .#{$primary-stylename}-maximizebox-disabled {
     display: none;
@@ -290,10 +303,6 @@ $v-window-modality-curtain-background-color: #222 !default;
     }
   }
 
-  .#{$primary-stylename}-resizebox-disabled {
-    display: none;
-  }
-
 
   // Flash modal window when clicking on the curtain
   .#{$primary-stylename}-modalitycurtain:active {
-- 
cgit v1.2.3