From b5ed980235722ac5104e769a139bae1192710e52 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 21 Nov 2017 16:01:15 +0100
Subject: [PATCH] FIX: reflects discourse icons naming scheme s/d-icon-*/d-*

---
 .../discourse/components/period-chooser.js.es6       |  2 +-
 .../discourse/components/topic-status.js.es6         |  2 +-
 app/assets/stylesheets/common/admin/admin_base.scss  | 10 +++++-----
 app/assets/stylesheets/common/admin/customize.scss   |  2 +-
 app/assets/stylesheets/common/base/_topic-list.scss  |  2 +-
 app/assets/stylesheets/common/base/compose.scss      |  2 +-
 app/assets/stylesheets/common/base/directory.scss    | 12 ++++++------
 app/assets/stylesheets/common/base/emoji.scss        |  2 +-
 app/assets/stylesheets/common/base/exception.scss    |  2 +-
 app/assets/stylesheets/common/base/header.scss       |  2 +-
 app/assets/stylesheets/common/base/history.scss      |  2 +-
 app/assets/stylesheets/common/base/menu-panel.scss   |  4 ++--
 app/assets/stylesheets/common/base/modal.scss        |  2 +-
 app/assets/stylesheets/common/base/rtl.scss          |  4 ++--
 app/assets/stylesheets/common/base/tagging.scss      |  2 +-
 app/assets/stylesheets/common/base/user.scss         |  3 +--
 app/assets/stylesheets/common/components/badges.scss |  2 +-
 app/assets/stylesheets/desktop/discourse.scss        |  2 +-
 app/assets/stylesheets/desktop/header.scss           |  2 +-
 app/assets/stylesheets/desktop/topic-list.scss       |  8 ++++----
 app/assets/stylesheets/desktop/topic-post.scss       | 10 +++++-----
 app/assets/stylesheets/mobile/directory.scss         |  2 +-
 app/assets/stylesheets/mobile/discourse.scss         |  2 +-
 app/assets/stylesheets/mobile/topic-list.scss        |  2 +-
 app/assets/stylesheets/mobile/topic-post.scss        |  6 +++---
 app/assets/stylesheets/wizard.scss                   |  6 +++---
 26 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/period-chooser.js.es6 b/app/assets/javascripts/discourse/components/period-chooser.js.es6
