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

FIX: Dark theme fixes for admin, quotes, code

This commit is contained in:
Kane York 2015-08-18 12:23:06 -07:00
parent 3edf0e662f
commit a4da72a83b
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,16 +129,16 @@ td.flaggers td {
}
.admin-controls {
background-color: dark-light-diff($primary, $secondary, 90%, -75%);
background-color: dark-light-diff($primary, $secondary, 90%, -65%);
padding: 10px 10px 3px 0;
@include clearfix;
.nav.nav-pills {
li.active {
a {
border-color: dark-light-diff($primary, $secondary, 90%, -60%);
background-color: lighten($primary, 40%);
border-color: dark-light-diff($primary, $secondary, 90%, -90%);
background-color: dark-light-diff($primary, $secondary, 40%, -10%);
&:hover {
background-color: lighten($primary, 40%);
background-color: dark-light-diff($primary, $secondary, 40%, -10%);
}
}
}
@ -1113,7 +1113,7 @@ table.api-keys {
.content-list {
h3 {
color: dark-light-diff($primary, $secondary, 50%, -60%);
color: dark-light-diff($primary, $secondary, 50%, -20%);
font-size: 1.071em;
padding-left: 5px;
margin-bottom: 10px;

14
app/assets/stylesheets/common/base/code_highlighting.scss
View File

@ -7,7 +7,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
.hljs {
display: block;
padding: 0.5em;
color: #333;
color: dark-light-choose(#333, #f8f8f8);
}
.hljs-comment,
@ -26,7 +26,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
.hljs-subst,
.hljs-request,
.hljs-status {
color: #333;
color: dark-light-choose(#333, #f8f8f8);
font-weight: bold;
}
@ -40,7 +40,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
.hljs-tag .hljs-value,
.hljs-phpdoc,
.tex .hljs-formula {
color: #d14;
color: dark-light-choose(#d14, #f66);
}
.hljs-title,
@ -70,14 +70,14 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
.hljs-tag .hljs-title,
.hljs-rules .hljs-property,
.django .hljs-tag .hljs-keyword {
color: #000080;
color: dark-light-choose(#000080, #99f);
font-weight: normal;
}
.hljs-attribute,
.hljs-variable,
.lisp .hljs-body {
color: #008080;
color: dark-light-choose(#008080, #0ee);
}
.hljs-regexp {
@ -132,8 +132,8 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
*/
p > code, li > code, pre > code {
color: #333;
background: #f8f8f8;
color: dark-light-choose(#333, #f8f8f8);
background: dark-light-choose(#f8f8f8, #333);
}
// removed some unnecessary styles here

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

@ -32,8 +32,8 @@ small {
blockquote {
background-color: dark-light-diff($primary, $secondary, 97%, -45%);
border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%);
background-color: dark-light-diff($primary, $secondary, 97%, -65%);
overflow: hidden;
clear: both;
}

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

@ -50,8 +50,8 @@ aside.quote {
.badge-wrapper { margin-left: 5px; }
.title {
border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%);
background-color: dark-light-diff($primary, $secondary, 97%, -45%);
border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%);
background-color: dark-light-diff($primary, $secondary, 97%, -65%);
color: scale-color($primary, $lightness: 30%);
// IE will screw up the blockquote underneath if bottom padding is 0px
padding: 12px 12px 1px 12px;
@ -113,8 +113,8 @@ aside.quote {
.quote-button {
display: none;
position: absolute;
background-color: scale-color($primary, $lightness: 50%);
color: $secondary;
background-color: dark-light-diff($primary, $secondary, 50%, -50%);
color: dark-light-choose($secondary, $primary);
padding: 10px;
z-index: 401;
@ -124,7 +124,7 @@ aside.quote {
}
&:hover {
background-color: scale-color($primary, $lightness: 40%);
background-color: dark-light-diff($primary, $secondary, 40%, -40%);
cursor: pointer;
}
}

7
app/assets/stylesheets/common/components/buttons.css.scss
View File

@ -73,17 +73,16 @@
.btn-primary {
border: none;
color: $secondary;
font-weight: normal;
color: #fff;
background: $tertiary;
color: dark-light-choose($primary, scale-color($primary, $lightness: 60%));
background: dark-light-choose($tertiary, $tertiary);
&[href] {
color: $secondary;
}
&:hover {
color: #fff;
background: scale-color($tertiary, $lightness: -20%);
background: dark-light-choose(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -20%));
}
&:active {
@include linear-gradient(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -10%));

7
app/assets/stylesheets/common/foundation/variables.scss
View File

@ -42,3 +42,10 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
@return scale-color($adjusted-color, $lightness: $darkness);
}
}
@function dark-light-choose($light-theme-result, $dark-theme-result) {
@if brightness($primary) < brightness($secondary) {
@return $light-theme-result;
} @else {
@return $dark-theme-result;
}
}