UX: Reducing usage of btn-small, simplifying styles

approved

#1

UX: Reducing usage of btn-small, simplifying styles

diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 60615f6..c1922f4 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -2,8 +2,8 @@
   <div class="title">
     {{#if editingName}}
       {{text-field value=model.name autofocus="true"}}
-      {{d-button action=(action "finishedEditingName") class="btn-primary btn-small submit-edit" icon="check"}}
-      {{d-button action=(action "cancelEditingName") class="btn-small cancel-edit" icon="times"}}
+      {{d-button action=(action "finishedEditingName") class="btn-primary submit-edit" icon="check"}}
+      {{d-button action=(action "cancelEditingName") class="btn-default cancel-edit" icon="times"}}
     {{else}}
       {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
     {{/if}}
@@ -49,8 +49,8 @@
                                        value=colorSchemeId
                                        icon="paint-brush"}}
          {{#if colorSchemeChanged}}
-            {{d-button action=(action "changeScheme") class="btn-primary btn-small submit-edit" icon="check"}}
-            {{d-button action=(action "cancelChangeScheme") class="btn-default btn-small cancel-edit" icon="times"}}
+            {{d-button action=(action "changeScheme") class="btn-primary submit-edit" icon="check"}}
+            {{d-button action=(action "cancelChangeScheme") class="btn-default cancel-edit" icon="times"}}
          {{/if}}
       </div>
       {{#link-to 'adminCustomize.colors' class="btn btn-default edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}}
@@ -119,7 +119,7 @@
         <li>
           <span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span>
           <span class='col'>
-            {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-small cancel-edit" icon="times"}}
+            {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
           </span>
         </li>
         {{/each}}
@@ -147,7 +147,7 @@
       {{#if model.childThemes.length}}
         <ul class='removable-list'>
           {{#each model.childThemes as |child|}}
-            <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action=(action "removeChildTheme") actionParam=child class="btn-default btn-small cancel-edit col" icon="times"}}</li>
+            <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action=(action "removeChildTheme") actionParam=child class="btn-default cancel-edit col" icon="times"}}</li>
           {{/each}}
         </ul>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index a945b8d..a97d800 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -18,8 +18,8 @@
         </div>
 
         <p class="actions">
-          <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
-          {{d-button action=(action "refreshProblems") class="btn-default btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{d-button action=(action "refreshProblems") class="btn-default" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index c72f7a2..a7078f1 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -13,7 +13,7 @@
           <div class='grant-info-item'>
             {{i18n 'badges.allow_title'}}
             {{d-button
-              class="btn btn-small pad-left no-text"
+              class="btn btn-default pad-left no-text"
               action=(action "toggleSetUserTitle")
               icon="pencil"}}
           </div>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 5275167..62473a5 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -11,6 +11,6 @@
 {{else}}
   <div class='ac-wrap composer-user-selector-limited' {{action "toggleSelector"}}>
     <span>{{limitedUsernames}}</span>
-    <span class='btn-small btn-primary'>{{hiddenUsersCount}}</span>
+    <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 6e54369..c9f5028 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -31,7 +31,7 @@
       {{/if}}
       {{#if category.topic_url}}
         <br>
-        {{d-button class="btn-small" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}}
+        {{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}}
       {{/if}}
     </section>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index dec825a..e454439 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -26,13 +26,13 @@
                   nameProperty="description"
                   content=category.availablePermissions
                   value=selectedPermission}}
-      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small add-permission">
+      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-default add-permission">
         {{i18n 'category.add_permission'}}
       </button>
     {{/if}}
   {{else}}
     {{#unless category.is_special}}
-      <button {{action "editPermissions"}} class="btn btn-default btn-small edit-permission">{{i18n 'category.edit_permissions'}}</button>
+      <button {{action "editPermissions"}} class="btn btn-default btn-default edit-permission">{{i18n 'category.edit_permissions'}}</button>
     {{/unless}}
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
index 10cc6e0..f4c4ef7 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
@@ -1,5 +1,5 @@
 {{#if value}}
-  {{#d-button class="btn-small group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
+  {{#d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
     {{d-icon "times-circle"}}
   {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index f98ab03..d7754b4 100644

[... diff too long, it was truncated ...]

GitHub sha: 8176d26d


#2