github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 23:06:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3551 from awesomerobot/master

Browse Source 
replacing the remnants of the old color variable code
This commit is contained in:
Jeff Atwood 2015-06-14 22:11:29 -07:00
commit b4c568b301
35 changed files with 109 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -484,6 +484,3 @@ DEPENDENCIES
uglifier uglifier
unf unf
unicorn unicorn
BUNDLED WITH
1.10.3

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

@ -7,8 +7,8 @@
width: 100%; width: 100%;
tr {text-align: left;} tr {text-align: left;}
td, th {padding: 8px;} td, th {padding: 8px;}
th {border-top: 1px solid scale-color-diff();} th {border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);}
td {border-bottom: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();} td {border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);}
tr:hover { background-color: darken($secondary, 2.5%); } tr:hover { background-color: darken($secondary, 2.5%); }
tr.selected { background-color: lighten($primary, 80%); } tr.selected { background-color: lighten($primary, 80%); }
.filters input { margin-bottom: 0; } .filters input { margin-bottom: 0; }
@ -23,7 +23,7 @@ td.flaggers td {
font-size: 0.857em; font-size: 0.857em;
float: right; float: right;
margin-right: 10px; margin-right: 10px;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 2px 5px; padding: 2px 5px;
border-radius: 5px; border-radius: 5px;
color: $primary; color: $primary;
@ -107,7 +107,7 @@ td.flaggers td {
.nav.nav-pills { .nav.nav-pills {
li.active { li.active {
a { a {
border-color: scale-color-diff(); border-color: dark-light-diff($primary, $secondary, 90%, -60%);
background-color: lighten($primary, 40%); background-color: lighten($primary, 40%);
&:hover { &:hover {
background-color: lighten($primary, 40%); background-color: lighten($primary, 40%);
@ -198,7 +198,7 @@ td.flaggers td {
width: 76.5765%; width: 76.5765%;
min-height: 800px; min-height: 800px;
margin-left: 0; margin-left: 0;
border-left: solid 1px scale-color-diff(); border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
padding: 30px 0 30px 30px; padding: 30px 0 30px 30px;
} }
@ -233,7 +233,7 @@ td.flaggers td {
width: 408px; width: 408px;
padding: 1px; padding: 1px;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(51, 51, 51, 0.3); box-shadow: inset 0 1px 1px rgba(51, 51, 51, 0.3);
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
@ -301,7 +301,7 @@ section.details {
color: $primary; color: $primary;
padding: 5px 10px; padding: 5px 10px;
margin: 30px 0 5px 0; margin: 30px 0 5px 0;
border-bottom: 5px solid scale-color-diff(); border-bottom: 5px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
@ -333,7 +333,7 @@ section.details {
&.highlight-danger { &.highlight-danger {
background-color: scale-color($danger, $lightness: 50%); background-color: scale-color($danger, $lightness: 50%);
} }
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
&:before, &:after { &:before, &:after {
display: table; display: table;
content: ""; content: "";
@ -436,14 +436,14 @@ section.details {
font-size: 1em; font-size: 1em;
line-height: 16px; line-height: 16px;
padding: 4px; padding: 4px;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
.badge-query-plan { .badge-query-plan {
font-size: 0.857em; font-size: 0.857em;
line-height: 13px; line-height: 13px;
padding: 4px; padding: 4px;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
.count-warning { .count-warning {
@ -892,7 +892,7 @@ table.api-keys {
.commits-widget { .commits-widget {
border: solid 1px scale-color-diff(); border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
height: 180px; height: 180px;
margin-bottom: 36px; margin-bottom: 36px;
@ -938,7 +938,7 @@ table.api-keys {
@extend .clearfix; @extend .clearfix;
line-height: 1.0em; line-height: 1.0em;
padding: 6px 8px; padding: 6px 8px;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
.left { .left {
float: left; float: left;
} }
@ -948,7 +948,7 @@ table.api-keys {
img { img {
margin-top: 2px; margin-top: 2px;
border: solid 1px scale-color-diff(); border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
padding: 2px; padding: 2px;
background-color: $secondary; background-color: $secondary;
} }
@ -983,7 +983,7 @@ table.api-keys {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
border-left: solid 1px scale-color-diff(); border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
@ -1001,10 +1001,10 @@ table.api-keys {
margin: 0; margin: 0;
li:first-of-type { li:first-of-type {
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
li { li {
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
li a { li a {
@ -1013,7 +1013,7 @@ table.api-keys {
color: $primary; color: $primary;
&:hover { &:hover {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
color: $primary; color: $primary;
} }
@ -1174,7 +1174,7 @@ table.api-keys {
color: $primary; color: $primary;
&:hover { &:hover {
color: $primary; color: $primary;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
@ -1208,7 +1208,7 @@ table.api-keys {
.heading-container { .heading-container {
width: 100%; width: 100%;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
.col.heading { .col.heading {
font-weight: bold; font-weight: bold;
@ -1224,7 +1224,7 @@ table.api-keys {
.ember-list-item-view { .ember-list-item-view {
width: 100%; width: 100%;
border-top: solid 1px scale-color-diff(); border-top: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
@ -1414,7 +1414,7 @@ tr.not-activated {
.user-field { .user-field {
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.form-display { .form-display {
width: 25%; width: 25%;

4
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -195,7 +195,7 @@ ol.category-breadcrumb {
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
position: absolute; position: absolute;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
background-color: $secondary; background-color: $secondary;
z-index: 100; z-index: 100;
@ -244,7 +244,7 @@ ol.category-breadcrumb {
@include unselectable; @include unselectable;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;
position: absolute; position: absolute;

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

@ -18,7 +18,7 @@
max-width: 300px; max-width: 300px;
.colorpicker { .colorpicker {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
margin-right: 2px; margin-right: 2px;
width: 16px; width: 16px;
height: 16px; height: 16px;

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

@ -28,7 +28,7 @@
.select2-container { .select2-container {
border-radius: 3px; border-radius: 3px;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
&.select2-dropdown-open { &.select2-dropdown-open {
border: 0; border: 0;
} }

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

@ -3,13 +3,13 @@
position: absolute; position: absolute;
width: 240px; width: 240px;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
ul { ul {
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
li { li {
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
a[href] { a[href] {
padding: 5px; padding: 5px;
display: block; display: block;
@ -50,7 +50,7 @@ div.ac-wrap.disabled {
div.ac-wrap { div.ac-wrap {
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px 4px 1px 4px; padding: 5px 4px 1px 4px;
div.item { div.item {
float: left; float: left;
@ -69,7 +69,7 @@ div.ac-wrap {
border-radius: 12px; border-radius: 12px;
width: 10px; width: 10px;
display: inline-block; display: inline-block;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
&:hover { &:hover {
background-color: scale-color($danger, $lightness: 75%); background-color: scale-color($danger, $lightness: 75%);
border: 1px solid scale-color($danger, $lightness: 30%); border: 1px solid scale-color($danger, $lightness: 30%);

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

@ -22,7 +22,7 @@
td, th { td, th {
padding: 0.5em; padding: 0.5em;
text-align: left; text-align: left;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.number, .time-read { .number, .time-read {
font-size: 1.4em; font-size: 1.4em;
@ -54,7 +54,7 @@
} }
&:hover { &:hover {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
} }

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

@ -149,10 +149,10 @@ body {
width: 540px; width: 540px;
background-color: $secondary; background-color: $secondary;
padding: 0 10px 13px 10px; padding: 0 10px 13px 10px;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.preview { .preview {
margin-top: 8px; margin-top: 8px;
border: 1px dashed scale-color-diff(); border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
padding: 8px 8px 0 8px; padding: 8px 8px 0 8px;
p { p {
margin: 0 0 10px 0; margin: 0 0 10px 0;

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

@ -72,14 +72,14 @@
&:hover { &:hover {
color: $primary; color: $primary;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-left: 1px solid transparent; border-left: 1px solid transparent;
border-right: 1px solid transparent; border-right: 1px solid transparent;
} }
&:active { &:active {
color: $primary; color: $primary;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
.active .icon { .active .icon {
@ -87,9 +87,9 @@
color: #7b7b7b; color: #7b7b7b;
background-color: $secondary; background-color: $secondary;
cursor: default; cursor: default;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-left: 1px solid scale-color-diff(); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-right: 1px solid scale-color-diff(); border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
&:after { &:after {
display: block; display: block;
position: absolute; position: absolute;
@ -143,7 +143,7 @@
right: 0; right: 0;
z-index: 1100; z-index: 1100;
overflow: auto; overflow: auto;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
box-shadow: 0 2px 2px rgba(0,0,0, .4); box-shadow: 0 2px 2px rgba(0,0,0, .4);

10
app/assets/stylesheets/common/base/modal.scss
View File

@ -64,8 +64,8 @@
max-width: 710px; max-width: 710px;
margin: 0 auto; margin: 0 auto;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
box-shadow: 0 3px 7px rgba(0,0,0, .8); box-shadow: 0 3px 7px rgba(0,0,0, .8);
background-clip: padding-box; background-clip: padding-box;
@ -91,7 +91,7 @@
} }
.modal-footer { .modal-footer {
padding: 14px 15px 15px; padding: 14px 15px 15px;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
.modal-footer:before, .modal-footer:before,
.modal-footer:after { .modal-footer:after {
@ -109,7 +109,7 @@
li > a { li > a {
font-size: 1em; font-size: 1em;
} }
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
@ -168,7 +168,7 @@
font-weight: normal; font-weight: normal;
} }
&.btn-reply-here { &.btn-reply-here {
background: scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -60%);
text-shadow: none; text-shadow: none;
color: $primary; color: $primary;
} }

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

@ -27,7 +27,7 @@
height: 20px; height: 20px;
margin-right: 8px; margin-right: 8px;
margin-left: 5px; margin-left: 5px;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
display: inline-block; display: inline-block;
float: left; float: left;
} }
@ -63,7 +63,7 @@
} }
.wmd-button:hover { .wmd-button:hover {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
@ -130,8 +130,8 @@
} }
.wmd-prompt-dialog { .wmd-prompt-dialog {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
.wmd-prompt-dialog > div { .wmd-prompt-dialog > div {
@ -140,12 +140,12 @@
} }
.wmd-prompt-dialog > form > input[type="text"] { .wmd-prompt-dialog > form > input[type="text"] {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
color: $primary; color: $primary;
} }
.wmd-prompt-dialog > form > input[type="button"] { .wmd-prompt-dialog > form > input[type="button"] {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
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;

2
app/assets/stylesheets/common/base/topic-admin-menu.scss
View File

@ -12,7 +12,7 @@
background-color: $secondary; background-color: $secondary;
width: 205px; width: 205px;
padding: 10px; padding: 10px;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
z-index: 1001; z-index: 1001;
ul { ul {

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

@ -172,7 +172,7 @@ pre {
kbd kbd
{ {
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 0 rgba(0,0,0, .8); box-shadow: 0 1px 0 rgba(0,0,0, .8);
color: $primary; color: $primary;

4
app/assets/stylesheets/common/base/user-badges.scss
View File

@ -67,7 +67,7 @@
/* Badge listing in /badges. */ /* Badge listing in /badges. */
table.badges-listing { table.badges-listing {
margin: 20px 0; margin: 20px 0;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
width: 90%; width: 90%;
.user-badge { .user-badge {
@ -112,7 +112,7 @@ table.badges-listing {
} }
tr { tr {
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }

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

@ -55,7 +55,7 @@
color: #fff; color: #fff;
} }
&[disabled] { &[disabled] {
background: scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -60%);
&:hover { color: scale-color($primary, $lightness: 70%); } &:hover { color: scale-color($primary, $lightness: 70%); }
cursor: not-allowed; cursor: not-allowed;
} }

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

@ -41,7 +41,7 @@ hr {
height: 1px; height: 1px;
margin: 1em 0; margin: 1em 0;
border: 0; border: 0;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 0; padding: 0;
} }

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

@ -42,12 +42,3 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
@return scale-color($adjusted-color, $lightness: $darkness); @return scale-color($adjusted-color, $lightness: $darkness);
} }
} }
// phasing out scale-color-diff for dark-light-diff
@function scale-color-diff() {
@if lightness($primary) < lightness($secondary) {
@return scale-color($primary, $lightness: 90%);
} @else {
@return scale-color($primary, $lightness: -60%);
}
}

2
app/assets/stylesheets/common/topic-entrance.scss
View File

@ -1,6 +1,6 @@
#topic-entrance { #topic-entrance {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;
box-shadow: 0 0px 2px rgba(0,0,0, .2); box-shadow: 0 0px 2px rgba(0,0,0, .2);

16
app/assets/stylesheets/desktop/compose.scss
View File

@ -103,7 +103,7 @@
width: 100%; width: 100%;
z-index: 1039; z-index: 1039;
height: 0; height: 0;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
bottom: 0; bottom: 0;
font-size: 1em; font-size: 1em;
position: fixed; position: fixed;
@ -147,7 +147,7 @@
&.draft { &.draft {
height: 40px !important; height: 40px !important;
cursor: pointer; cursor: pointer;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.draft-text { .draft-text {
display: block; display: block;
} }
@ -160,7 +160,7 @@
} }
&.saving { &.saving {
height: 40px !important; height: 40px !important;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.saving-text { .saving-text {
display: block; display: block;
} }
@ -255,18 +255,18 @@
margin-right: 10px; margin-right: 10px;
float: left; float: left;
&:disabled { &:disabled {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
#wmd-input:disabled { #wmd-input:disabled {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
#wmd-input, #wmd-preview { #wmd-input, #wmd-preview {
color: $primary; color: $primary;
} }
#wmd-preview { #wmd-preview {
border: 1px dashed scale-color-diff(); border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
overflow: auto; overflow: auto;
visibility: visible; visibility: visible;
cursor: default; cursor: default;
@ -303,7 +303,7 @@
.show-admin-options { .show-admin-options {
vertical-align: top; vertical-align: top;
margin-top: 8px; margin-top: 8px;
background: scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -60%);
&:hover { &:hover {
color: $secondary; color: $secondary;
background: $primary; background: $primary;
@ -405,7 +405,7 @@
#wmd-button-bar { #wmd-button-bar {
top: 0; top: 0;
position: absolute; position: absolute;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
background-color: $secondary; background-color: $secondary;
z-index: 100; z-index: 100;
} }

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

@ -77,14 +77,14 @@ body {
.grippie { .grippie {
width: 100%; width: 100%;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-width: 1px 0; border-width: 1px 0;
cursor: row-resize; cursor: row-resize;
height: 11px; height: 11px;
overflow: hidden; overflow: hidden;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
display:block; display:block;
background: image-url("grippie.png") scale-color-diff() no-repeat center 3px; background: image-url("grippie.png") dark-light-diff($primary, $secondary, 90%, -60%) no-repeat center 3px;
} }
} }
@ -194,7 +194,7 @@ body {
width: 210px; width: 210px;
height: auto; height: auto;
background-color:$secondary; background-color:$secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(0,0,0, .3); box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
@ -202,7 +202,7 @@ body {
input { input {
&[type="text"], &[type="password"], &[type="datetime"], &[type="datetime-local"], &[type="date"], &[type="month"], &[type="time"], &[type="week"], &[type="number"], &[type="email"], &[type="url"], &[type="search"], &[type="tel"], &[type="color"] { &[type="text"], &[type="password"], &[type="datetime"], &[type="datetime-local"], &[type="date"], &[type="month"], &[type="time"], &[type="week"], &[type="number"], &[type="email"], &[type="url"], &[type="search"], &[type="tel"], &[type="color"] {
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(0,0,0, .3); box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
@ -238,7 +238,7 @@ body {
select { select {
width: 220px; width: 220px;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
&[multiple], &[size] { &[multiple], &[size] {
height: auto; height: auto;
} }
@ -288,8 +288,8 @@ body {
} }
input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] { input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
cursor: not-allowed; cursor: not-allowed;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
border-color: scale-color-diff(); border-color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
input { input {
&[type="radio"][disabled], &[type="checkbox"][disabled], &[type="radio"][readonly], &[type="checkbox"][readonly] { &[type="radio"][disabled], &[type="checkbox"][disabled], &[type="radio"][readonly], &[type="checkbox"][readonly] {
@ -388,7 +388,7 @@ body {
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
.input-prepend .add-on, .input-append .add-on, .input-prepend .btn, .input-append .btn { .input-prepend .add-on, .input-append .add-on, .input-prepend .btn, .input-append .btn {
margin-left: -1px; margin-left: -1px;

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

@ -35,7 +35,7 @@ and (max-width : 570px) {
// Common // Common
.heading { .heading {
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
// Categories // Categories

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

@ -21,7 +21,7 @@
#revision-details { #revision-details {
padding: 5px; padding: 5px;
margin-top: 10px; margin-top: 10px;
border-bottom: 3px solid scale-color-diff(); border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
#revisions { #revisions {
word-wrap: break-word; word-wrap: break-word;

6
app/assets/stylesheets/desktop/modal.scss
View File

@ -16,8 +16,8 @@
height: auto; height: auto;
margin: -250px 0 0 -305px; margin: -250px 0 0 -305px;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
box-shadow: 0 3px 7px rgba(0,0,0, .8); box-shadow: 0 3px 7px rgba(0,0,0, .8);
background-clip: padding-box; background-clip: padding-box;
@ -54,7 +54,7 @@
} }
.modal-header { .modal-header {
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
h3 { h3 {
font-size: 1.429em; font-size: 1.429em;
padding: 10px 15px 7px; padding: 10px 15px 7px;

2
app/assets/stylesheets/desktop/queued-posts.scss
View File

@ -31,7 +31,7 @@
} }
} }
.post-title { .post-title {
color: darken(scale-color-diff(), 50%); color: darken(dark-light-diff($primary, $secondary, 90%, -60%), 50%);
font-weight: bold; font-weight: bold;
.badge-wrapper { .badge-wrapper {

2
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -63,7 +63,7 @@
padding: 0; padding: 0;
background: transparent; background: transparent;
&:hover { &:hover {
color: scale-color-diff(); color: dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }

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

@ -140,7 +140,7 @@ nav.post-controls {
transition: all linear 0.15s; transition: all linear 0.15s;
&:hover { &:hover {
background: scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -60%);
color: $primary; color: $primary;
} }
@ -194,7 +194,7 @@ nav.post-controls {
background-color: $secondary; background-color: $secondary;
width: 205px; width: 205px;
padding: 10px; padding: 10px;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
position: absolute; position: absolute;
text-align: left; text-align: left;
bottom: -2px; bottom: -2px;
@ -562,7 +562,7 @@ video {
a.mention { a.mention {
padding: 2px 4px; padding: 2px 4px;
color: $primary; color: $primary;
background: scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -60%);
} }
@ -709,7 +709,7 @@ $topic-avatar-width: 45px;
} }
.gap { .gap {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px 0; padding: 5px 0;
color: lighten($primary, 30%); color: lighten($primary, 30%);
cursor: pointer; cursor: pointer;
@ -747,7 +747,7 @@ $topic-avatar-width: 45px;
margin: 1px 0 0; margin: 1px 0 0;
list-style: none; list-style: none;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
box-shadow: 0 1px 5px rgba(0,0,0, .4); box-shadow: 0 1px 5px rgba(0,0,0, .4);
background-clip: padding-box; background-clip: padding-box;
span {font-size: 0.857em;} span {font-size: 0.857em;}

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

@ -120,7 +120,7 @@ a:hover.reply-new {
} }
#topic-progress-expanded { #topic-progress-expanded {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;
@include box-shadow(0 0px 2px rgba(0,0,0, .2)); @include box-shadow(0 0px 2px rgba(0,0,0, .2));

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

@ -145,7 +145,7 @@
.user-content { .user-content {
padding: 10px 8px; padding: 10px 8px;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
margin-bottom: 10px; margin-bottom: 10px;
box-sizing: border-box; box-sizing: border-box;
@ -163,13 +163,13 @@
th { th {
text-align: left; text-align: left;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
} }
td { td {
padding: 5px; padding: 5px;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
@ -422,7 +422,7 @@
.item { .item {
padding: 20px 8px 15px 8px; padding: 20px 8px 15px 8px;
background-color: $secondary; background-color: $secondary;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
.type { .type {
color: $primary; color: $primary;

8
app/assets/stylesheets/embed.css.scss
View File

@ -13,8 +13,8 @@ article.post {
} }
.quote .title { .quote .title {
border-left: 5px solid darken(scale-color-diff(), 10%); border-left: 5px solid darken(dark-light-diff($primary, $secondary, 90%, -60%), 10%);
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 10px 10px 0 12px; padding: 10px 10px 0 12px;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
} }
@ -26,8 +26,8 @@ article.post {
blockquote { blockquote {
padding: 10px 8px 10px 13px; padding: 10px 8px 10px 13px;
margin: 0 0 10px 0; margin: 0 0 10px 0;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
border-left: 5px solid darken(scale-color-diff(), 10%); border-left: 5px solid darken(dark-light-diff($primary, $secondary, 90%, -60%), 10%);
overflow: hidden; overflow: hidden;
p { p {
margin: 0 0 10px 0; margin: 0 0 10px 0;

6
app/assets/stylesheets/mobile/compose.scss
View File

@ -39,7 +39,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
width: 100%; width: 100%;
z-index: 1039; z-index: 1039;
height: 0; height: 0;
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
bottom: 0; bottom: 0;
font-size: 1em; font-size: 1em;
position: fixed; position: fixed;
@ -88,7 +88,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
&.draft { &.draft {
height: 35px !important; height: 35px !important;
cursor: pointer; cursor: pointer;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.draft-text { .draft-text {
display: block; display: block;
position: absolute; position: absolute;
@ -103,7 +103,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
} }
&.saving { &.saving {
height: 40px !important; height: 40px !important;
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
.saving-text { .saving-text {
display: block; display: block;
} }

2
app/assets/stylesheets/mobile/history.scss
View File

@ -9,7 +9,7 @@
line-height: 2em; line-height: 2em;
} }
#revision-details { #revision-details {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
margin-top: 10px; margin-top: 10px;
} }

2
app/assets/stylesheets/mobile/topic-list.scss
View File

@ -237,7 +237,7 @@ tr.category-topic-link {
margin: 1px 0 0; margin: 1px 0 0;
list-style: none; list-style: none;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 5px; border-radius: 5px;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);

8
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -1,5 +1,5 @@
.gap { .gap {
background-color: scale-color-diff(); background-color: dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px 15px; padding: 5px 15px;
color: $primary; color: $primary;
text-align: center; text-align: center;
@ -7,7 +7,7 @@
} }
.topic-post { .topic-post {
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 6px 0 3px 0; padding: 6px 0 3px 0;
} }
@ -74,7 +74,7 @@ button {
background-color: $secondary; background-color: $secondary;
width: 205px; width: 205px;
padding: 10px; padding: 10px;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
position: absolute; position: absolute;
text-align: left; text-align: left;
bottom: 0; bottom: 0;
@ -286,7 +286,7 @@ a.star {
} }
#topic-footer-buttons { #topic-footer-buttons {
border-top: 1px solid scale-color-diff(); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 20px 10px 0 10px; padding: 20px 10px 0 10px;
.fa-bookmark.bookmarked { color: $tertiary; } .fa-bookmark.bookmarked { color: $tertiary; }
} }

2
app/assets/stylesheets/mobile/topic.scss
View File

@ -61,7 +61,7 @@
} }
#topic-progress-expanded { #topic-progress-expanded {
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;
box-shadow: 0 0px 2px rgba(0,0,0, .2); box-shadow: 0 0px 2px rgba(0,0,0, .2);

8
app/assets/stylesheets/mobile/user.scss
View File

@ -186,7 +186,7 @@
.user-content { .user-content {
padding: 10px 8px; padding: 10px 8px;
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
margin-bottom: 10px; margin-bottom: 10px;
box-sizing: border-box; box-sizing: border-box;
margin-top: 20px; margin-top: 20px;
@ -205,13 +205,13 @@
th { th {
text-align: left; text-align: left;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
padding: 5px; padding: 5px;
} }
td { td {
padding: 5px; padding: 5px;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
} }
} }
@ -420,7 +420,7 @@
.item { .item {
padding: 20px 0 15px 0; padding: 20px 0 15px 0;
background-color: $secondary; background-color: $secondary;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
} }
.type { .type {
color: $primary; color: $primary;