From e4c593f1e7fcafe6b631c6fe45c09d149a22a67c Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 11 Jan 2019 15:41:51 -0500
Subject: [PATCH] removing some dupe styles, adding button class

---
 .../discourse/templates/preferences/account.hbs           | 2 +-
 app/assets/stylesheets/common/base/compose.scss           | 8 --------
 app/assets/stylesheets/common/d-editor.scss               | 8 +++++++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index d3ea8616d6b..d2f77f957ac 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -120,7 +120,7 @@
           {{else}}
             <td colspan=2>
               {{#if authProvider.method.can_connect}}
-                {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" icon="plug" disabled=disableConnectButtons}}
+                {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
               {{else}}
                 {{i18n 'user.associated_accounts.not_connected'}}
               {{/if}}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index c11f336e627..b00124a6390 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -270,14 +270,6 @@
     min-height: 0;
   }
 
-  .d-editor-button-bar .btn {
-    padding: 4px 8px;
-    display: inline-block;
-    @media all and (max-width: 800px) {
-      padding: 5px;
-    }
-  }
-
   .submit-panel {
     display: flex;
     flex-shrink: 0;
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 66d9799e470..8d8307d8823 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -79,9 +79,15 @@
   padding-left: 3px;
   border-bottom: 1px solid $primary-low;
 
-  button {
+  .btn,
+  .btn-default {
     background-color: transparent;
     color: $primary-high;
+    padding: 4px 8px;
+    display: inline-block;
+    @media all and (max-width: 800px) {
+      padding: 5px;
+    }
   }
 
   .btn:not(.no-text) {