From f05ebb57638d34482dfeb83f5518d7fbfb31e831 Mon Sep 17 00:00:00 2001 From: Matty Goo Date: Thu, 25 Jan 2018 11:46:06 -0800 Subject: [PATCH] fix(drawer): remove dark theme (#2080) --- packages/mdc-drawer/_mixins.scss | 9 --------- .../permanent/mdc-permanent-drawer.scss | 20 ------------------- .../persistent/mdc-persistent-drawer.scss | 14 ------------- .../temporary/mdc-temporary-drawer.scss | 7 ------- 4 files changed, 50 deletions(-) diff --git a/packages/mdc-drawer/_mixins.scss b/packages/mdc-drawer/_mixins.scss index 85aae3e6955..cb324735d18 100644 --- a/packages/mdc-drawer/_mixins.scss +++ b/packages/mdc-drawer/_mixins.scss @@ -16,7 +16,6 @@ @import "@material/animation/functions"; @import "@material/animation/variables"; -@import "@material/theme/mixins"; @import "@material/theme/variables"; @import "@material/typography/mixins"; @@ -32,10 +31,6 @@ padding: 16px; border-bottom: 1px solid rgba(0, 0, 0, .12); - @include mdc-theme-dark(quote(#{&})) { - border-bottom: 1px solid rgba(255, 255, 255, .12); - } - /* TODO(sgomes): replace with global breakpoints when we have them */ @media (min-width: 600px) { height: 64px; @@ -83,10 +78,6 @@ .mdc-list-item__graphic { color: rgba(0, 0, 0, .54); - - @include mdc-theme-dark(#{&}) { - color: rgba(255, 255, 255, .54); - } } } diff --git a/packages/mdc-drawer/permanent/mdc-permanent-drawer.scss b/packages/mdc-drawer/permanent/mdc-permanent-drawer.scss index 4a9c64f2f20..af2fb21c449 100644 --- a/packages/mdc-drawer/permanent/mdc-permanent-drawer.scss +++ b/packages/mdc-drawer/permanent/mdc-permanent-drawer.scss @@ -15,16 +15,10 @@ // @import "@material/rtl/mixins"; -@import "@material/theme/mixins"; @import "../variables"; @import "../mixins"; $mdc-permanent-drawer-width: 240px; -$mdc-permanent-drawer-dark-theme-bg-color: #212121 !default; - -:root { - --mdc-permanent-drawer-dark-theme-bg-color: #{$mdc-permanent-drawer-dark-theme-bg-color}; -} .mdc-drawer--permanent { @include mdc-drawer-base_; @@ -33,14 +27,6 @@ $mdc-permanent-drawer-dark-theme-bg-color: #212121 !default; @include mdc-rtl-reflexive-box(border, right, 1px solid #e4e4e4); @include mdc-rtl-reflexive-position(left, 0); - @include mdc-theme-dark { - @include mdc-theme-prop(color, text-primary-on-dark); - @include mdc-rtl-reflexive-box(border, right, 1px solid rgba(white, .12)); - - background-color: $mdc-permanent-drawer-dark-theme-bg-color; - background-color: var(--mdc-permanent-drawer-dark-theme-bg-color, #{$mdc-permanent-drawer-dark-theme-bg-color}); - } - display: inline-flex; flex: 0 0 auto; flex-direction: column; @@ -52,11 +38,5 @@ $mdc-permanent-drawer-dark-theme-bg-color: #212121 !default; @include mdc-rtl-reflexive-box(border, right, none); background: none; - - @include mdc-theme-dark { - @include mdc-rtl-reflexive-box(border, right, none); - - background: none; - } } } diff --git a/packages/mdc-drawer/persistent/mdc-persistent-drawer.scss b/packages/mdc-drawer/persistent/mdc-persistent-drawer.scss index 72c25669958..10094cd545f 100644 --- a/packages/mdc-drawer/persistent/mdc-persistent-drawer.scss +++ b/packages/mdc-drawer/persistent/mdc-persistent-drawer.scss @@ -15,18 +15,12 @@ // @import "@material/rtl/mixins"; -@import "@material/theme/mixins"; @import "../mixins"; @import "../variables"; @import "../slidable/mixins"; @import "../slidable/variables"; $mdc-persistent-drawer-width: 240px; -$mdc-persistent-drawer-dark-theme-bg-color: #212121 !default; - -:root { - --mdc-persistent-drawer-dark-theme-bg-color: #{$mdc-persistent-drawer-dark-theme-bg-color}; -} .mdc-drawer--persistent { @include mdc-drawer-base_; @@ -39,14 +33,6 @@ $mdc-persistent-drawer-dark-theme-bg-color: #212121 !default; @include mdc-rtl-reflexive-box(border, right, 1px solid #e4e4e4); @include mdc-rtl-reflexive-position(left, 0); - @include mdc-theme-dark { - @include mdc-theme-prop(color, text-primary-on-dark); - @include mdc-rtl-reflexive-box(border, right, 1px solid rgba(white, .12)); - - background-color: $mdc-persistent-drawer-dark-theme-bg-color; - background-color: var(--mdc-persistent-drawer-dark-theme-bg-color, #{$mdc-persistent-drawer-dark-theme-bg-color}); - } - @include mdc-slideable-drawer; display: inline-flex; diff --git a/packages/mdc-drawer/temporary/mdc-temporary-drawer.scss b/packages/mdc-drawer/temporary/mdc-temporary-drawer.scss index 45b0574df92..eee85497de3 100644 --- a/packages/mdc-drawer/temporary/mdc-temporary-drawer.scss +++ b/packages/mdc-drawer/temporary/mdc-temporary-drawer.scss @@ -17,7 +17,6 @@ @import "@material/animation/functions"; @import "@material/elevation/mixins"; @import "@material/rtl/mixins"; -@import "@material/theme/mixins"; @import "../mixins"; @import "../variables"; @import "../slidable/mixins"; @@ -59,12 +58,6 @@ @include mdc-elevation(16); @include mdc-rtl-reflexive-position(left, 0); - @include mdc-theme-dark(".mdc-drawer--temporary") { - @include mdc-theme-prop(color, text-primary-on-dark); - - background: #303030; - } - @include mdc-slideable-drawer; display: flex;