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

dark themes now carry over to admin without looking absolutely terrible
This commit is contained in:
Sam 2014-09-08 13:03:38 +10:00
parent 2a7355405e 9eed47f7c5
commit 5c2b56508c
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ td.flaggers td {
.admin-loading { .admin-loading {
width: 100px; width: 100px;
margin: 0 auto 30px auto; margin: 0 auto 30px auto;
background-color: $primary; background-color: #000;
@include border-radius-all(10px); @include border-radius-all(10px);
padding: 10px 10px 10px 30px; padding: 10px 10px 10px 30px;
font-size: 15px; font-size: 15px;
@ -108,7 +108,7 @@ td.flaggers td {
} }
.admin-controls { .admin-controls {
background-color: dark-light-diff($primary, $secondary, 90%, -20%); background-color: dark-light-diff($primary, $secondary, 90%, -75%);
padding: 10px 10px 3px 0; padding: 10px 10px 3px 0;
height: 35px; height: 35px;
.nav.nav-pills { .nav.nav-pills {
@ -272,7 +272,7 @@ td.flaggers td {
.setting.overridden { .setting.overridden {
input[type=text] { input[type=text] {
background-color: dark-light-diff($highlight, $secondary, 50%, -10%); background-color: dark-light-diff($highlight, $secondary, 50%, -60%);
} }
@ -685,7 +685,7 @@ table.api-keys {
th { th {
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
background-color: scale-color-diff(); background: dark-light-diff($primary, $secondary, 80%, -65%);
} }
th.title { th.title {
text-align: left; text-align: left;
@ -694,9 +694,6 @@ table.api-keys {
tr:hover > td { tr:hover > td {
background-color: $secondary; background-color: $secondary;
} }
tr:hover > th {
background-color: scale-color($primary, $lightness: 75%);
}
} }
td.value { td.value {
@ -729,11 +726,9 @@ table.api-keys {
} }
&.detected-problems { &.detected-problems {
@include border-radius-all(5px); background: dark-light-diff($primary, $secondary, 90%, -75%);
background-color: scale-color-diff();
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 10px; margin-top: 10px;
box-shadow: inset 0 0 10px rgba(0,0,0, .1);
.look-here { .look-here {
float: left; float: left;
@ -748,7 +743,8 @@ table.api-keys {
.problem-messages { .problem-messages {
float: left; float: left;
width: 75%; width: 80%;
margin-left: 1%;
a { a {
text-decoration: underline; text-decoration: underline;
} }
@ -756,10 +752,14 @@ table.api-keys {
text-align: right; text-align: right;
} }
.btn { .btn {
background-color: lighten($primary, 60%); background: dark-light-diff($primary, $secondary, 80%, -85%);
} }
ul { ul {
margin-left: 0; margin-left: 0;
padding-left: 20px;
li {
margin-bottom: 10px;
}
} }
} }
} }
@ -820,7 +820,7 @@ table.api-keys {
color: $primary; color: $primary;
font-weight: bold; font-weight: bold;
height: 30px; height: 30px;
background-color: scale-color($primary, $lightness: 75%); background: dark-light-diff($primary, $secondary, 80%, -75%);
cursor: pointer; cursor: pointer;
h1 { h1 {
@ -884,7 +884,7 @@ table.api-keys {
width: 6px; width: 6px;
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: scale-color($primary, $lightness: 75%); background: dark-light-diff($primary, $secondary, 90%, -75%);
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
@ -895,7 +895,7 @@ table.api-keys {
.content-list { .content-list {
h3 { h3 {
color: dark-light-diff($primary, $secondary, 90%, -60%); color: dark-light-diff($primary, $secondary, 50%, -60%);
font-size: 15px; font-size: 15px;
padding-left: 5px; padding-left: 5px;
margin-bottom: 10px; margin-bottom: 10px;
@ -1310,4 +1310,4 @@ tr.not-activated {
.username .value, .email .value a, .email .value a:visited { .username .value, .email .value a, .email .value a:visited {
color: #bbb; color: #bbb;
} }
} }

4
app/assets/stylesheets/common/components/navs.css.scss
View File

@ -50,9 +50,9 @@
@extend %nav; @extend %nav;
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
background-color: scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -75%);
> li { > li {
border-bottom: 1px solid dark-light-diff($primary, $secondary, 80%, -30%); border-bottom: 1px solid dark-light-diff($primary, $secondary, 80%, -60%);
&:last-of-type { &:last-of-type {
border-bottom: 0; border-bottom: 0;
} }