From dbf614a2dc70d4581780562b839e7d26af1e05df Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 24 Apr 2015 17:41:05 -0400 Subject: [PATCH] Re-enabled textures --- .../scss/components/bottomSheet/bottomSheet.scss | 10 +++++----- .../scss/components/toolbar/toolbar.scss | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/scss/components/bottomSheet/bottomSheet.scss b/UI/WebServerResources/scss/components/bottomSheet/bottomSheet.scss index b4a7270c4..f641edf5d 100644 --- a/UI/WebServerResources/scss/components/bottomSheet/bottomSheet.scss +++ b/UI/WebServerResources/scss/components/bottomSheet/bottomSheet.scss @@ -3,19 +3,19 @@ md-bottom-sheet.md-default-theme { border: none; background-color: inherit; - //background-image: url("../img/cardboard-transp.png"); - //background-blend-mode: multiply; + background-image: url("../img/cardboard-transp.png"); + background-blend-mode: multiply; } md-bottom-sheet.md-default-theme .md-button.md-default-theme { &:hover:not([disabled]) { background-color: inherit; - //background-image: url("../img/cardboard-transp.png"); - //background-blend-mode: multiply; + background-image: url("../img/cardboard-transp.png"); + background-blend-mode: multiply; color: sg-color($sogoBlue, 800); } &[disabled] { padding: 6px; // The server remove the 'a' tag when disabling text-transform: uppercase; } -} +} \ No newline at end of file diff --git a/UI/WebServerResources/scss/components/toolbar/toolbar.scss b/UI/WebServerResources/scss/components/toolbar/toolbar.scss index cf349b56d..ae1854237 100644 --- a/UI/WebServerResources/scss/components/toolbar/toolbar.scss +++ b/UI/WebServerResources/scss/components/toolbar/toolbar.scss @@ -17,8 +17,8 @@ md-toolbar { z-index: $z-index-toolbar; // dirty fix to override angular-material botchy typography font-size: 1em !important; - //background-image: url("../img/felt-transp.png"); - //background-blend-mode: luminosity; + background-image: url("../img/felt-transp.png"); + background-blend-mode: luminosity; box-shadow: $whiteframe-shadow-z1; }