From fc69d6b1d41a7d288585fd4ef8a50dc8dcecc781 Mon Sep 17 00:00:00 2001 From: Benoit Favreault Date: Tue, 14 Apr 2015 22:19:51 -0400 Subject: [PATCH] Change paper palette defaults hues Fix mobile show-hide --- UI/WebServerResources/js/Common/ui.js | 4 ++-- UI/WebServerResources/scss/core/layout.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/js/Common/ui.js b/UI/WebServerResources/js/Common/ui.js index 32790073c..854d1315c 100644 --- a/UI/WebServerResources/js/Common/ui.js +++ b/UI/WebServerResources/js/Common/ui.js @@ -97,10 +97,10 @@ 'hue-3': 'A700' }) .backgroundPalette('sogo-paper', { - 'default': '500', + 'default': '100', 'hue-1': '200', 'hue-2': '50', - 'hue-3': '100' + 'hue-3': '500' }); }]) diff --git a/UI/WebServerResources/scss/core/layout.scss b/UI/WebServerResources/scss/core/layout.scss index fd5cbb76c..2d8cb0162 100644 --- a/UI/WebServerResources/scss/core/layout.scss +++ b/UI/WebServerResources/scss/core/layout.scss @@ -30,7 +30,7 @@ @include at(sm) { .hide-sm, .hide { &:not(.show-sm):not(.show) { - display: none; + display: none !important; } } @@ -42,7 +42,7 @@ @include from(md) { .show-sm { - display: none; + display: none !important; } }