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

adding hover state to notification menu, and small additional fixes
This commit is contained in:
Jeff Atwood 2014-08-12 21:21:10 -07:00
parent 1baa55fe45 6166e78888
commit 430b32ad61
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,7 @@ td.flaggers td {
.setting.overridden { .setting.overridden {
input[type=text] { input[type=text] {
background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -10%); background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
} }

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

@ -184,7 +184,7 @@
} }
&:hover a:not(.badge-notification) { &:hover a:not(.badge-notification) {
background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -70%); background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
} }
button {margin-left: 5px;} button {margin-left: 5px;}
@ -205,15 +205,14 @@
.icon { color: scale-color($primary, $lightness: 30%); } .icon { color: scale-color($primary, $lightness: 30%); }
li { li {
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
padding: 4px 0 3px 2px;
i { i {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
padding-top: 2px; padding-top: 2px;
} }
span { color: $primary; } span { color: $primary; }
&:hover a { background: transparent; } &:hover a { background-color: dark-light-diff($highlight, $secondary, 50%, -70%); }
a { padding: 1px; } a { padding: 4px 0 3px 2px; }
p { p {
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;

6
app/assets/stylesheets/common/base/upload.scss
View File

@ -9,3 +9,9 @@
1px -1px 0 scale-color($tertiary, $lightness: -10%), 1px -1px 0 scale-color($tertiary, $lightness: -10%),
-1px 1px 0 scale-color($tertiary, $lightness: -10%); -1px 1px 0 scale-color($tertiary, $lightness: -10%);
} }
.uploaded-image-preview {
background-position: center center;
background-size: cover;
background-color: $primary;
}

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

@ -610,7 +610,7 @@ text-overflow: ellipsis;
.moderator { .moderator {
.topic-body { .topic-body {
background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -80%); background-color: dark-light-diff($highlight, $secondary, 50%, -80%);
} }
} }
@ -861,7 +861,7 @@ $topic-avatar-width: 45px;
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover {
color: $primary; color: $primary;
text-decoration: none; text-decoration: none;
background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -70%); background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
} }

3
app/assets/stylesheets/desktop/upload.scss
View File

@ -32,9 +32,6 @@
.uploaded-image-preview { .uploaded-image-preview {
height: 270px; height: 270px;
background-position: center center;
background-size: cover;
background-color: $primary;
} }
.image-upload-controls { .image-upload-controls {

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

@ -303,7 +303,7 @@
color: $primary; color: $primary;
} }
.item.moderator-action { .item.moderator-action {
background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -10%); background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
} }
.item.deleted { .item.deleted {
opacity: 0.8; opacity: 0.8;

3
app/assets/stylesheets/mobile/upload.scss
View File

@ -13,7 +13,4 @@
.uploaded-image-preview { .uploaded-image-preview {
height: 150px; height: 150px;
background-position: center center;
background-size: cover;
background-color: $primary;
} }