From 0c822d492412df5194b07f2ae03da103fd5762c8 Mon Sep 17 00:00:00 2001 From: Mike Mitterer Date: Tue, 3 Mar 2015 23:51:57 +0100 Subject: [PATCH] fix: Fixed-header-layout shows burger-button correct --- example/layout/web/demo.css | 8 +++++++- example/layout/web/demo.scss | 2 +- example/layout/web/index.html | 2 +- lib/sass/layout/_layout.scss | 13 +++++++++++++ pubspec.yaml | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/example/layout/web/demo.css b/example/layout/web/demo.css index 9593330a..3bdf4d9f 100644 --- a/example/layout/web/demo.css +++ b/example/layout/web/demo.css @@ -1223,7 +1223,13 @@ dt { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; - display: flex; } } + display: flex; } + .wsk-layout__header .wsk-layout-title { + margin-left: 24px; } + .wsk-layout--fixed-header.wsk-layout--overlay-drawer-button > .wsk-layout__header > .wsk-layout-icon { + left: 48px; } + .wsk-layout--fixed-header.wsk-layout--overlay-drawer-button > .wsk-layout__header .wsk-layout-title { + margin-left: 12px; } } .wsk-layout__header--multi-row { -webkit-box-orient: vertical; diff --git a/example/layout/web/demo.scss b/example/layout/web/demo.scss index 498168db..9ff9838a 100644 --- a/example/layout/web/demo.scss +++ b/example/layout/web/demo.scss @@ -1,5 +1,5 @@ @import 'packages/wsk_material/sass/styleguide_demo_bp'; -@import 'packages/wsk_material/sass/layout/_layout'; +@import 'packages/wsk_material/sass/layout/layout'; @import 'packages/wsk_material/sass/textfield/_textfield'; @import 'packages/wsk_material/sass/animation/animation'; @import 'packages/wsk_material/sass/palette/palette'; diff --git a/example/layout/web/index.html b/example/layout/web/index.html index ec595b27..8c2be092 100644 --- a/example/layout/web/index.html +++ b/example/layout/web/index.html @@ -158,7 +158,7 @@

Fixed header

Always shows a header, even in smaller screens.

-
+
diff --git a/lib/sass/layout/_layout.scss b/lib/sass/layout/_layout.scss index 428a3f64..7e72edee 100644 --- a/lib/sass/layout/_layout.scss +++ b/lib/sass/layout/_layout.scss @@ -325,6 +325,19 @@ $layout-tab-highlight-thickness: 2px; .wsk-layout--fixed-header > & { display: flex; } + + & .wsk-layout-title { + margin-left: 24px; + } + + .wsk-layout--fixed-header.wsk-layout--overlay-drawer-button > & { + & > .wsk-layout-icon { + left: $layout-header-basic-mobile-indent + 32px; + } + & .wsk-layout-title { + margin-left: 12px; + } + } } } diff --git a/pubspec.yaml b/pubspec.yaml index efa94168..1c9e2f05 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: wsk_material -description: Web Starter Kit - Material Design with Dart +description: Material Design for your Application. Based on Googles Web Starter Kit version: 0.6.7 author: Mike Mitterer homepage: https://github.com/MikeMitterer/dart-wsk-material