From 375dc62c4ae296d2e4ebf6c448cdded9233c6abe Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Tue, 8 May 2018 13:14:28 -0700 Subject: [PATCH] scss mixin: remove-button-styles -> button-reset --- stylesheets/_conversation.scss | 4 ++-- stylesheets/_mixins.scss | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index b3a8784bc..d408a46d9 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -751,7 +751,7 @@ span.status { cursor: pointer; button { - @include remove-button-styles; + @include button-reset; } .first-line { @@ -869,7 +869,7 @@ span.status { margin-right: auto; button { - @include remove-button-styles; + @include button-reset; } .image-container { diff --git a/stylesheets/_mixins.scss b/stylesheets/_mixins.scss index 0b032d86c..00c327d68 100644 --- a/stylesheets/_mixins.scss +++ b/stylesheets/_mixins.scss @@ -1,4 +1,4 @@ -@mixin remove-button-styles() { +@mixin button-reset { background: none; color: inherit; border: none; @@ -13,6 +13,7 @@ -webkit-mask-size: 100%; background-color: $color; } + @mixin header-icon-white($svg) { @include color-svg($svg, rgba(255, 255, 255, 0.8)); &:focus, @@ -27,6 +28,7 @@ @include color-svg($svg, black); } } + @mixin avatar-colors { &.red { background-color: $material_red;