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 #2481 from awesomerobot/master 

making menu highlights consistent
This commit is contained in:
Jeff Atwood 2014-06-27 17:20:02 -07:00
parent a886261f75 51f85206ff
commit 4a5a428ff6
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@
font-size: 11px; font-size: 11px;
} }
&.selected { &.selected {
background-color: lighten($highlight, 23%); background-color: scale-color($tertiary, $lightness: 90%);
} }
@include hover { @include hover {
background-color: lighten($highlight, 23%); background-color: scale-color($highlight, $lightness: 60%);
text-decoration: none; text-decoration: none;
} }
} }

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

@ -165,7 +165,9 @@
} }
&:hover a:not(.badge-notification) {background: scale-color-diff();} &:hover a:not(.badge-notification) {
background-color: scale-color($highlight, $lightness: 60%);
}
button {margin-left: 5px;} button {margin-left: 5px;}
} }

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

@ -563,6 +563,10 @@ iframe {
margin: 5px 0 0 0; margin: 5px 0 0 0;
font-size: 1.8em; font-size: 1.8em;
line-height: 1.2em; line-height: 1.2em;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
a.star { a.star {
@ -586,10 +590,6 @@ iframe {
display: block; display: block;
} }
.dropdown-menu li {
margin: 5px 0;
}
.btn-group { .btn-group {
margin-top: 25px; margin-top: 25px;
position: relative; position: relative;
@ -818,7 +818,6 @@ blockquote { /* solo quotes */
display: none; display: none;
float: left; float: left;
width: 550px; width: 550px;
padding: 4px 0;
margin: 1px 0 0; margin: 1px 0 0;
list-style: none; list-style: none;
background-color: $secondary; background-color: $secondary;
@ -830,7 +829,7 @@ blockquote { /* solo quotes */
} }
.dropdown-menu a { .dropdown-menu a {
display: block; display: block;
padding: 3px 9px; padding: 9px;
clear: both; clear: both;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
@ -843,16 +842,17 @@ blockquote { /* solo quotes */
.dropdown-menu li > a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover {
color: $tertiary; color: $primary;
text-decoration: none; text-decoration: none;
background-color: scale-color($tertiary, $lightness: 90%); background-color: scale-color($highlight, $lightness: 60%);
} }
.dropdown-menu .disabled > a, .dropdown-menu .disabled > a,
.dropdown-menu .disabled > a:hover { .dropdown-menu .disabled > a:hover {
text-decoration: none; text-decoration: none;
color: $primary; color: $primary;
background-color: scale-color($highlight, $lightness: 25%); background-color: scale-color($tertiary, $lightness: 90%);
cursor: default; cursor: default;
} }