From 752660f5dcea086fc39c9f141b50a92d4295c295 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 12 Sep 2017 10:25:11 +0300 Subject: [PATCH] fix: theme options are not correctly shown on mobile --- package-lock.json | 36 ++++++++-------- .../theme-options.component.html | 42 ++++++++++--------- .../theme-options.component.scss | 7 +++- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a06e75c..50ec6c94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.0.4", + "version": "1.0.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4001,14 +4001,6 @@ } } }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -4019,6 +4011,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true, @@ -8685,15 +8685,6 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -8721,6 +8712,15 @@ } } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/src/app/core/components/theme-options/theme-options.component.html b/src/app/core/components/theme-options/theme-options.component.html index 55d3b694..bae52a49 100644 --- a/src/app/core/components/theme-options/theme-options.component.html +++ b/src/app/core/components/theme-options/theme-options.component.html @@ -13,37 +13,38 @@

Navigation:

- - Top - Left - Right - None + + Top + Left + Right + None

Toolbar:

- Below - Above - None + Below + Above + None

Footer:

- Below - Above - None + Below + Above + None

Layout Mode:

- Boxed - Fullwidth + Boxed + Fullwidth @@ -53,22 +54,25 @@
-

Toolbar Color

- +

Toolbar Color

+
-

Navigation Bar Color

- +

Navigation Bar Color

+
-

Footer Color

- +

Footer Color

+
diff --git a/src/app/core/components/theme-options/theme-options.component.scss b/src/app/core/components/theme-options/theme-options.component.scss index ff68ff70..e3cae6f3 100644 --- a/src/app/core/components/theme-options/theme-options.component.scss +++ b/src/app/core/components/theme-options/theme-options.component.scss @@ -22,6 +22,12 @@ width: 360px; transform: translate3d(100%, 0, 0); z-index: 999; + max-width: 80vw; + max-height: calc(100vh - 180px); + overflow: auto; + + @include media-breakpoint-down('xs') { + } .close-button { position: absolute; @@ -76,5 +82,4 @@ opacity: 1; } } - }