IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3685 from riking/dark-theme-fix

Browse Source 
Dark theme fix, part 6
This commit is contained in:
Jeff Atwood 2015-08-21 11:43:37 -07:00
commit 5a14dcc991
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,12 @@ body img.emoji {
margin-top: -100px; margin-top: -100px;
left: 50%; left: 50%;
top: 50%; top: 50%;
background-color: #dadada; background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
} }
.emoji-page td { .emoji-page td {
border: 1px solid transparent; border: 1px solid transparent;
background-color: white; background-color: dark-light-choose(white, $secondary);
} }
.emoji-page a { .emoji-page a {
@ -30,13 +30,13 @@ body img.emoji {
} }
.emoji-page a:hover { .emoji-page a:hover {
background-color: rgb(210, 236, 252); background-color: dark-light-choose(rgb(210, 236, 252), rgb(45, 19, 3));
} }
.emoji-table-wrapper { .emoji-table-wrapper {
min-width: 442px; min-width: 442px;
min-height: 185px; min-height: 185px;
background-color: white; background-color: $secondary;
} }
.emoji-modal-wrapper { .emoji-modal-wrapper {
@ -46,7 +46,7 @@ body img.emoji {
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.8; opacity: dark-light-choose(0.8, 0.5);
background-color: black; background-color: black;
} }
@ -61,11 +61,11 @@ body img.emoji {
.emoji-modal .toolbar li a { .emoji-modal .toolbar li a {
padding: 8px; padding: 8px;
background-color: #dadada; background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
} }
.emoji-modal .toolbar li a.selected { .emoji-modal .toolbar li a.selected {
background-color: #fff; background-color: $secondary;
} }
.emoji-modal .info { .emoji-modal .info {
@ -78,6 +78,7 @@ body img.emoji {
.emoji-modal .info span { .emoji-modal .info span {
margin-left: 5px; margin-left: 5px;
font-weight: bold; font-weight: bold;
color: $primary;
} }
.emoji-modal .info { .emoji-modal .info {
@ -89,10 +90,10 @@ body img.emoji {
} }
.emoji-modal .nav span { .emoji-modal .nav span {
color: #aaa; color: dark-light-choose(#aaa, #555);
margin-right: 10px; margin-right: 10px;
} }
.emoji-modal .nav a { .emoji-modal .nav a {
color: #333; color: dark-light-choose(#333, #ccc);
} }

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

@ -133,6 +133,8 @@
.wmd-prompt-dialog > form > input[type="button"] { .wmd-prompt-dialog > form > input[type="button"] {
border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
background: dark-light-choose(initial, blend-primary-secondary(50%));
color: dark-light-choose(inherit, $secondary);
font-family: trebuchet MS, helvetica, sans-serif; font-family: trebuchet MS, helvetica, sans-serif;
font-size: 0.8em; font-size: 0.8em;
font-weight: bold; font-weight: bold;

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

@ -276,7 +276,7 @@ table.md-table {
font-size: 35px; font-size: 35px;
width: 45px; width: 45px;
text-align: center; text-align: center;
color: dark-light-diff($primary, $secondary, 75%, 20%); color: dark-light-diff($primary, $secondary, 75%, -20%);
} }
} }
@ -286,7 +286,7 @@ table.md-table {
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
font-size: 0.9em; font-size: 0.9em;
color: dark-light-diff($primary, $secondary, 50%, 0%); color: dark-light-diff($primary, $secondary, 50%, -30%);
.custom-message { .custom-message {
text-transform: none; text-transform: none;

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

@ -236,16 +236,16 @@
font-size: 11px; font-size: 11px;
line-height: 1; line-height: 1;
text-align: center; text-align: center;
background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 70%));
&[href] { &[href] {
color: $secondary; color: $secondary;
} }
// New posts // New posts
&.new-posts, &.unread-posts { &.new-posts, &.unread-posts {
background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), scale-color($tertiary, $lightness: 20%)); background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), $tertiary);
color: $secondary; color: dark-light-choose($secondary, $secondary);
font-weight: dark-light-choose(normal, bold); font-weight: dark-light-choose(normal, bold);
} }

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

@ -77,13 +77,11 @@ body {
.grippie { .grippie {
width: 100%; width: 100%;
border: 1px solid;
border-right-width: 0;
border-left-width: 0;
cursor: row-resize; cursor: row-resize;
height: 11px; height: 11px;
overflow: hidden; overflow: hidden;
display:block; display:block;
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
background: image-url("grippie.png") dark-light-diff($primary, $secondary, 90%, -60%) no-repeat center 3px; background: image-url("grippie.png") dark-light-diff($primary, $secondary, 90%, -60%) no-repeat center 3px;
} }
} }

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

@ -484,7 +484,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.edit-reason { .edit-reason {
background-color: scale-color($highlight, $lightness: 25%); background-color: dark-light-choose(scale-color($highlight, $lightness: 25%), scale-color($highlight, $lightness: -50%));
padding: 3px 5px 5px 5px; padding: 3px 5px 5px 5px;
} }
.remove-bookmark { .remove-bookmark {