Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: reflects discourse icons naming scheme s/d-icon-*/d-*" 

This reverts commit b5ed980235.
This commit is contained in:
Joffrey JAFFEUX 2017-11-23 17:14:51 +01:00
parent 39810e4425
commit dd5562322b
26 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/period-chooser.js.es6
View File

@ -25,7 +25,7 @@ export default Ember.Component.extend(CleansUp, {
if (!this.get('showPeriods')) {
if (!this.site.mobileView) {
const $chevron = this.$('.d-caret-down');
const $chevron = this.$('.d-icon-caret-down');
this.$('#period-popup').css($chevron.position());
} else {
this.$('#period-popup').css({top: this.$().height()});

2
app/assets/javascripts/discourse/components/topic-status.js.es6
View File

@ -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-thumb-tack')) {
if ($(e.target).hasClass('d-icon-thumb-tack')) {
const topic = this.get('topic');
// only pin unpin for now

10
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -53,8 +53,8 @@ $mobile-breakpoint: 700px;
background-color: lighten($primary, 80%);
}
.d-chevron-down,
.d-chevron-up {
.d-icon-chevron-down,
.d-icon-chevron-up {
margin-left: 0.5em;
}
}
@ -905,7 +905,7 @@ table.api-keys {
.d-icon {
color: $primary;
}
.d-heart {
.d-icon-heart {
color: $love;
}
}
@ -1386,10 +1386,10 @@ table.api-keys {
}
.tl3-requirements {
.d-check {
.d-icon-check {
color: $success;
}
.d-times {
.d-icon-times {
color: $danger;
}
}

2
app/assets/stylesheets/common/admin/customize.scss
View File

@ -104,7 +104,7 @@
margin-left: 8px;
}
.d-mobile {
.d-icon-mobile {
position: relative;
top: -3px;
font-size: 1.5em;

2
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -276,7 +276,7 @@ ol.category-breadcrumb {
}
}
.d-thumb-tack.unpinned {
.d-icon-thumb-tack.unpinned {
@include fa-icon-rotate(180deg, 1);
color: $primary;
/* because it is rotated, right becomes left! */

2
app/assets/stylesheets/common/base/compose.scss
View File

@ -197,7 +197,7 @@
margin: 0;
li {
.d-users {
.d-icon-users {
color: lighten($primary, 40%);
padding: 0 2px;
}

12
app/assets/stylesheets/common/base/directory.scss
View File

@ -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-heart {
.d-icon-heart {
color: $love;
margin-right: 0.5em;
}
.d-chevron-down, .d-chevron-up {
.d-icon-chevron-down, .d-icon-chevron-up {
margin-left: 0.5em;
}
&:hover {
background-color: $primary-low;
background-color: $primary-low;
}
}
}

2
app/assets/stylesheets/common/base/emoji.scss
View File

@ -196,7 +196,7 @@ img.emoji {
align-items: center;
}
.emoji-picker .filter .d-search {
.emoji-picker .filter .d-icon-search {
color: dark-light-choose($header_primary-medium, $header_primary);
font-size: 16px;
margin-left: 5px;

2
app/assets/stylesheets/common/base/exception.scss
View File

@ -16,7 +16,7 @@
}
.desc {
margin-top: 16px;
.d-check-circle {
.d-icon-check-circle {
color: $success;
}
}

2
app/assets/stylesheets/common/base/header.scss
View File

@ -26,7 +26,7 @@
max-height: 40px;
}
.d-home {
.d-icon-home {
font-size: 1.643em;
}

2
app/assets/stylesheets/common/base/history.scss
View File

@ -80,7 +80,7 @@
background-color: lighten($highlight, 23%);
padding: 3px 5px 5px 5px;
}
.d-ban {
.d-icon-ban {
color: #f00;
}
.hidden-revision-either {

4
app/assets/stylesheets/common/base/menu-panel.scss
View File

@ -234,7 +234,7 @@
}
}
.is-warning {
.d-envelope-o {
.d-icon-envelope-o {
&:before {
content: "\f0e0";
}
@ -326,7 +326,7 @@ div.menu-links-header {
a {
font-size: 1.1em;
}
.d-user {
.d-icon-user {
margin-right: 0.2em;
}
}

2
app/assets/stylesheets/common/base/modal.scss
View File

@ -299,7 +299,7 @@
.permission {
margin-left: 20px;
}
.d-times-circle {
.d-icon-times-circle {
margin-left: 5px;
}
li {

4
app/assets/stylesheets/common/base/rtl.scss
View File

@ -7,7 +7,7 @@
right: 0 !important;
}
// This is used to flip the .d-caret-right
// This is used to flip the .d-icon-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-caret-right {
.rtl .d-icon-caret-right {
@include rotate(180);
}

2
app/assets/stylesheets/common/base/tagging.scss
View File

@ -225,7 +225,7 @@ header .discourse-tag {color: $tag-color }
}
.autocomplete {
.d-tag {
.d-icon-tag {
color: dark-light-choose($primary, $primary-low-mid);
padding-right: 5px;
}

3
app/assets/stylesheets/common/base/user.scss
View File

@ -10,7 +10,7 @@
}
.user-main {
.d-heart {
.d-icon-heart {
color: $love !important;
}
@ -538,3 +538,4 @@
}
}
}

2
app/assets/stylesheets/common/components/badges.scss
View File

@ -164,7 +164,7 @@
padding: 5px;
width: 13px;
.d-caret-right {
.d-icon-caret-right {
margin-left: 2px;
}
}

2
app/assets/stylesheets/desktop/discourse.scss
View File

@ -43,7 +43,7 @@ header {
}
}
.d-envelope {
.d-icon-envelope {
color: $danger;
}
}

2
app/assets/stylesheets/desktop/header.scss
View File

@ -6,7 +6,7 @@
left: 0;
padding-top: 3px;
height: 60px;
.d-home {
.d-icon-home {
padding:8px;
font-size: 2.1em;
}

8
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -34,10 +34,10 @@
// --------------------------------------------------
.topic-list-icons {
.d-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
.d-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
.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); }
a.title {color: $primary;}
.d-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
.d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
}
.topic-list {
@ -72,7 +72,7 @@
.star {
width: 20px;
padding-right: 0;
.d-star {
.d-icon-star {
position: relative;
}
+ .main-link {

10
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -249,7 +249,7 @@ nav.post-controls {
}
.post-date { color: dark-light-choose($primary-medium, $secondary-high); }
.d-arrow-up, .d-arrow-down { margin-left: 5px; }
.d-icon-arrow-up, .d-icon-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-times {
.d-icon-times {
color: dark-light-choose($primary-medium, $secondary-high);
}
}
@ -443,10 +443,10 @@ a.star {
}
.btn {
@include topic-footer-button;
.d-bookmark.bookmarked { color: $tertiary; }
.d-icon-bookmark.bookmarked { color: $tertiary; }
}
.bookmark.bookmarked .d-bookmark {
.bookmark.bookmarked .d-icon-bookmark {
color: $tertiary;
}
}
@ -519,7 +519,7 @@ video {
.topic-statuses {
i { color: $header_primary; }
.d-envelope { color: $danger; }
.d-icon-envelope { color: $danger; }
.unpinned { color: $header_primary; }
}

2
app/assets/stylesheets/mobile/directory.scss
View File

@ -40,7 +40,7 @@
margin-left: 0.2em;
color: blend-primary-secondary(50%);
}
.d-heart {
.d-icon-heart {
color: $love;
}
}

2
app/assets/stylesheets/mobile/discourse.scss
View File

@ -112,7 +112,7 @@ h2 {
display: block;
}
.d-caret-down {
.d-icon-caret-down {
position: absolute;
right: 0px;
}

2
app/assets/stylesheets/mobile/topic-list.scss
View File

@ -48,7 +48,7 @@
}
.nav-pills > li {
background: $primary-low;
.d-caret-down {
.d-icon-caret-down {
margin-left: 8px;
}
}

6
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -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-bookmark.bookmarked { color: $tertiary; }
.d-icon-bookmark.bookmarked { color: $tertiary; }
.combobox {
float: left;
@ -337,7 +337,7 @@ span.post-count {
.btn {
margin-bottom: 5px;
margin-right: 10px;
.d-star {margin-right: 5px;}
.d-icon-star {margin-right: 5px;}
}
}

6
app/assets/stylesheets/wizard.scss
View File

@ -227,11 +227,11 @@ body.wizard {
background-color: #ccc;
}
.d-chevron-right {
.d-icon-chevron-right {
margin-left: 0.25em;
font-size: 0.8em;
}
.d-chevron-left {
.d-icon-chevron-left {
margin-right: 0.25em;
font-size: 0.8em;
}
@ -290,7 +290,7 @@ body.wizard {
.wizard-btn.next {
min-width: 70px;
.d-chevron-right {
.d-icon-chevron-right {
margin-left: 0.25em;
font-size: 0.8em;
}