From 69b5a4adfc6d2cae722793f63853cf8ebc8171db Mon Sep 17 00:00:00 2001 From: alisan617 Date: Tue, 11 Oct 2016 12:44:09 -0400 Subject: [PATCH] classname clash in uxpl shims TNL-5534 --- common/static/sass/edx-pattern-library-shims/_buttons.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/static/sass/edx-pattern-library-shims/_buttons.scss b/common/static/sass/edx-pattern-library-shims/_buttons.scss index 0f290713bb..08eb3361dd 100644 --- a/common/static/sass/edx-pattern-library-shims/_buttons.scss +++ b/common/static/sass/edx-pattern-library-shims/_buttons.scss @@ -8,7 +8,7 @@ // ---------------------------- // #GLOBALS // ---------------------------- -%btn { +%btn-shims { display: inline-block; border-style: $btn-border-style; border-radius: $btn-border-radius; @@ -50,7 +50,7 @@ // #DEFAULT // ---------------------------- .btn-default { - @extend %btn; + @extend %btn-shims; border-color: $btn-default-border-color; background: $btn-default-background; color: $btn-default-color; @@ -85,7 +85,7 @@ // #BRAND // ---------------------------- .btn-brand { - @extend %btn; + @extend %btn-shims; border-color: $btn-brand-border-color; background: $btn-brand-background; color: $btn-brand-color;