diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 7731bc87e..cace35f2e 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -145,7 +145,7 @@ sg-subscribe-on-select="subscribeToFolder">!- subscription dropdown - --> - +
@@ -210,7 +210,6 @@ -

@@ -245,7 +244,7 @@
- +

Contacts

diff --git a/UI/WebServerResources/img/cardboard-transp.png b/UI/WebServerResources/img/cardboard-transp.png new file mode 100644 index 000000000..347e7713d Binary files /dev/null and b/UI/WebServerResources/img/cardboard-transp.png differ diff --git a/UI/WebServerResources/img/felt-transp.png b/UI/WebServerResources/img/felt-transp.png new file mode 100644 index 000000000..f44866529 Binary files /dev/null and b/UI/WebServerResources/img/felt-transp.png differ diff --git a/UI/WebServerResources/scss/components/autoScrollList/autoScrollList.scss b/UI/WebServerResources/scss/components/autoScrollList/autoScrollList.scss index cb921edb0..e904628cd 100644 --- a/UI/WebServerResources/scss/components/autoScrollList/autoScrollList.scss +++ b/UI/WebServerResources/scss/components/autoScrollList/autoScrollList.scss @@ -18,7 +18,6 @@ [id='contactsList'] { border-top: 44px solid transparent; // padding for the header.subheader, border-bottom: 2px solid transparent; //close to a hack - z-index: 10; // In use in MAILER messages list but re-usable // -------------------------------------------- diff --git a/UI/WebServerResources/scss/components/sidenav/sidenav.scss b/UI/WebServerResources/scss/components/sidenav/sidenav.scss index 68ef0ad96..25cb61e89 100644 --- a/UI/WebServerResources/scss/components/sidenav/sidenav.scss +++ b/UI/WebServerResources/scss/components/sidenav/sidenav.scss @@ -106,9 +106,15 @@ md-sidenav { & md-content, & md-toolbar { background-color: inherit; + background-image: url("../img/cardboard-transp.png"); + background-blend-mode: multiply; } } +.md-sidenav-left md-toolbar { + box-shadow: none; +} + // MAILER Folder tree (in the left sidenav // --------------------------------------- $i: 1; @@ -122,7 +128,7 @@ $i: 1; [class*="sg-child-level"] { margin-right: 1em; }; -// This hack is so BAD I'm ashame putting it in the shame file +// This hack is so BAD I am ashame putting it in the shame file // ----------------------------------------------------------- // Folder tree's controler function are very intricate, the way // elements are marked as 'active reminds me of good old time JQuery @@ -130,7 +136,7 @@ $i: 1; // selection, but I don't wan't to mess in that script. // Here's the hack : on selection I use the parent > child selector to // change the definition of the icon's class. Yes, this means that -// md-icon-folder:before as the value of md-icon-folder:before:before, +// md-icon-folder:before as the value of md-icon-folder-open:before, // and this is wrong ! .sg-active i.md-icon-folder:before { diff --git a/UI/WebServerResources/scss/components/toolbar/toolbar.scss b/UI/WebServerResources/scss/components/toolbar/toolbar.scss index a82468552..564dc9f09 100644 --- a/UI/WebServerResources/scss/components/toolbar/toolbar.scss +++ b/UI/WebServerResources/scss/components/toolbar/toolbar.scss @@ -13,8 +13,11 @@ $toolbar-padding: $mg; // must be declare in containers with sg-padded md-toolbar { padding: $toolbar-padding 0; - box-shadow: none; + z-index: $z-index-toolbar; font-size: initial; + background-image: url("../img/felt-transp.png"); + background-blend-mode: luminosity; + box-shadow: $whiteframe-shadow-z1; } .md-toolbar-tools { @@ -71,3 +74,5 @@ hgroup { order: 3; } } + + diff --git a/UI/WebServerResources/scss/core/variables.scss b/UI/WebServerResources/scss/core/variables.scss index 2f7bada40..9b2a58036 100644 --- a/UI/WebServerResources/scss/core/variables.scss +++ b/UI/WebServerResources/scss/core/variables.scss @@ -124,8 +124,9 @@ $z-index-toast: 90 !default; $z-index-bottom-sheet: 70 !default; $z-index-sidenav: 60 !default; $z-index-backdrop: 50 !default; +$z-index-toolbar: 10 !default; $z-index-fab: 20; -$z-index-view: 10; +$z-index-view: 9; // Easing Curves //-------------------------------------------- diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss index ddff7bc78..dca6db20e 100644 --- a/UI/WebServerResources/scss/views/_view.scss +++ b/UI/WebServerResources/scss/views/_view.scss @@ -33,7 +33,13 @@ $detailView-width: grid-step(8) !global; // min-width: ($listView-width - ($pitch * 2)); //} +[class|="view"] { + position: relative; + +} + .view-list { + z-index: ($z-index-view -1); min-width: ($listView-width - ($pitch * 2)); @include at(md){ @include flex-col(md, 7, 1, 1); @@ -48,7 +54,6 @@ $detailView-width: grid-step(8) !global; } .view-detail { - position: relative; z-index: $z-index-view; background-color: $background-base-color; @include from(lg) {