From 41497b052d4441caccb8a3dc66601c34c056365f Mon Sep 17 00:00:00 2001 From: Stefanie Fluin Date: Tue, 21 Mar 2017 18:02:11 +1100 Subject: [PATCH] feat(aio): font change and toolbar shadow --- aio/src/index.html | 1 - aio/src/styles/0-base/_typography.scss | 2 +- aio/src/styles/1-layouts/_sidenav.scss | 17 ++++------------- aio/src/styles/1-layouts/_top-menu.scss | 8 +++++++- aio/src/styles/_constants.scss | 1 - aio/src/styles/main.scss | 1 + aio/src/styles/mixins.scss | 9 +++++++++ 7 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 aio/src/styles/mixins.scss diff --git a/aio/src/index.html b/aio/src/index.html index 7af2c2334b..711603499f 100644 --- a/aio/src/index.html +++ b/aio/src/index.html @@ -21,7 +21,6 @@ sizes="16x16"> - diff --git a/aio/src/styles/0-base/_typography.scss b/aio/src/styles/0-base/_typography.scss index 271163e9b8..61c0f6f537 100755 --- a/aio/src/styles/0-base/_typography.scss +++ b/aio/src/styles/0-base/_typography.scss @@ -68,7 +68,7 @@ font-size: 18px; font-weight: 300; color: white; - font-family: $support-font; + font-family: $main-font; text-transform: uppercase; } diff --git a/aio/src/styles/1-layouts/_sidenav.scss b/aio/src/styles/1-layouts/_sidenav.scss index 17bfc70d07..7bdb1654d7 100644 --- a/aio/src/styles/1-layouts/_sidenav.scss +++ b/aio/src/styles/1-layouts/_sidenav.scss @@ -131,8 +131,9 @@ } .level-1 { - font-family: $support-font; - font-weight: 500; + font-family: $main-font; + font-size: 14px; + font-weight: 400; text-transform: uppercase; padding-left: 10px; transition: background-color 0.2s; @@ -148,22 +149,12 @@ } .level-3 { - font-family: $support-font; + font-family: $main-font; font-size: 14px; color: $mediumgray; padding-left: 30px; } -@mixin rotate($degrees) { - -moz-transform: rotate($degrees); - -webkit-transform: rotate($degrees); - -o-transform: rotate($degrees); - -ms-transform: rotate($degrees); - transform: rotate($degrees); - transition: transform 150ms; - transition-timing-function: ease-in-out; -} - .level-1.expanded .material-icons, .level-2.expanded .material-icons { @include rotate(90deg); } diff --git a/aio/src/styles/1-layouts/_top-menu.scss b/aio/src/styles/1-layouts/_top-menu.scss index b041c1c1a3..f87bb040c3 100644 --- a/aio/src/styles/1-layouts/_top-menu.scss +++ b/aio/src/styles/1-layouts/_top-menu.scss @@ -3,6 +3,10 @@ aio-top-menu { flex-direction: row; align-items: center; width: 80%; + + @include bp(small) { + // background-color: red; + } } aio-top-menu ul { @@ -20,7 +24,9 @@ aio-top-menu li { } md-toolbar.mat-toolbar { - box-shadow: 6px 0 6px rgba(0,0,0,0.10); + position: relative; + z-index: 10; + box-shadow: 0px 2px 5px 0px rgba(0,0,0,0.30); padding: 0 16px 0px 0px; } diff --git a/aio/src/styles/_constants.scss b/aio/src/styles/_constants.scss index 47bd37298d..417647d5bf 100755 --- a/aio/src/styles/_constants.scss +++ b/aio/src/styles/_constants.scss @@ -2,7 +2,6 @@ $small-breakpoint-width: 840px; // TYPOGRAPHY $main-font: "Roboto","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; -$support-font: "Lato","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; $code-font: "Droid Sans Mono", monospace; // COLOR PALETTE diff --git a/aio/src/styles/main.scss b/aio/src/styles/main.scss index c8eb826039..f46c13e81d 100755 --- a/aio/src/styles/main.scss +++ b/aio/src/styles/main.scss @@ -6,6 +6,7 @@ @import './constants'; // import global mixins +@import './mixins'; // import directories @import './0-base/base-dir'; diff --git a/aio/src/styles/mixins.scss b/aio/src/styles/mixins.scss new file mode 100644 index 0000000000..5f3f90d066 --- /dev/null +++ b/aio/src/styles/mixins.scss @@ -0,0 +1,9 @@ +@mixin rotate($degrees) { + -moz-transform: rotate($degrees); + -webkit-transform: rotate($degrees); + -o-transform: rotate($degrees); + -ms-transform: rotate($degrees); + transform: rotate($degrees); + transition: transform 150ms; + transition-timing-function: ease-in-out; +} \ No newline at end of file