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

Merge pull request #2589 from awesomerobot/master 

reverting notification style
This commit is contained in:
Jeff Atwood 2014-07-25 20:43:14 -07:00
parent f625fa68cb 1557f07e87
commit f66c39c63b
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/common/base/discourse.scss
View File

@ -180,8 +180,7 @@ body {
} }
.unread-private-messages { .unread-private-messages {
border-color: $success; color: $secondary;
color: $success; background: $success;
background: $secondary; &.badge-notification[href] {color: $secondary;}
&.badge-notification[href] {color: $success;}
} }

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

@ -128,16 +128,14 @@
} }
.unread-notifications { .unread-notifications {
right: -4px; right: -4px;
background-color: $secondary; background-color: scale-color($tertiary, $lightness: 50%);
} }
.unread-private-messages { .unread-private-messages {
left: -4px; left: -4px;
} }
} }
.flagged-posts { .flagged-posts {
border-color: $danger; background: $danger;
color: $danger;
background: $secondary;
} }
} }
@ -233,7 +231,6 @@
padding: 3px; padding: 3px;
margin-top: -22px; margin-top: -22px;
margin-left: 60px; margin-left: 60px;
background: transparent;
} }
.heading { .heading {
padding: 5px 5px 5px 0; padding: 5px 5px 5px 0;

11
app/assets/stylesheets/common/components/badges.css.scss
View File

@ -62,22 +62,21 @@ h1 a.badge-category div {vertical-align: top;}
.badge-notification { .badge-notification {
@extend %badge; @extend %badge;
padding: 3px; padding: 3px;
color: $tertiary; color: $secondary;
border: 1px solid $tertiary;
font-size: 11px; font-size: 11px;
line-height: 1; line-height: 1;
min-width: 11px; min-width: 11px;
text-align: center; text-align: center;
background-color: transparent; background-color: scale-color($primary, $lightness: 70%);
&[href] { &[href] {
color: $tertiary; color: $secondary;
} }
// New posts // New posts
&.new-posts, &.unread-posts { &.new-posts, &.unread-posts {
background-color: transparent; background-color: scale-color($tertiary, $lightness: 50%);
color: $tertiary; color: $secondary;
font-weight: normal; font-weight: normal;
} }

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

@ -22,7 +22,7 @@
.icons { .icons {
.badge-notification { .badge-notification {
color: $tertiary; color: $secondary;
} }
.active .icon { .active .icon {

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

@ -41,7 +41,7 @@
position: relative; position: relative;
padding: 4px 4px 4px 3px; padding: 4px 4px 4px 3px;
top: -1px; top: -1px;
i {color: $tertiary;} i {color: $secondary;}
} }
.topic-item-stats { .topic-item-stats {