index e3bc67fb5fe..8180b138f06 100644
--- a/app/assets/javascripts/discourse/components/period-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/period-chooser.js.es6
@@ -25,7 +25,7 @@ export default Ember.Component.extend(CleansUp, {
 
     if (!this.get('showPeriods')) {
       if (!this.site.mobileView) {
-        const $chevron = this.$('.d-icon-caret-down');
+        const $chevron = this.$('.d-caret-down');
         this.$('#period-popup').css($chevron.position());
       } else {
         this.$('#period-popup').css({top: this.$().height()});
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index f1c8695dfde..a4cd843d910 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -8,7 +8,7 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
 
   click(e) {
-    if ($(e.target).hasClass('d-icon-thumb-tack')) {
+    if ($(e.target).hasClass('d-thumb-tack')) {
       const topic = this.get('topic');
 
       // only pin unpin for now
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 4b61694769c..720287d28bc 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -53,8 +53,8 @@ $mobile-breakpoint: 700px;
         background-color: lighten($primary, 80%);
       }
 
-      .d-icon-chevron-down,
-      .d-icon-chevron-up {
+      .d-chevron-down,
+      .d-chevron-up {
         margin-left: 0.5em;
       }
     }
@@ -905,7 +905,7 @@ table.api-keys {
       .d-icon {
         color: $primary;
       }
-      .d-icon-heart {
+      .d-heart {
         color: $love;
       }
     }
@@ -1386,10 +1386,10 @@ table.api-keys {
 }
 
 .tl3-requirements {
-  .d-icon-check {
+  .d-check {
     color: $success;
   }
-  .d-icon-times {
+  .d-times {
     color: $danger;
   }
 }
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 91665d43b70..0011a0465ea 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -104,7 +104,7 @@
         margin-left: 8px;
       }
 
-      .d-icon-mobile {
+      .d-mobile {
         position: relative;
         top: -3px;
         font-size: 1.5em;
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 9393c7fc822..0cf0a74c1aa 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -277,7 +277,7 @@ ol.category-breadcrumb {
   }
 }
 
-.d-icon-thumb-tack.unpinned {
+.d-thumb-tack.unpinned {
   @include fa-icon-rotate(180deg, 1);
   color: $primary;
   /* because it is rotated, right becomes left! */
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 9cec8bcfe52..7922cc90019 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -197,7 +197,7 @@
     margin: 0;
 
     li {
-      .d-icon-users {
+      .d-users {
         color: lighten($primary, 40%);
         padding: 0 2px;
       }
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 6e874e14dff..f28ed28ae05 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -26,11 +26,11 @@
     td, th {
       padding: 0.5em;
       text-align: left;
-      border-bottom: 1px solid $primary-low; 
+      border-bottom: 1px solid $primary-low;
 
       .number, .time-read {
         font-size: 1.4em;
-        color: $primary-medium; 
+        color: $primary-medium;
       }
     }
 
@@ -39,7 +39,7 @@
         background-color: dark-light-choose($highlight-low, $highlight-medium);
 
         .username a, .name, .title, .number, .time-read {
-          color: $primary-medium;           
+          color: $primary-medium;
         }
       }
     }
@@ -49,16 +49,16 @@
       white-space: nowrap;
 
       width: 13%;
-      .d-icon-heart {
+      .d-heart {
         color: $love;
         margin-right: 0.5em;
       }
-      .d-icon-chevron-down, .d-icon-chevron-up {
+      .d-chevron-down, .d-chevron-up {
         margin-left: 0.5em;
       }
 
       &:hover {
-        background-color: $primary-low; 
+        background-color: $primary-low;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 1e10fd422e5..dec4dfb7898 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -196,7 +196,7 @@ img.emoji {
   align-items: center;
 }
 
-.emoji-picker .filter .d-icon-search {
+.emoji-picker .filter .d-search {
   color: dark-light-choose($header_primary-medium, $header_primary);
   font-size: 16px;
   margin-left: 5px;
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 9bdc0df4bb8..7e83e612be5 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -16,7 +16,7 @@
   }
   .desc {
     margin-top: 16px;
-    .d-icon-check-circle {
+    .d-check-circle {
       color: $success;
     }
   }
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index ac9feaa0a85..99e46340fb1 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -26,7 +26,7 @@
     max-height: 40px;
   }
 
-  .d-icon-home {
+  .d-home {
     font-size: 1.643em;
   }
 
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 138784a7376..3252ef04c03 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -80,7 +80,7 @@
     background-color: lighten($highlight, 23%);
     padding: 3px 5px 5px 5px;
   }
-  .d-icon-ban {
+  .d-ban {
     color: #f00;
   }
   .hidden-revision-either {
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 6b66d5120ea..34a34193a1b 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -234,7 +234,7 @@
       }
     }
     .is-warning {
-      .d-icon-envelope-o {
+      .d-envelope-o {
         &:before {
           content: "\f0e0";
         }
@@ -326,7 +326,7 @@ div.menu-links-header {
   a {
     font-size: 1.1em;
   }
-  .d-icon-user {
+  .d-user {
     margin-right: 0.2em;
   }
 }
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index aa00dc21c71..6dce9093588 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -299,7 +299,7 @@
   .permission {
     margin-left: 20px;
   }
-  .d-icon-times-circle {
+  .d-times-circle {
     margin-left: 5px;
   }
   li {
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index ad7e5c4af7a..eb6775300ff 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -7,7 +7,7 @@
   right: 0 !important;
 }
 
-// This is used to flip the .d-icon-caret-right
+// This is used to flip the .d-caret-right
 @mixin rotate( $degrees ) {
   -webkit-transform: rotate(#{$degrees}deg);
   -moz-transform: rotate(#{$degrees}deg);
@@ -21,7 +21,7 @@
 }
 
 // Get the right caret to point left
-.rtl .d-icon-caret-right {
+.rtl .d-caret-right {
   @include rotate(180);
 }
 
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 623b4369bc0..72d8d02d1a8 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -225,7 +225,7 @@ header .discourse-tag {color: $tag-color }
 }
 
 .autocomplete {
-  .d-icon-tag {
+  .d-tag {
    color: dark-light-choose($primary, $primary-low-mid);
    padding-right: 5px;
   }
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 4719c6c4468..49e98b039b3 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -10,7 +10,7 @@
 }
 
 .user-main {
-  .d-icon-heart {
+  .d-heart {
     color: $love !important;
   }
 
@@ -538,4 +538,3 @@
     }
   }
 }
-
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index c9ccb9fecf1..8704159938e 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -164,7 +164,7 @@
         padding: 5px;
         width: 13px;
 
-        .d-icon-caret-right {
+        .d-caret-right {
           margin-left: 2px;
         }
       }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index c187528f84b..97d22c16e16 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -43,7 +43,7 @@ header {
       }
   }
 
-  .d-icon-envelope {
+  .d-envelope {
     color: $danger;
   }
 }
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index 9417b848090..d2501fc350b 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -6,7 +6,7 @@
   left: 0;
   padding-top: 3px;
   height: 60px;
-  .d-icon-home {
+  .d-home {
     padding:8px;
     font-size: 2.1em;
   }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 963cec5950c..1be03dd0739 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -34,10 +34,10 @@
 // --------------------------------------------------
 
 .topic-list-icons {
-  .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
-  .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
+  .d-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
+  .d-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
   a.title {color: $primary;}
-  .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
+  .d-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
 }
 
 .topic-list {
@@ -72,7 +72,7 @@
   .star {
     width: 20px;
     padding-right: 0;
-    .d-icon-star {
+    .d-star {
       position: relative;
     }
     + .main-link {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index f36bfcf05a2..8680471feb2 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -249,7 +249,7 @@ nav.post-controls {
   }
 
   .post-date { color: dark-light-choose($primary-medium, $secondary-high); }
-  .d-icon-arrow-up, .d-icon-arrow-down { margin-left: 5px; }
+  .d-arrow-up, .d-arrow-down { margin-left: 5px; }
   .reply:first-of-type .row { border-top: none; }
 
   .topic-meta-data {
@@ -373,7 +373,7 @@ a.star {
       font-weight: bold;
       font-size: 0.929em;
     }
-    .d-icon-times {
+    .d-times {
       color: dark-light-choose($primary-medium, $secondary-high);
     }
   }
@@ -443,10 +443,10 @@ a.star {
   }
   .btn {
     @include topic-footer-button;
-    .d-icon-bookmark.bookmarked { color: $tertiary; }
+    .d-bookmark.bookmarked { color: $tertiary; }
   }
 
-  .bookmark.bookmarked .d-icon-bookmark {
+  .bookmark.bookmarked .d-bookmark {
     color: $tertiary;
   }
 }
@@ -519,7 +519,7 @@ video {
 
   .topic-statuses {
     i { color: $header_primary; }
-    .d-icon-envelope { color: $danger; }
+    .d-envelope { color: $danger; }
     .unpinned { color: $header_primary; }
   }
 
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 4636e391eb0..99d05cfb747 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -40,7 +40,7 @@
       margin-left: 0.2em;
       color: blend-primary-secondary(50%);
     }
-    .d-icon-heart {
+    .d-heart {
       color: $love;
     }
   }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 2acd1d8412d..af587e89adb 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -112,7 +112,7 @@ h2 {
     display: block;
   }
 
-  .d-icon-caret-down {
+  .d-caret-down {
     position: absolute;
     right: 0px;
   }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 49c1dd29c0a..7945f47e258 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -48,7 +48,7 @@
   }
   .nav-pills > li {
     background: $primary-low;
-    .d-icon-caret-down {
+    .d-caret-down {
       margin-left: 8px;
     }
   }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 9b0565b4644..ab15d65087b 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -49,7 +49,7 @@ span.badge-posts {
       }
       &.reply {
         float: right;
-        color: $primary-high;        
+        color: $primary-high;
       }
       &.has-like {
         color: $love;
@@ -289,7 +289,7 @@ a.star {
 #topic-footer-buttons {
   @include clearfix;
   padding: 20px 0 0 0;
-  .d-icon-bookmark.bookmarked { color: $tertiary; }
+  .d-bookmark.bookmarked { color: $tertiary; }
 
   .combobox {
     float: left;
@@ -337,7 +337,7 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .d-icon-star {margin-right: 5px;}
+    .d-star {margin-right: 5px;}
   }
 }
 
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index ab0b6f3601d..de39fbc3cda 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -227,11 +227,11 @@ body.wizard {
       background-color: #ccc;
     }
 
-    .d-icon-chevron-right {
+    .d-chevron-right {
       margin-left: 0.25em;
       font-size: 0.8em;
     }
-    .d-icon-chevron-left {
+    .d-chevron-left {
       margin-right: 0.25em;
       font-size: 0.8em;
     }
@@ -290,7 +290,7 @@ body.wizard {
     .wizard-btn.next {
       min-width: 70px;
 
-      .d-icon-chevron-right {
+      .d-chevron-right {
         margin-left: 0.25em;
         font-size: 0.8em;
       }