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

simplifying and segmenting color variables

Browse Source
This commit is contained in:
Kris Aubuchon 2014-05-06 01:50:51 -04:00
parent 63c4f24319
commit 8ea63006e4
48 changed files with 766 additions and 920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@
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 $primary_border_color;} th {border-top: 1px solid scale-color($primary, $lightness: 90%);}
td {border-bottom: 1px solid $primary_border_color; border-top: 1px solid $primary_border_color;} td {border-bottom: 1px solid scale-color($primary, $lightness: 90%); border-top: 1px solid scale-color($primary, $lightness: 90%);}
tr:hover { background-color: darken($primary_background_color, 2.5%); } tr:hover { background-color: darken($secondary, 2.5%); }
tr.selected { background-color: lighten($tertiary_background_color, 58%); } tr.selected { background-color: lighten($primary, 50%); }
.filters input { margin-bottom: 0; } .filters input { margin-bottom: 0; }
} }
@ -19,10 +19,10 @@
font-size: 12px; font-size: 12px;
float: right; float: right;
margin-right: 10px; margin-right: 10px;
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
padding: 2px 5px; padding: 2px 5px;
border-radius: 5px; border-radius: 5px;
color: $secondary_text_color; color: $primary;
} }
.admin-content { .admin-content {
@ -52,11 +52,11 @@
.bar { .bar {
margin-top: 5px; margin-top: 5px;
background-color: $emphasis_text_color; background-color: $tertiary;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
color: $tertiary_text_color; color: $secondary;
} }
} }
} }
@ -65,13 +65,13 @@
.admin-loading { .admin-loading {
width: 100px; width: 100px;
margin: 0 auto 30px auto; margin: 0 auto 30px auto;
background-color: $secondary_background_color; background-color: $primary;
@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;
line-height: 23px; line-height: 23px;
text-align: center; text-align: center;
color: $tertiary_text_color; color: $secondary;
background: { background: {
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96_w.gif");
repeat: no-repeat; repeat: no-repeat;
@ -85,16 +85,16 @@
} }
.admin-controls { .admin-controls {
background-color: darken($primary_background_color, 5%); background-color: darken($secondary, 5%);
padding: 10px 10px 3px 0; padding: 10px 10px 3px 0;
height: 35px; height: 35px;
.nav.nav-pills { .nav.nav-pills {
li.active { li.active {
a { a {
border-color: darken($primary_border_color, 10%); border-color: scale-color($primary, $lightness: 90%);
background-color: $tertiary_background_color; background-color: lighten($primary, 40%);
&:hover { &:hover {
background-color: $tertiary_background_color; background-color: lighten($primary, 40%);
} }
} }
} }
@ -102,7 +102,7 @@
h1 { h1 {
font-size: 20px; font-size: 20px;
line-height: 25px; line-height: 25px;
color: $secondary_text_color; color: $primary;
} }
.controls { .controls {
margin-left: 10px; margin-left: 10px;
@ -153,8 +153,8 @@
border-right: none; border-right: none;
} }
li a.active { li a.active {
color: $tertiary_text_color; color: $secondary;
background-color: $nav-stacked-background-color-active; background-color: $danger;
} }
} }
@ -164,7 +164,7 @@
@include small-width { width: 700px; } @include small-width { width: 700px; }
min-height: 800px; min-height: 800px;
margin-left: 0; margin-left: 0;
border-left: solid 1px lighten($nav-stacked-border-color, 5%); border-left: solid 1px lighten($primary, 50%);
padding: 30px 0 30px 30px; padding: 30px 0 30px 30px;
} }
@ -224,14 +224,14 @@
.btn.list-add-value { .btn.list-add-value {
margin: 0px 3px; margin: 0px 3px;
padding: 4px 10px; padding: 4px 10px;
color: $link-color; color: $tertiary;
} }
} }
.desc { .desc {
padding-top: 3px; padding-top: 3px;
color: $secondary_text_color; color: $primary;
font-size: 80%; font-size: 80%;
line-height: 1.4em; line-height: 1.4em;
} }
@ -244,11 +244,11 @@
.setting.overridden { .setting.overridden {
input[type=text] { input[type=text] {
background-color: lighten($highlight_background_color, 40%); background-color: lighten($highlight, 23%);
} }
h3 { h3 {
color: darken($highlight_text_color, 30%); color: darken($highlight, 30%);
} }
} }
} }
@ -256,21 +256,21 @@
section.details { section.details {
h1 { h1 {
font-size: 15px; font-size: 15px;
background-color: lighten($secondary_background_color, 50%); background-color: lighten($primary, 50%);
color: $tertiary_text_color; color: $secondary;
padding: 0 10px; padding: 0 10px;
margin: 0 0 5px 0; margin: 0 0 5px 0;
} }
} }
#selected-controls { #selected-controls {
background-color: lighten($emphasis_background_color, 50%); background-color: lighten($tertiary, 50%);
padding: 8px; padding: 8px;
min-height: 27px; min-height: 27px;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 1075px; width: 1075px;
border: 1px solid lighten($emphasis_border_color, 45%); border: 1px solid lighten($tertiary, 45%);
} }
.display-row { .display-row {
@ -280,9 +280,9 @@ section.details {
border-top: 0; border-top: 0;
} }
&.highlight-danger { &.highlight-danger {
background-color: $warning_background_color; background-color: $danger;
} }
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
&:before, &:after { &:before, &:after {
display: table; display: table;
content: ""; content: "";
@ -364,7 +364,7 @@ section.details {
padding: 5px 0 0 0; padding: 5px 0 0 0;
margin-left: 10px; margin-left: 10px;
width: 80px; width: 80px;
color: $secondary_text_color; color: $primary;
} }
} }
} }
@ -421,7 +421,7 @@ section.details {
padding: 5px 0 0 0; padding: 5px 0 0 0;
margin-left: 10px; margin-left: 10px;
width: 80px; width: 80px;
color: $secondary_text_color; color: $primary;
} }
} }
} }
@ -441,7 +441,7 @@ section.details {
.hex, .opacity { text-align: center; } .hex, .opacity { text-align: center; }
.changed .name { .changed .name {
color: darken($highlight_text_color, 30%); color: darken($highlight, 30%);
} }
} }
} }
@ -450,10 +450,10 @@ section.details {
.admin-flags { .admin-flags {
tr.hidden-post td.excerpt { opacity: 0.4; } tr.hidden-post td.excerpt { opacity: 0.4; }
tr.deleted td.excerpt { opacity: 0.8; background-color: $warning_background_color; } tr.deleted td.excerpt { opacity: 0.8; background-color: scale-color($danger, $lightness: 30%); }
td.message { td.message {
padding: 4px 8px; padding: 4px 8px;
background-color: $highlight_background_color; background-color: lighten($highlight, 23%);
} }
td { vertical-align: top; } td { vertical-align: top; }
th { text-align: left; } th { text-align: left; }
@ -533,13 +533,13 @@ section.details {
} }
.up-to-date { .up-to-date {
color: $success_text_color; color: $success;
} }
.updates-available { .updates-available {
color: $warning_text_color; color: $danger;
} }
.critical-updates-available { .critical-updates-available {
color: $warning_text_color; color: $danger;
} }
} }
@ -582,24 +582,24 @@ table.api-keys {
.title { .title {
i.fa { i.fa {
color: $primary_text_color; color: darken($primary, 40%);
} }
} }
th { th {
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
background-color: lighten($secondary_background_color, 76%); background-color: lighten($primary, 76%);
} }
th.title { th.title {
text-align: left; text-align: left;
} }
thead { thead {
tr:hover > td { tr:hover > td {
background-color: $primary_background_color; background-color: $secondary;
} }
tr:hover > th { tr:hover > th {
background-color: lighten($secondary_background_color, 60%); background-color: lighten($primary, 60%);
} }
} }
@ -612,13 +612,13 @@ table.api-keys {
} }
&.trending-up { &.trending-up {
color: $success_text_color; color: $success;
i.up { i.up {
display: inline; display: inline;
} }
} }
&.trending-down { &.trending-down {
color: $warning_text_color; color: $danger;
i.down { i.down {
display: inline; display: inline;
} }
@ -634,11 +634,10 @@ table.api-keys {
&.detected-problems { &.detected-problems {
@include border-radius-all(5px); @include border-radius-all(5px);
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
border: 1px solid $primary_border_color;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 10px; margin-top: 10px;
box-shadow: inset 0 0 10px rgba($primary_border_color, .4); box-shadow: inset 0 0 10px rgba($primary, .1);
.look-here { .look-here {
float: left; float: left;
@ -647,7 +646,7 @@ table.api-keys {
.fa { .fa {
font-size: 32px; font-size: 32px;
vertical-align: middle; vertical-align: middle;
color: $secondary_text_color color: $primary
} }
} }
@ -661,7 +660,7 @@ table.api-keys {
text-align: right; text-align: right;
} }
.btn { .btn {
background-color: lighten($secondary_background_color, 60%); background-color: lighten($primary, 60%);
} }
ul { ul {
margin-left: 0; margin-left: 0;
@ -702,7 +701,7 @@ table.api-keys {
.commits-widget { .commits-widget {
border: solid 1px $primary_border_color; border: solid 1px scale-color($primary, $lightness: 90%);
width: 500px; width: 500px;
height: 180px; height: 180px;
margin-bottom: 36px; margin-bottom: 36px;
@ -722,7 +721,7 @@ table.api-keys {
list-style: none; list-style: none;
} }
a { a {
color: $primary_text_color; color: darken($primary, 40%);
text-decoration: none; text-decoration: none;
} }
a:hover { a:hover {
@ -730,11 +729,10 @@ table.api-keys {
} }
.header { .header {
color: $primary_text_color; color: darken($primary, 40%);
font-weight: bold; font-weight: bold;
height: 30px; height: 30px;
border-bottom: solid 1px $primary_border_color; background-color: lighten($primary, 60%);
background-color: lighten($secondary_background_color, 60%);
cursor: pointer; cursor: pointer;
h1 { h1 {
@ -746,7 +744,7 @@ table.api-keys {
} }
.header:hover h1 { .header:hover h1 {
color: $link-color-hover; color: $tertiary;
} }
.commits-list { .commits-list {
@ -757,8 +755,7 @@ table.api-keys {
@extend .clearfix; @extend .clearfix;
line-height: 1.0em; line-height: 1.0em;
padding: 6px 8px; padding: 6px 8px;
border-bottom: solid 1px $primary_border_color; background-color: scale-color($primary, $lightness: 90%);
background-color: lighten($secondary_background_color, 76%);
.left { .left {
float: left; float: left;
} }
@ -768,25 +765,25 @@ table.api-keys {
img { img {
margin-top: 2px; margin-top: 2px;
border: solid 1px $primary_border_color; border: solid 1px scale-color($primary, $lightness: 90%);
padding: 2px; padding: 2px;
background-color: $primary_background_color; background-color: $secondary;
} }
.commit-message { .commit-message {
color: $primary_text_color; color: darken($primary, 40%);
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
} }
.commit-meta { .commit-meta {
color: $secondary_text_color; color: $primary;
font-size: 12px; font-size: 12px;
} }
.committer-name { .committer-name {
font-weight: bold; font-weight: bold;
color: $primary_text_color; color: darken($primary, 40%);
} }
} }
li:last-child { li:last-child {
@ -799,18 +796,18 @@ table.api-keys {
width: 6px; width: 6px;
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: lighten($secondary_background_color, 60%); background-color: lighten($primary, 60%);
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
border-left: solid 1px $primary_border_color; border-left: solid 1px scale-color($primary, $lightness: 90%);
} }
} }
.content-list { .content-list {
h3 { h3 {
color: $primary_text_color; color: darken($primary, 40%);
font-size: 15px; font-size: 15px;
padding-left: 5px; padding-left: 5px;
margin-bottom: 10px; margin-bottom: 10px;
@ -821,25 +818,25 @@ table.api-keys {
margin: 0; margin: 0;
li:first-of-type { li:first-of-type {
border-top: 1px solid $primary_border_color; border-top: 1px solid lighten($primary, 60%);
} }
li { li {
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid lighten($primary, 60%);
} }
li a { li a {
display: block; display: block;
padding: 10px; padding: 10px;
color: $primary_text_color; color: darken($primary, 40%);
&:hover { &:hover {
background-color: #eee; background-color: #eee;
color: $primary_text_color; color: darken($primary, 40%);
} }
&.active { &.active {
font-weight: bold; font-weight: bold;
color: $primary_text_color; color: darken($primary, 40%);
} }
} }
} }
@ -855,7 +852,7 @@ table.api-keys {
margin-left: 20px; margin-left: 20px;
p.description { p.description {
color: $secondary_text_color; color: $primary;
} }
.controls { .controls {
@ -990,14 +987,14 @@ table.api-keys {
margin: 0 0 20px 6px; margin: 0 0 20px 6px;
a.filter { a.filter {
display: inline-block; display: inline-block;
background-color: lighten($secondary_background_color, 60%); background-color: lighten($primary, 60%);
padding: 3px 10px; padding: 3px 10px;
border-radius: 3px; border-radius: 3px;
color: $primary_text_color; color: darken($primary, 40%);
&:hover { &:hover {
color: $primary_text_color; color: darken($primary, 40%);
background-color: lighten($secondary_background_color, 76%); background-color: lighten($primary, 76%);
} }
@ -1027,11 +1024,11 @@ table.api-keys {
.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses { .staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses {
border-bottom: dotted 1px $primary_border_color; border-bottom: dotted 1px lighten($primary, 60%);
.heading-container { .heading-container {
width: 100%; width: 100%;
background-color: lighten($secondary_background_color, 76%); background-color: lighten($primary, 60%);
} }
.col.heading { .col.heading {
font-weight: bold; font-weight: bold;
@ -1047,7 +1044,7 @@ table.api-keys {
.ember-list-item-view { .ember-list-item-view {
width: 100%; width: 100%;
border-top: solid 1px $primary_border_color; border-top: solid 1px lighten($primary, 60%);
} }
} }
@ -1059,10 +1056,10 @@ table.api-keys {
.leader-requirements { .leader-requirements {
.fa-check { .fa-check {
color: $success_text_color; color: $success;
} }
.fa-times { .fa-times {
color: $warning_text_color; color: $danger;
} }
} }
@ -1074,7 +1071,7 @@ $rollback-dark: darken($rollback, 10%) !default;
$rollback-darker: darken($rollback, 20%) !default; $rollback-darker: darken($rollback, 20%) !default;
.btn-rollback { .btn-rollback {
color: $tertiary_text_color; color: $secondary;
background: $rollback; background: $rollback;
&:hover { &:hover {
background: $rollback-dark; background: $rollback-dark;

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

@ -1,6 +1,6 @@
.fa-thumb-tack.unpinned { .fa-thumb-tack.unpinned {
@include fa-icon-rotate(315deg, 1); @include fa-icon-rotate(315deg, 1);
color: $secondary_text_color; color: $primary;
} }
.topic-statuses .fa { .topic-statuses .fa {

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

@ -3,7 +3,7 @@
#simple-container { #simple-container {
@include border-radius-all(10px); @include border-radius-all(10px);
background-color: $primary_background_color; background-color: $secondary;
padding: 20px; padding: 20px;
width: 550px; width: 550px;
margin: 0 auto; margin: 0 auto;

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 $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
margin-right: 2px; margin-right: 2px;
width: 16px; width: 16px;
height: 16px; height: 16px;

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

@ -4,11 +4,11 @@
} }
.topic-count { .topic-count {
font-size: 11px; font-size: 11px;
color: $secondary_text_color; color: $primary;
display: inline-block; display: inline-block;
} }
.highlighted .topic-count { .highlighted .topic-count {
color: $tertiary_text_color; color: $secondary;
} }
.category-desc { .category-desc {
margin: 6px 0 0 3px; margin: 6px 0 0 3px;

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

@ -2,28 +2,28 @@
z-index: 999999; z-index: 999999;
position: absolute; position: absolute;
width: 240px; width: 240px;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
ul { ul {
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
li { li {
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
a[href] { a[href] {
padding: 5px; padding: 5px;
display: block; display: block;
span.username { span.username {
color: $primary_text_color; color: darken($primary, 40%);
} }
span.name { span.name {
font-size: 11px; font-size: 11px;
} }
&.selected { &.selected {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
} }
@include hover { @include hover {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
text-decoration: none; text-decoration: none;
} }
} }
@ -42,8 +42,8 @@ div.ac-wrap.disabled {
div.ac-wrap { div.ac-wrap {
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
padding: 5px 10px; padding: 5px 10px;
div.item { div.item {
float: left; float: left;
@ -64,12 +64,12 @@ div.ac-wrap {
border-radius: 10px; border-radius: 10px;
width: 10px; width: 10px;
display: inline-block; display: inline-block;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
&:hover { &:hover {
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
border: 1px solid $warning_border_color; border: 1px solid scale-color($danger, $lightness: 30%);
text-decoration: none; text-decoration: none;
color: $warning_text_color; color: $danger;
} }
} }
} }
@ -94,7 +94,7 @@ div.ac-wrap {
} }
.examples { .examples {
margin: 10px 0 0 0; margin: 10px 0 0 0;
color: $secondary_text_color; color: $primary;
} }
} }

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

@ -1,42 +1,42 @@
a.no-href { a.no-href {
cursor: pointer; cursor: pointer;
} }
body { body {
button.ok { button.ok {
background: $btn-success-background; background: $success;
color: $tertiary_text_color; color: $secondary;
@include hover { @include hover {
background: lighten($btn-success-background, 10%); background: lighten($success, 10%);
color: $tertiary_text_color; color: $secondary;
} }
} }
button.cancel { button.cancel {
background: $btn-danger-background-color; background: $danger;
color: $tertiary_text_color; color: $secondary;
@include hover { @include hover {
background: lighten($btn-danger-background-color, 10%); background: lighten($danger, 10%);
color: $tertiary_text_color; color: $secondary;
} }
} }
.coldmap-high { .coldmap-high {
color: $coldmap-high !important; color: scale-color($tertiary, $lightness: 40%) !important;
} }
.coldmap-med { .coldmap-med {
color: $coldmap-med !important; color: $tertiary !important;
} }
.coldmap-low { .coldmap-low {
color: $coldmap-low !important; color: scale-color($tertiary, $lightness: -10%) !important;
} }
.heatmap-high { .heatmap-high {
color: $heatmap-high !important; color: scale-color($danger, $lightness: 30%) !important;
} }
.heatmap-med { .heatmap-med {
color: $heatmap-med !important; color: $danger !important;
} }
.heatmap-low { .heatmap-low {
color: $heatmap-low !important; color: darken($danger, 10%) !important;
} }
#loading-message { #loading-message {
position: absolute; position: absolute;
@ -44,7 +44,7 @@ body {
text-align: center; text-align: center;
top: 120px; top: 120px;
left: 500px; left: 500px;
color: lighten($primary_text_color, 35%); color: $primary;
} }
.top-space { .top-space {
margin-top: 10px; margin-top: 10px;
@ -54,7 +54,7 @@ body {
} }
.message { .message {
@include border-radius-all(8px); @include border-radius-all(8px);
background-color: $primary_background_color; background-color: $secondary;
padding: 14px; padding: 14px;
h2 { h2 {
margin-bottom: 20px; margin-bottom: 20px;
@ -69,7 +69,7 @@ body {
.contents { .contents {
padding-top: 10px; padding-top: 10px;
a[href] { a[href] {
color: $tertiary_text_color; color: $secondary;
} }
} }
} }
@ -81,10 +81,10 @@ body {
.tip { .tip {
display: inline-block; display: inline-block;
&.good { &.good {
color: $success_text_color; color: $success;
} }
&.bad { &.bad {
color: $warning_text_color; color: $danger;
} }
} }
} }
@ -95,12 +95,12 @@ body {
#pagedown-editor { #pagedown-editor {
width: 540px; width: 540px;
background-color: $primary_background_color; background-color: $secondary;
padding: 0 10px 13px 10px; padding: 0 10px 13px 10px;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
.preview { .preview {
margin-top: 8px; margin-top: 8px;
border: 1px dashed $primary_border_color; border: 1px dashed scale-color($primary, $lightness: 90%);
padding: 8px 8px 0 8px; padding: 8px 8px 0 8px;
p { p {
margin: 0 0 10px 0; margin: 0 0 10px 0;
@ -120,7 +120,7 @@ body {
font-size: 15px; font-size: 15px;
line-height: 23px; line-height: 23px;
text-align: center; text-align: center;
color: $primary_background_color; color: $secondary;
background: { background: {
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96_w.gif");
repeat: no-repeat; repeat: no-repeat;
@ -145,9 +145,9 @@ body {
} }
.avatar-wrapper { .avatar-wrapper {
background-color: $primary_background_color; background-color: $secondary;
display: inline-block; display: inline-block;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
@include border-radius-all(5px); @include border-radius-all(5px);
img { img {
@include border-radius-all(4px); @include border-radius-all(4px);

30
app/assets/stylesheets/common/base/history.scss
View File

@ -8,7 +8,7 @@
#revision-controls { #revision-controls {
float: left; float: left;
.btn[disabled]:hover { .btn[disabled]:hover {
color: lighten($primary_text_color, 35%); color: $primary;
} }
} }
#revision-numbers { #revision-numbers {
@ -27,7 +27,7 @@
} }
} }
#revision-details { #revision-details {
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
padding: 5px; padding: 5px;
margin-top: 10px; margin-top: 10px;
} }
@ -67,63 +67,63 @@
} }
ins, .diff-ins { ins, .diff-ins {
code, img { code, img {
border: 2px solid $success_border_color; border: 2px solid $success;
} }
img { img {
opacity: .75; opacity: .75;
filter: alpha(opacity=75); filter: alpha(opacity=75);
} }
a { a {
color: $success_text_color; color: $success;
text-decoration: none; text-decoration: none;
} }
} }
img.diff-ins, code.diff-ins { img.diff-ins, code.diff-ins {
border: 2px solid $success_border_color; border: 2px solid $success;
} }
img.diff-ins { img.diff-ins {
opacity: .75; opacity: .75;
filter: alpha(opacity=75); filter: alpha(opacity=75);
} }
.diff-ins { .diff-ins {
background: $success_background_color; background: scale-color($success, $lightness: 60%);;
} }
ins { ins {
color: $success_text_color; color: $success;
background: $success_background_color; background: scale-color($success, $lightness: 60%);;
} }
del, .diff-del { del, .diff-del {
code, img { code, img {
border: 2px solid $warning_border_color; border: 2px solid $danger;
} }
img { img {
opacity: .5; opacity: .5;
filter: alpha(opacity=50); filter: alpha(opacity=50);
} }
a { a {
color: $warning_text_color; color: $danger;
text-decoration: none; text-decoration: none;
} }
} }
img.diff-del, code.diff-del { img.diff-del, code.diff-del {
border: 2px solid $warning_border_color; border: 2px solid $danger;
} }
img.diff-del { img.diff-del {
opacity: .5; opacity: .5;
filter: alpha(opacity=50); filter: alpha(opacity=50);
} }
.diff-del { .diff-del {
background: $warning_background_color; background: scale-color($danger, $lightness: 30%);
} }
del { del {
color: $warning_text_color; color: $danger;
background: $warning_background_color; background: scale-color($danger, $lightness: 30%);
} }
span.date { span.date {
font-weight: bold; font-weight: bold;
} }
span.edit-reason { span.edit-reason {
background-color: $highlight_background_color; background-color: lighten($highlight, 23%);
padding: 3px 5px 5px 5px; padding: 3px 5px 5px 5px;
} }
.modal-header { .modal-header {

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

@ -3,7 +3,7 @@
display: inline-block; display: inline-block;
&:hover .meta { &:hover .meta {
background: lighten($secondary_background_color, 60%); background: $primary;
opacity: 1; opacity: 1;
@include transition(opacity .5s); @include transition(opacity .5s);
} }
@ -17,8 +17,8 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
color: $tertiary_text_color; color: $secondary;
background: $secondary_background_color; background: $primary;
opacity: 0; opacity: 0;
@include transition(opacity .2s); @include transition(opacity .2s);
@ -38,7 +38,7 @@
.informations { .informations {
margin: 6px; margin: 6px;
padding-right: 20px; padding-right: 20px;
color: lighten($primary_text_color, 35%); color: $primary;
font-size: 14px; font-size: 14px;
} }

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

@ -18,7 +18,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1040; z-index: 1040;
background-color: $secondary_background_color; background-color: $primary;
&.fade { &.fade {
opacity: 0; opacity: 0;
} }
@ -50,11 +50,11 @@
.modal-inner-container { .modal-inner-container {
max-width: 710px; max-width: 710px;
margin: 0 auto; margin: 0 auto;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
border: 1px solid lighten($primary_border_color, 10%); border: 1px solid scale-color($primary, $lightness: 90%);
box-shadow: 0 3px 7px rgba($primary_shadow_color, .8); box-shadow: 0 3px 7px rgba($primary, .8);
background-clip: padding-box; background-clip: padding-box;
} }
@ -73,7 +73,7 @@
.modal-footer { .modal-footer {
margin: 0 15px; margin: 0 15px;
padding: 14px 0 15px; padding: 14px 0 15px;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
} }
.modal-footer:before, .modal-footer:before,
.modal-footer:after { .modal-footer:after {
@ -87,11 +87,11 @@
.modal { .modal {
.nav { .nav {
padding: 10px 30px; padding: 10px 30px;
background-color: lighten($primary_background_color, 76%); background-color: lighten($secondary, 76%);
li > a { li > a {
font-size: 14px; font-size: 14px;
} }
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
} }
@ -105,17 +105,17 @@
height: 80px; height: 80px;
} }
label { label {
color: lighten($primary_text_color, 35%); color: $primary;
} }
p { p {
color: $primary_text_color; color: darken($primary, 40%);;
font-size: 13px; font-size: 13px;
} }
.archetype-option { .archetype-option {
margin-bottom: 20px; margin-bottom: 20px;
} }
.warning { .warning {
color: $warning_text_color !important; color: $danger !important;
} }
} }
.password-confirmation { .password-confirmation {
@ -144,9 +144,9 @@
font-weight: normal; font-weight: normal;
} }
&.btn-reply-here { &.btn-reply-here {
background: lighten($secondary_background_color, 60%); background: scale-color($primary, $lightness: 90%);
text-shadow: none; text-shadow: none;
color: lighten($primary_text_color, 35%); color: $primary;
} }
} }
.cancel { .cancel {

4
app/assets/stylesheets/common/base/notification-options.scss
View File

@ -1,7 +1,7 @@
.fa.muted { .fa.muted {
color: $notification_badge_background_color; color: scale-color($primary, $lightness: 40%);
} }
.fa.tracking, .fa.watching { .fa.tracking, .fa.watching {
color: lighten($emphasis_text_color, 20%); color: $tertiary;
font-weight: normal; font-weight: normal;
} }

16
app/assets/stylesheets/common/base/onebox.scss
View File

@ -13,14 +13,14 @@ a.loading-onebox {
.onebox-result { .onebox-result {
margin-top: 15px; margin-top: 15px;
padding: 12px 25px 12px 12px; padding: 12px 25px 12px 12px;
border-left: 5px solid $primary_border_color; border-left: 5px solid scale-color($primary, $lightness: 90%);
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
font-size: 14px; font-size: 14px;
> .source { > .source {
margin-bottom: 12px; margin-bottom: 12px;
margin-right: 10px; margin-right: 10px;
display: block; display: block;
color: $primary_text_color; color: $primary;
position: relative; position: relative;
height: 20px; height: 20px;
.info { .info {
@ -91,13 +91,13 @@ a.loading-onebox {
aside.onebox { aside.onebox {
margin-top: 15px; margin-top: 15px;
padding: 12px 25px 12px 12px; padding: 12px 25px 12px 12px;
border-left: 5px solid $primary_border_color; border-left: 5px solid scale-color($primary, $lightness: 90%);
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
font-size: 14px; font-size: 14px;
header { header {
a[href] { a[href] {
color: $primary_text_color; color: $primary;
text-decoration: none; text-decoration: none;
} }
} }
@ -118,12 +118,12 @@ aside.onebox {
} }
a[href] { a[href] {
color: $link_color; color: scale-color($tertiary, $lightness: -20%);
text-decoration: none; text-decoration: none;
} }
a[href]:visited { a[href]:visited {
color: $link_color; color: scale-color($tertiary, $lightness: -20%);
} }
img { img {

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

@ -26,7 +26,7 @@
height: 20px; height: 20px;
margin-right: 8px; margin-right: 8px;
margin-left: 5px; margin-left: 5px;
background-color: lighten($primary_background_color, 50%); background-color: scale-color($primary, $lightness: 90%);
display: inline-block; display: inline-block;
float: left; float: left;
} }
@ -63,7 +63,7 @@
} }
.wmd-button:hover { .wmd-button:hover {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
} }
@ -121,12 +121,12 @@
} }
.wmd-prompt-background { .wmd-prompt-background {
background-color: $secondary_background_color; background-color: $primary;
} }
.wmd-prompt-dialog { .wmd-prompt-dialog {
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
} }
.wmd-prompt-dialog > div { .wmd-prompt-dialog > div {
@ -135,12 +135,12 @@
} }
.wmd-prompt-dialog > form > input[type="text"] { .wmd-prompt-dialog > form > input[type="text"] {
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
color: $primary_text_color; color: $primary;
} }
.wmd-prompt-dialog > form > input[type="button"] { .wmd-prompt-dialog > form > input[type="button"] {
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
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;

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

@ -4,8 +4,8 @@
position: absolute; position: absolute;
left: 20px; left: 20px;
z-index: 990; z-index: 990;
box-shadow: 0 1px 5px rgba($primary_shadow_color, .4); box-shadow: 0 1px 5px rgba($primary, .4);
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
padding: 6px 10px 10px 10px; padding: 6px 10px 10px 10px;
width: 300px; width: 300px;
display: none; display: none;
@ -29,7 +29,7 @@
float: right; float: right;
font-size: 20px; font-size: 20px;
a { a {
color: $primary_text_color; color: $primary;
} }
} }
} }

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

@ -8,10 +8,10 @@
} }
.topic-admin-menu { .topic-admin-menu {
background-color: $primary_background_color; background-color: $secondary;
width: 205px; width: 205px;
padding: 10px; padding: 10px;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
position: fixed; position: fixed;
top: 70px; top: 70px;
right: 10px; right: 10px;

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

@ -4,8 +4,8 @@
left: -5px; left: -5px;
bottom: -5px; bottom: -5px;
text-shadow: text-shadow:
-1px -1px 0 $btn-primary-background-color, -1px -1px 0 scale-color($tertiary, $lightness: -10%),
1px 1px 0 $btn-primary-background-color, 1px 1px 0 scale-color($tertiary, $lightness: -10%),
1px -1px 0 $btn-primary-background-color, 1px -1px 0 scale-color($tertiary, $lightness: -10%),
-1px 1px 0 $btn-primary-background-color; -1px 1px 0 scale-color($tertiary, $lightness: -10%);
} }

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

@ -1,13 +1,13 @@
/* Default badge styles. */ /* Default badge styles. */
.user-badge { .user-badge {
padding: 3px 8px; padding: 3px 8px;
color: $primary_text_color; color: darken($primary, 40%);;
border: 1px solid $secondary-border-color; border: 1px solid lighten($primary, 60%);
font-size: $base-font-size * 0.86; font-size: $base-font-size * 0.86;
line-height: 16px; line-height: 16px;
margin: 0; margin: 0;
display: inline-block; display: inline-block;
background-color: $primary_background_color; background-color: $secondary;
.fa { .fa {
padding-right: 3px; padding-right: 3px;
@ -50,7 +50,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 $primary-border-color; border-bottom: 1px solid $primary;
.user-badge { .user-badge {
font-size: $base-font-size; font-size: $base-font-size;
@ -62,7 +62,7 @@ table.badges-listing {
td.grant-count { td.grant-count {
font-size: 0.8em; font-size: 0.8em;
color: $secondary_text_color; color: $primary;
text-align: right; text-align: right;
} }
@ -71,7 +71,7 @@ table.badges-listing {
} }
tr { tr {
border-top: 1px solid $primary-border-color; border-top: 1px solid $primary;
} }
} }
@ -80,18 +80,18 @@ table.badges-listing {
.badge-user { .badge-user {
display: inline-block; display: inline-block;
padding: 5px 10px; padding: 5px 10px;
border: 1px solid $secondary_border_color; border: 1px solid lighten($primary, 60%);
margin-bottom: 3px; margin-bottom: 3px;
.details { .details {
float: right; float: right;
margin: 0 10px; margin: 0 10px;
padding-top: 3px; padding-top: 3px;
color: $primary_text_color; color: darken($primary, 40%);;
} }
.date { .date {
display: block; display: block;
color: $secondary_text_color; color: $primary;
} }
} }
} }

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

@ -8,7 +8,7 @@
.fa { .fa {
width: 15px; width: 15px;
display: inline-block; display: inline-block;
color: $secondary_text_color; color: $primary;
} }
.avatar-wrapper { .avatar-wrapper {
border: none; border: none;
@ -40,7 +40,7 @@
h2 { h2 {
a { a {
font-size: 14px; font-size: 14px;
color: $link_color; color: scale-color($tertiary, $lightness: -10%);;
cursor: pointer; cursor: pointer;
} }
} }

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

@ -32,9 +32,9 @@
.badge-category { .badge-category {
padding: 6px; padding: 6px;
color: $tertiary_text_color; color: $secondary;
&[href] { &[href] {
color: $tertiary_text_color; color: $secondary;
} }
} }
@ -66,21 +66,21 @@ h1 a.badge-category div {vertical-align: top;}
.badge-notification { .badge-notification {
@extend %badge; @extend %badge;
padding: 4px; padding: 4px;
color: $tertiary_text_color; color: $secondary;
font-size: 11px; font-size: 11px;
line-height: 1; line-height: 1;
min-width: 11px; min-width: 11px;
text-align: center; text-align: center;
background-color: $notification_badge_background_color; background-color: scale-color($primary, $lightness: 90%);
&[href] { &[href] {
color: $tertiary_text_color; color: $secondary;
} }
// New posts // New posts
&.new-posts, &.unread-posts { &.new-posts, &.unread-posts {
background-color: lighten($emphasis_text_color, 20%); background-color: scale-color($tertiary, $lightness: 50%);
color: $tertiary_text_color; color: $secondary;
font-weight: normal; font-weight: normal;
} }
@ -106,7 +106,7 @@ h1 a.badge-category div {vertical-align: top;}
font-size: 14px; font-size: 14px;
line-height: 1; line-height: 1;
&[href] { &[href] {
color: $topic-list-td-color; color: scale-color($primary, $lightness: 40%);
} }
} }
@ -116,10 +116,10 @@ h1 a.badge-category div {vertical-align: top;}
.badge-group { .badge-group {
@extend %badge; @extend %badge;
padding: 3px 5px; padding: 3px 5px;
color: $primary_text_color; color: $primary;
text-shadow: 0 1px 0 rgba($secondary_shadow_color, 0.2); text-shadow: 0 1px 0 rgba($primary, 0.1);
background-color: #ddd; background-color: #ddd;
border-color: #aaa; border-color: #aaa;
font-size: 12px; font-size: 12px;
@include box-shadow(inset 0 1px 0 rgba($secondary_shadow_color, 0.52)); @include box-shadow(inset 0 1px 0 rgba($primary, 0.22));
} }

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

@ -37,23 +37,22 @@
.btn { .btn {
border: none; border: none;
color: $primary_text_color; color: $primary;
font-weight: normal; font-weight: normal;
background: lighten($secondary_background_color, 73%); background: scale-color($primary, $lightness: 90%);
&[href] { &[href] {
color: $btn-default-color; color: $primary;
} }
&:hover { &:hover {
background: #aaa; background: #aaa;
color: #fff; color: #fff;
} }
&:active { &:active {
@include linear-gradient( darken(#aaa, 8%), #aaa);
} }
&[disabled] { &[disabled] {
background: $btn-default-background-color; background: scale-color($primary, $lightness: 90%);
&:hover { color: $primary_text_color; } &:hover { color: scale-color($primary, $lightness: 70%); }
cursor: not-allowed; cursor: not-allowed;
} }
} }
@ -69,24 +68,24 @@
.btn-primary { .btn-primary {
border: none; border: none;
color: $tertiary_text_color; color: $secondary;
font-weight: normal; font-weight: normal;
color: #fff; color: #fff;
background: $btn-primary-background-color; background: $tertiary;
&[href] { &[href] {
color: $tertiary_text_color; color: $secondary;
} }
&:hover { &:hover {
color: #fff; color: #fff;
background: darken($btn-primary-background-color, 12%); background: scale-color($tertiary, $lightness: -20%);
} }
&:active { &:active {
@include linear-gradient(darken($btn-primary-background-color, 18%), darken($btn-primary-background-color, 12%)); @include linear-gradient(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -10%));
color: #fff; color: #fff;
} }
&[disabled] { &[disabled] {
background: $btn-primary-background-color; background: $tertiary;
} }
} }
@ -94,20 +93,20 @@
// -------------------------------------------------- // --------------------------------------------------
.btn-danger { .btn-danger {
color: $tertiary_text_color; color: $secondary;
font-weight: normal; font-weight: normal;
background: $btn-danger-background-color; background: $danger;
&[href] { &[href] {
color: $tertiary_text_color; color: $secondary;
} }
&:hover{ &:hover{
background: $btn-danger-background-color-dark; background: scale-color($danger, $lightness: -20%);
} }
&:active { &:active {
@include linear-gradient($btn-danger-background-color-dark, $btn-danger-background-color); @include linear-gradient(scale-color($danger, $lightness: -20%), $danger);
} }
&[disabled] { &[disabled] {
background: $btn-danger-background-color; background: $danger;
} }
} }
@ -115,11 +114,11 @@
// -------------------------------------------------- // --------------------------------------------------
.btn-social { .btn-social {
color: $tertiary_text_color; color: $secondary;
text-shadow: 0 1px 0 rgba($primary_shadow_color, 0.2); text-shadow: 0 1px 0 rgba($primary, 0.2);
@include box-shadow(inset 0 1px 0 rgba($secondary_shadow_color, 0.1)); @include box-shadow(inset 0 1px 0 rgba($primary, 0.1));
&[href] { &[href] {
color: $tertiary_text_color; color: $secondary;
} }
&:before { &:before {
margin-right: 7px; margin-right: 7px;

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

@ -4,7 +4,7 @@
} }
.topic-list-item.selected td:first-child, .topic-post.selected { .topic-list-item.selected td:first-child, .topic-post.selected {
border-left: 1px solid $topic-list-starred-color; border-left: 1px solid $danger;
} }
.topic-list-item.selected { .topic-list-item.selected {

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

@ -26,18 +26,17 @@
> a { > a {
border: none; border: none;
padding: 5px 12px; padding: 5px 12px;
color: $nav-pills-color; color: $primary;
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
&:hover { &:hover {
color: $nav-pills-color-hover; color: $danger;
background-color: $nav-pills-background-color-hover; background-color: scale-color($danger, $lightness: 70%);
} }
} }
&.active > a, > a.active { &.active > a, > a.active {
border-color: darken($nav-pills-background-color-active, 10%); color: $secondary;
color: $tertiary_text_color; background-color: $danger;
background-color: $nav-pills-background-color-active;
} }
} }
} }
@ -48,13 +47,13 @@
.nav-stacked { .nav-stacked {
position: relative; position: relative;
@extend %nav; @extend %nav;
border: 1px solid $nav-stacked-border-color; border: 1px solid scale-color($primary, $lightness: 60%);
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
background-color: $nav-stacked-background-color; background-color: scale-color($primary, $lightness: 90%);
@include box-shadow(0 1px 0 $secondary_shadow_color); @include box-shadow(0 1px 0 scale-color($primary, $lightness: 90%));
> li { > li {
border-bottom: 1px solid $nav-stacked-divider-color; border-bottom: 1px solid scale-color($primary, $lightness: 60%);
&:last-of-type { &:last-of-type {
border-bottom: 0; border-bottom: 0;
} }
@ -64,13 +63,13 @@
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
cursor: pointer; cursor: pointer;
color: $nav-stacked-color; color: $primary;
} }
} }
.active > a, .active > a,
.active .fa-chevron-right { .active .fa-chevron-right {
color: $tertiary_text_color; color: $secondary;
background-color: $nav-stacked-background-color-active; background-color: $danger;
} }
.count { .count {
font-size: 12px; font-size: 12px;
@ -79,7 +78,7 @@
.fa-chevron-right { .fa-chevron-right {
float: right; float: right;
margin: 0; margin: 0;
color: $nav-stacked-chevron-color; color: scale-color($primary, $lightness: 60%);
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
} }

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

@ -6,9 +6,9 @@
// -------------------------------------------------- // --------------------------------------------------
html { html {
color: $primary_text_color; color: $primary;
font: #{$base-font-size}/#{$base-line-height} $base-font-family; font: #{$base-font-size}/#{$base-line-height} $base-font-family;
background-color: $primary_background_color; background-color: $secondary;
overflow-y: scroll; overflow-y: scroll;
-webkit-font-smoothing: subpixel-antialiased; -webkit-font-smoothing: subpixel-antialiased;
} }
@ -17,17 +17,17 @@ html {
// -------------------------------------------------- // --------------------------------------------------
a { a {
color: $link-color; color: $tertiary;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
&:visited { &:visited {
color: $link-color-visited; color: $tertiary;
} }
&:hover { &:hover {
color: $link-color-hover; color: $tertiary;
} }
&:active { &:active {
color: $link-color-active; color: $tertiary;
} }
} }
@ -39,7 +39,7 @@ hr {
height: 1px; height: 1px;
margin: 1em 0; margin: 1em 0;
border: 0; border: 0;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
padding: 0; padding: 0;
} }

7
app/assets/stylesheets/common/foundation/colors.scss Normal file
View File

@ -0,0 +1,7 @@
$primary: #333 !default;
$secondary: #fff !default;
$tertiary: #0088cc !default;
$highlight: #ffff4d !default;
$danger: #e45735 !default;
$success: #009900 !default;
$love: #fa6c8d !default;

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

@ -39,151 +39,10 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
// Broad general variables // Broad general variables
// -------------------------------------------------- // --------------------------------------------------
$primary_border_color: lighten($black, 70%);
$secondary_border_color: lighten($black, 76%);
$tertiary_border_color: $white;
$highlight_border_color: $yellow;
$emphasis_border_color: $blue;
$warning_border_color: lighten($red, 20%);
$success_border_color: $green;
$primary_background_color: $white;
$secondary_background_color: $black;
$tertiary_background_color: lighten($black, 10%);
$moderator_background_color: lighten($yellow, 30%) !default;
$emphasis_background_color: lighten($blue, 45%);
$success_background_color: lighten($green, 50%);
$warning_background_color: lighten($red, 30%);
$highlight_background_color: lighten($yellow, 23%);
$like_background_color: lighten($pink, 25%);
$composer_background_color: lighten($black, 70%);
$notification_badge_background_color: lighten($black, 35%) !default;
$primary_text_color: $black;
$secondary_text_color: lighten($black, 40%);
$tertiary_text_color: $white;
$warning_text_color: $red;
$success_text_color: $green;
$emphasis_text_color: $blue;
$highlight_text_color: $yellow;
$like_color: $pink;
$primary_shadow_color: $black;
$secondary_shadow_color: $white;
$warning_shadow_color: lighten($red, 20%);
$success_shadow_color: $green;
$highlight: $yellow;
$header_item_highlight: lighten($blue, 45%);
$link_color: darken($blue, 10%);
$secondary_link_color: $white;
$muted-link-color: lighten($black, 35%);
$muted-important-link-color: lighten($black, 35%);
$link-color-visited: darken($blue, 10%) !default;
$link-color-hover: darken($blue, 10%) !default;
$link-color-active: darken($blue, 10%) !default;
$heatmap_high: lighten($red, 10%);
$heatmap_med: $red;
$heatmap_low: darken($red, 10%);
$coldmap_high: lighten($blue, 10%);
$coldmap_med: $blue;
$coldmap_low: darken($blue, 10%);
@import "colors";
// Specific element variables
// --------------------------------------------------
// Buttons
// --------------------------------------------------
// Default button
$btn-default-color: $black !default;
$btn-default-background-color: lighten($black, 50%) !default;
$btn-default-background-color-hover: lighten($black, 76%) !default;
// Primary button
$btn-primary-border-color: darken($blue, 10%) !default;
$btn-primary-background-color: $blue !default;
$btn-primary-background-color-dark: $blue !default;
$btn-primary-background-color-light: lighten($blue, 30%) !default;
// Danger button (delete, etc)
$btn-danger-border-color: darken($red, 10%) !default;
$btn-danger-background-color: $red !default;
$btn-danger-background-color-dark: darken($red, 10%) !default;
$btn-danger-background-color-light: $red !default;
$btn-success-background: lighten($green, 5%);
// Navigation menus
// --------------------------------------------------
// Pill nav
$nav-pills-color: $black !default;
$nav-pills-color-hover: $red !default;
$nav-pills-border-color-hover: lighten($red, 35%) !default;
$nav-pills-background-color-hover: lighten($red, 35%) !default;
$nav-pills-color-active: $red !default;
$nav-pills-border-color-active: darken($red, 10%) !default;
$nav-pills-background-color-active: $red !default;
// Stacked nav
$nav-stacked-color: $black !default;
$nav-stacked-border-color: lighten($black, 60%) !default;
$nav-stacked-background-color: lighten($black, 76%) !default;
$nav-stacked-divider-color: lighten($black, 60%) !default;
$nav-stacked-chevron-color: lighten($black, 50%) !default;
$nav-stacked-border-color-active: $red !default;
$nav-stacked-background-color-active: $red !default;
// Button nav
$nav-button-color: lighten($black, 35%) !default;
$nav-button-color-hover: $black !default;
$nav-button-background-color-hover: lighten($black, 60%) !default;
$nav-button-color-active: $black !default;
$nav-button-background-color-active: lighten($black, 60%) !default;
// Header
$modal-header-color: $red !default;
$modal-header-border-color: lighten($black, 50%) !default;
$modal-close-button-color: lighten($black, 50%);
$nav-like-button-color-hover: $pink !default;
$nav-like-button-background-color-hover: lighten($pink, 22%) !default;
$nav-like-button-color-active: darken($pink, 10%) !default;
$nav-like-button-background-color-active: lighten($pink, 22%) !default;
// Topic list
// --------------------------------------------------
$topic-list-border-color: lighten($black, 50%) !default;
$topic-list-th-color: lighten($black, 35%) !default;
$topic-list-th-border-color: lighten($black, 50%) !default;
$topic-list-th-background-color: lighten($black, 76%) !default;
$topic-list-td-color: lighten($black, 35%) !default;
$topic-list-td-border-color: lighten($black, 60%) !default;
$topic-list-star-color: lighten($black, 60%) !default;
$topic-list-starred-color: $red !default;
$quote-background: lighten($black, 76%);
$topicMenuColor: darken($white, 80%);
$bookmarkColor: $blue;
/* This file doesn't actually exist, it is injected by DiscourseSassImporter. */ /* This file doesn't actually exist, it is injected by DiscourseSassImporter. */
@import "plugins_variables"; @import "plugins_variables";

2
app/assets/stylesheets/common/input_tip.scss
View File

@ -18,7 +18,7 @@
} }
.close { .close {
float: right; float: right;
color: $primary_text_color; color: $primary;
opacity: 0.5; opacity: 0.5;
font-size: 15px; font-size: 15px;
margin-left: 4px; margin-left: 4px;

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

@ -13,13 +13,11 @@
.composer-popup { .composer-popup {
@include box-shadow(3px 3px 3px rgba($primary_shadow_color, 0.14)); @include box-shadow(3px 3px 3px rgba($primary, 0.34));
background: lighten($highlight, 15%); background: scale-color($highlight, $lightness: 50%);
border: 1px solid $highlight_border_color;
&.urgent { &.urgent {
background: lighten($warning_border_color, 15%); background: scale-color($danger, $lightness: 50%);
border: 1px solid $warning_border_color;
} }
h3 { h3 {
@ -32,7 +30,7 @@
a.close { a.close {
float: right; float: right;
color: $primary_text_color; color: $primary;
opacity: 0.5; opacity: 0.5;
font-size: 15px; font-size: 15px;
} }
@ -58,15 +56,14 @@
} }
.similar-topics { .similar-topics {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
border: 1px solid $emphasis_background_color;
a[href] { a[href] {
color: #000; color: #000;
} }
.posts-count { .posts-count {
color: darken($link_color, 40%); color: scale-color($tertiary, $lightness: -40%);
font-size: 12px; font-size: 12px;
} }
} }
@ -91,20 +88,20 @@
#file-uploading { #file-uploading {
left: 51%; left: 51%;
font-size: 12px; font-size: 12px;
color: $secondary_text_color; color: $primary;
} }
#draft-status { #draft-status {
right: 51%; right: 51%;
color: $primary_text_color; color: $primary;
&.flash { &.flash {
color: $warning_text_color; color: $danger;
} }
} }
@include transition(height 0.4s ease); @include transition(height 0.4s ease);
width: 100%; width: 100%;
z-index: 1039; z-index: 1039;
height: 0; height: 0;
background-color: rgba($composer_background_color, 0.96); background-color: scale-color($primary, $lightness: 90%);
bottom: 0; bottom: 0;
font-size: 14px; font-size: 14px;
position: fixed; position: fixed;
@ -115,7 +112,7 @@
right: 13px; right: 13px;
position: absolute; position: absolute;
font-size: 15px; font-size: 15px;
color: $primary_text_color; color: $primary;
text-decoration: none; text-decoration: none;
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
@ -151,7 +148,7 @@
&.draft { &.draft {
height: 40px !important; height: 40px !important;
cursor: pointer; cursor: pointer;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
.draft-text { .draft-text {
display: block; display: block;
} }
@ -164,7 +161,7 @@
} }
&.saving { &.saving {
height: 40px !important; height: 40px !important;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
.saving-text { .saving-text {
display: block; display: block;
} }
@ -186,7 +183,7 @@
height: 70px; height: 70px;
text-indent: -9999em; text-indent: -9999em;
background: { background: {
color: $primary_text_color; color: #000;
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96_w.gif");
repeat: no-repeat; repeat: no-repeat;
size: 35px; size: 35px;
@ -216,12 +213,12 @@
input#reply-title { input#reply-title {
padding: 7px 10px; padding: 7px 10px;
margin: 6px 10px 3px 0; margin: 6px 10px 3px 0;
color: $primary_text_color; color: $primary;
} }
input#reply-title { input#reply-title {
width: 400px; width: 400px;
color: $primary_text_color; color: $primary;
} }
.wmd-controls { .wmd-controls {
@ -276,18 +273,18 @@
} }
} }
#reply-title { #reply-title {
color: $primary_text_color; color: $primary;
margin-right: 10px; margin-right: 10px;
float: left; float: left;
&:disabled { &:disabled {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
} }
} }
#wmd-input:disabled { #wmd-input:disabled {
background-color: lighten($primary_background_color, 60%); background-color: scale-color($primary, $lightness: 90%);
} }
#wmd-input, #wmd-preview { #wmd-input, #wmd-preview {
color: $primary_text_color; color: $primary;
video { video {
max-width: 100%; max-width: 100%;
@ -299,7 +296,7 @@
} }
} }
#wmd-preview { #wmd-preview {
border: 1px dashed $primary_border_color; border: 1px dashed scale-color($primary, $lightness: 90%);
overflow: auto; overflow: auto;
visibility: visible; visibility: visible;
@ -328,10 +325,10 @@
.show-admin-options { .show-admin-options {
vertical-align: top; vertical-align: top;
margin-top: 8px; margin-top: 8px;
background: lighten($secondary_background_color, 60%); background: scale-color($primary, $lightness: 90%);
&:hover { &:hover {
color: $tertiary_text_color; color: $secondary;
background: lighten($secondary_background_color, 35%); background: $primary;
} }
} }
.title-input .popup-tip { .title-input .popup-tip {
@ -391,7 +388,7 @@
min-height: 100%; min-height: 100%;
padding: 7px; padding: 7px;
margin: 0; margin: 0;
background-color: $primary_background_color; background-color: $secondary;
word-wrap: break-word; word-wrap: break-word;
// set up proper header margins in post preview // set up proper header margins in post preview
@ -453,8 +450,8 @@
#wmd-button-bar { #wmd-button-bar {
top: 0; top: 0;
position: absolute; position: absolute;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
background-color: $primary_background_color; background-color: $secondary;
z-index: 100; z-index: 100;
} }
} }

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

@ -56,21 +56,21 @@ body {
height: 100%; height: 100%;
@include border-radius-all(5px); @include border-radius-all(5px);
&.white { &.white {
background-color: $primary_background_color; background-color: $secondary;
} }
} }
#main { #main {
.fa-star.starred { .fa-star.starred {
color: $warning_text_color; color: $danger;
} }
a.star { a.star {
color: lighten($primary_text_color, 60%); color: scale-color($primary, $lightness: 75%);
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
content: "\f005"; content: "\f005";
} }
&.starred { &.starred {
color: $warning_text_color; color: $danger;
@include hover { @include hover {
opacity: 1; opacity: 1;
&:before { &:before {
@ -113,22 +113,22 @@ body {
.grippie { .grippie {
width: 100%; width: 100%;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
border-width: 1px 0; border-width: 1px 0;
cursor: row-resize; cursor: row-resize;
height: 11px; height: 11px;
overflow: hidden; overflow: hidden;
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 95%);
display:block; display:block;
background: image-url("grippie.png") lighten($secondary_background_color, 76%) no-repeat center 3px; background: image-url("grippie.png") scale-color($primary, $lightness: 95%) no-repeat center 3px;
} }
} }
blockquote { blockquote {
/* 13px left is intentional here to properly align with post quotes */ /* 13px left is intentional here to properly align with post quotes */
padding: 10px 4px 4px 13px; padding: 10px 4px 4px 13px;
background-color: $quote-background; background-color: scale-color($primary, $lightness: 95%);
border-left: 5px solid $primary_border_color; border-left: 5px solid scale-color($primary, $lightness: 75%);
} }
.topic-statuses { .topic-statuses {
@ -150,7 +150,7 @@ blockquote {
body { body {
input, textarea, select { input, textarea, select {
color: $primary_text_color; color: $primary;
} }
code, pre { code, pre {
@ -203,7 +203,7 @@ body {
margin-bottom: 9px; margin-bottom: 9px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: $primary_text_color; color: $primary;
} }
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"] {
@ -213,7 +213,7 @@ body {
margin-bottom: 9px; margin-bottom: 9px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: $primary_text_color; color: $primary;
} }
} }
input { input {
@ -222,33 +222,33 @@ body {
textarea { textarea {
width: 210px; width: 210px;
height: auto; height: auto;
background-color:$primary_background_color; background-color:$secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 1px 1px rgba($primary_shadow_color, .3); box-shadow: inset 0 1px 1px rgba($primary, .3);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
} }
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: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 1px 1px rgba($primary_shadow_color, .3); box-shadow: inset 0 1px 1px rgba($primary, .3);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
} }
} }
textarea:focus { textarea:focus {
border-color: $emphasis_border_color; border-color: $tertiary;
outline: 0; outline: 0;
box-shadow: inset 0 1px 1px rgba($primary_shadow_color, .3), 0 0 8px $emphasis_border_color; box-shadow: inset 0 1px 1px rgba($primary, .3), 0 0 8px $tertiary;
} }
input { input {
&[type="text"]:focus, &[type="password"]:focus, &[type="datetime"]:focus, &[type="datetime-local"]:focus, &[type="date"]:focus, &[type="month"]:focus, &[type="time"]:focus, &[type="week"]:focus, &[type="number"]:focus, &[type="email"]:focus, &[type="url"]:focus, &[type="search"]:focus, &[type="tel"]:focus, &[type="color"]:focus { &[type="text"]:focus, &[type="password"]:focus, &[type="datetime"]:focus, &[type="datetime-local"]:focus, &[type="date"]:focus, &[type="month"]:focus, &[type="time"]:focus, &[type="week"]:focus, &[type="number"]:focus, &[type="email"]:focus, &[type="url"]:focus, &[type="search"]:focus, &[type="tel"]:focus, &[type="color"]:focus {
border-color: $emphasis_border_color; border-color: $tertiary;
outline: 0; outline: 0;
box-shadow: inset 0 1px 1px rgba($primary_shadow_color, .3), 0 0 8px $emphasis_border_color; box-shadow: inset 0 1px 1px rgba($primary, .3), 0 0 8px $tertiary;
} }
} }
@ -269,7 +269,7 @@ body {
select { select {
width: 220px; width: 220px;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
&[multiple], &[size] { &[multiple], &[size] {
height: auto; height: auto;
} }
@ -319,8 +319,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: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
border-color: $primary_border_color; border-color: scale-color($primary, $lightness: 90%);
} }
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] {
@ -330,66 +330,66 @@ body {
.control-group { .control-group {
&.warning { &.warning {
> label { > label {
color: $warning_text_color; color: $danger;
} }
.checkbox, .radio, input, select, textarea { .checkbox, .radio, input, select, textarea {
color: $warning_text_color; color: $danger;
border-color: $warning_border_color; border-color: $danger;
} }
.checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus { .checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus {
border-color: darken($warning_border_color, 25%); border-color: scale-color($danger, $lightness: -30%);
box-shadow: 0 0 6px $warning_shadow_color; box-shadow: 0 0 6px $danger;
} }
.input-prepend .add-on, .input-append .add-on { .input-prepend .add-on, .input-append .add-on {
color: $warning_text_color; color: $danger;
background-color: $warning_background_color; background-color: $danger;
border-color: $warning_border_color; border-color: $danger;
} }
} }
&.error { &.error {
> label { > label {
color: $warning_text_color; color: $danger;
} }
.checkbox, .radio, input, select, textarea { .checkbox, .radio, input, select, textarea {
color: $warning_text_color; color: $danger;
border-color: $warning_border_color; border-color: $danger;
} }
.checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus { .checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus {
border-color: darken($warning_border_color, 20%); border-color: scale-color($danger, $lightness: -30%);
box-shadow: 0 0 6px $warning_shadow_color; box-shadow: 0 0 6px $danger;
} }
.input-prepend .add-on, .input-append .add-on { .input-prepend .add-on, .input-append .add-on {
color: $warning_text_color; color: $danger;
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
border-color: darken($warning_border_color, 10%); border-color: scale-color($danger, $lightness: -20%);
} }
} }
&.success { &.success {
> label { > label {
color: $success_text_color; color: $success;
} }
.checkbox, .radio, input, select, textarea { .checkbox, .radio, input, select, textarea {
color: $success_text_color; color: $success;
border-color: $success_border_color; border-color: $success;
} }
.checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus { .checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus {
border-color: $success_border_color; border-color: $success;
box-shadow: 0 0 6px $success_shadow_color; box-shadow: 0 0 6px $success;
} }
.input-prepend .add-on, .input-append .add-on { .input-prepend .add-on, .input-append .add-on {
color: $success_text_color; color: $success;
background-color: $success_background_color; background-color: scale-color($success, $lightness: 60%);
border-color: $success_border_color; border-color: $success;
} }
} }
} }
input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
color: $warning_text_color; color: $danger;
border-color: $warning_border_color; border-color: $danger;
} }
input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
border-color: $warning_border_color; border-color: $danger;
box-shadow: 0 0 6px $warning_shadow_color; box-shadow: 0 0 6px $danger;
} }
.input-prepend, .input-append { .input-prepend, .input-append {
@ -414,16 +414,16 @@ body {
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
} }
.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;
border-radius: 0; border-radius: 0;
} }
.input-prepend .active, .input-append .active { .input-prepend .active, .input-append .active {
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
border-color: $warning_border_color; border-color: $danger;
} }
.input-prepend { .input-prepend {
.add-on, .btn { .add-on, .btn {
@ -498,8 +498,7 @@ body {
.alert { .alert {
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
margin-bottom: 18px; margin-bottom: 18px;
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
border: 1px solid $warning_border_color;
color: #c09853; color: #c09853;
} }
.alert .close { .alert .close {
@ -509,19 +508,16 @@ body {
line-height: 18px; line-height: 18px;
} }
.alert-success { .alert-success {
background-color: $success_background_color; background-color: scale-color($success, $lightness: 60%);;
border-color: $success_border_color; color: $success;
color: $success_text_color;
} }
.alert-error { .alert-error {
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
border-color: $warning_border_color; color: $danger;
color: $warning_text_color;
} }
.alert-info { .alert-info {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 75%);
border-color: $emphasis_background_color; color: $primary;
color: $primary_text_color;
} }
.alert { .alert {
.close { .close {
@ -529,11 +525,11 @@ body {
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
line-height: 18px; line-height: 18px;
color: $primary_text_color; color: $primary;
opacity: 0.2; opacity: 0.2;
filter: alpha(opacity = 20); filter: alpha(opacity = 20);
@include hover { @include hover {
color: $primary_text_color; color: $primary;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
opacity: 0.4; opacity: 0.4;
@ -551,7 +547,7 @@ body {
.bootbox.modal { .bootbox.modal {
.modal-footer { .modal-footer {
a.btn-primary { a.btn-primary {
color: $tertiary_text_color; color: $secondary;
} }
} }
} }

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

@ -8,8 +8,8 @@
top: 0; top: 0;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
box-shadow: 0 2px 4px -2px rgba($primary_text_color, .45); box-shadow: 0 2px 4px -2px rgba($primary, .25);
background-color: $primary_background_color; background-color: $secondary;
padding-top: 3px; padding-top: 3px;
.docked & { .docked & {
position: fixed; position: fixed;
@ -42,7 +42,7 @@
.current-username { .current-username {
float: left; float: left;
a { a {
color: $secondary_text_color; color: $primary;
font-size: 14px; font-size: 14px;
display:block; display:block;
margin-top: 10px; margin-top: 10px;
@ -62,7 +62,7 @@
.icon { .icon {
display: block; display: block;
padding: 3px; padding: 3px;
color: $nav-button-color; color: scale-color($primary, $lightness: 50%);
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
border-top: 1px solid transparent; border-top: 1px solid transparent;
@ -71,25 +71,25 @@
&:hover { &:hover {
color: $nav-button-color-hover; color: $primary;
background-color: $nav-button-background-color-hover; background-color: scale-color($primary, $lightness: 90%);
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: $nav-button-color-active; color: $primary;
background-color: $nav-button-background-color-active; background-color: scale-color($primary, $lightness: 90%);
} }
} }
.active .icon { .active .icon {
position: relative; position: relative;
color: #7b7b7b; color: #7b7b7b;
background-color: $primary_background_color; background-color: $secondary;
cursor: default; cursor: default;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
border-left: 1px solid $primary_border_color; border-left: 1px solid scale-color($primary, $lightness: 90%);
border-right: 1px solid $primary_border_color; border-right: 1px solid scale-color($primary, $lightness: 90%);
&:after { &:after {
display: block; display: block;
position: absolute; position: absolute;
@ -99,7 +99,7 @@
width: 100%; width: 100%;
height: 0; height: 0;
content: ""; content: "";
border-top: 1px solid $tertiary_border_color; border-top: 1px solid $secondary;
} }
&:hover { &:hover {
border-bottom: none; border-bottom: none;
@ -123,15 +123,15 @@
} }
.unread-notifications { .unread-notifications {
right: -4px; right: -4px;
background-color: $emphasis_text_color; background-color: $tertiary;
} }
.unread-private-messages { .unread-private-messages {
left: -4px; left: -4px;
background-color: $success_text_color; background-color: $success;
} }
} }
.flagged-posts { .flagged-posts {
background-color: $warning_text_color; background-color: $danger;
} }
} }
@ -155,9 +155,9 @@
right: 0; right: 0;
z-index: 1100; z-index: 1100;
overflow: auto; overflow: auto;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
background-color: $primary_background_color; background-color: $secondary;
@include box-shadow(0 2px 2px rgba($primary_shadow_color, .4)); @include box-shadow(0 2px 2px rgba($primary, .4));
// Common // Common
@ -174,29 +174,29 @@
} }
} }
.heading { .heading {
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
color: $primary_text_color; color: darken($primary, 40%);
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
} }
.selected { .selected {
background-color: $header-item-highlight; background-color: $tertiary;
} }
// Notifications // Notifications
&#notifications-dropdown { &#notifications-dropdown {
.fa { .fa {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
} }
li { li {
background-color: $header-item-highlight; background-color: $tertiary;
} }
.read { .read {
background-color: $primary_background_color; background-color: $secondary;
} }
.none { .none {
padding: 5px; padding: 5px;
@ -216,7 +216,7 @@
position: absolute; position: absolute;
top: 13px; top: 13px;
right: 13px; right: 13px;
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
font-size: 18px; font-size: 18px;
} }
.no-results { .no-results {

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

@ -11,7 +11,7 @@
#login-form { #login-form {
a { a {
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 35%);
cursor: pointer; cursor: pointer;
} }
} }
@ -49,7 +49,7 @@
tr.instructions { tr.instructions {
label { label {
color: $secondary_text_color; color: $primary;
} }
} }

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

@ -15,11 +15,11 @@
width: 610px; width: 610px;
height: auto; height: auto;
margin: -250px 0 0 -305px; margin: -250px 0 0 -305px;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
border: 1px solid lighten($primary_border_color, 10%); border: 1px solid scale-color($primary, $lightness: 90%);
box-shadow: 0 3px 7px rgba($primary_shadow_color, .8); box-shadow: 0 3px 7px rgba($primary, .8);
background-clip: padding-box; background-clip: padding-box;
} }
@ -57,9 +57,9 @@ animation: modal .25s;
margin-left: -1px; margin-left: -1px;
} }
.modal-header { .modal-header {
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
h3 { h3 {
color: $nav-pills-background-color-active; color: $danger;
font-size: 20px; font-size: 20px;
padding: 10px 15px 7px; padding: 10px 15px 7px;
} }
@ -68,10 +68,10 @@ animation: modal .25s;
font-size: 20px; font-size: 20px;
margin: 10px 10px 0; margin: 10px 10px 0;
text-decoration: none; text-decoration: none;
color: $modal-close-button-color; color: scale-color($primary, $lightness: 35%);
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: darken($modal-close-button-color,20); color: $primary;
} }
} }
} }
@ -122,11 +122,11 @@ animation: modal .25s;
li { li {
margin: 0 4px 8px 0; margin: 0 4px 8px 0;
a { a {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
cursor: pointer; cursor: pointer;
} }
a:hover { a:hover {
color: $primary_text_color; color: scale-color($primary, $lightness: 40%);
} }
} }
} }

21
app/assets/stylesheets/desktop/poster_expansion.scss
View File

@ -5,9 +5,9 @@
width: 460px; width: 460px;
left: 20px; left: 20px;
z-index: 990; z-index: 990;
box-shadow: 0 2px 6px $primary_border_color; box-shadow: 0 2px 6px scale-color($primary, $lightness: 90%);
margin-top: -2px; margin-top: -2px;
background-color: $primary_background_color; background-color: $secondary;
padding: 12px 12px 5px 12px; padding: 12px 12px 5px 12px;
h1 { h1 {
@ -18,7 +18,7 @@
margin-bottom: 8px; margin-bottom: 8px;
a { a {
color: $primary_text_color; color: $primary;
} }
} }
@ -29,7 +29,7 @@
margin-bottom: 5px; margin-bottom: 5px;
a { a {
color: $primary_text_color; color: $primary;
} }
} }
@ -37,16 +37,16 @@
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
margin-top: 0; margin-top: 0;
color: $secondary_text_color; color: $primary;
} }
.groups { .groups {
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
margin-top: 0; margin-top: 0;
color: $secondary_text_color; color: $primary;
.group-link { .group-link {
color: $primary_text_color; color: $primary;
} }
} }
@ -66,7 +66,7 @@
p.loading { p.loading {
margin-top: 45px; margin-top: 45px;
color: $secondary_text_color; color: $primary;
} }
.btn { .btn {
@ -74,7 +74,7 @@
} }
.new-user a { .new-user a {
color: $secondary_text_color; color: $primary;
} }
&.show-badges { &.show-badges {
@ -98,7 +98,7 @@
margin-top: 20px; margin-top: 20px;
h3 { h3 {
line-height: 43px; line-height: 43px;
color: $primary_text_color; color: $primary;
font-size: 14px; font-size: 14px;
margin-bottom: -8px; margin-bottom: -8px;
} }
@ -110,4 +110,3 @@
} }
} }
} }

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

@ -59,16 +59,16 @@
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
margin: 0 0 10px; margin: 0 0 10px;
border-top: 1px solid $primary-border-color; border-top: 1px solid scale-color($primary, $lightness: 90%);
.fa-thumb-tack {color: $primary_text_color;} .fa-thumb-tack {color: $primary;}
.fa-thumb-tack.unpinned {color: $secondary_text_color;} .fa-thumb-tack.unpinned {color: $primary;}
a.title {color: $primary_text_color;} a.title {color: $primary;}
a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} a.title:visited:not(.badge-notification) {color: scale-color($primary, $lightness: 35%);}
> tbody > tr { > tbody > tr {
&:nth-child(odd) { &:nth-child(even) {
background-color: lighten($secondary_background_color, 77%); background-color: scale-color($primary, $lightness: 96%);
} }
&.archived a { &.archived a {
opacity: 0.6; opacity: 0.6;
@ -79,11 +79,11 @@
} }
&.category-description { &.category-description {
td { td {
color: $nav-pills-border-color-active; color: $danger;
} }
} }
&.highlighted { &.highlighted {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 85%);
} }
} }
th, th,
@ -100,15 +100,14 @@
} }
} }
th { th {
color: $topic-list-th-color; color: $primary;
font-weight: normal; font-weight: normal;
font-size: 14px; font-size: 14px;
button i.fa {color: $topic-list-th-color;} button i.fa {color: $primary;}
} }
td { td {
//border-top: 1px solid $topic-list-td-border-color; color: scale-color($primary, $lightness: 50%);
color: $topic-list-td-color;
font-size: 14px; font-size: 14px;
} }
@ -116,7 +115,7 @@
padding: 0; padding: 0;
background: transparent; background: transparent;
&:hover { &:hover {
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 90%);
} }
} }
@ -135,7 +134,7 @@
font-size: 16px; font-size: 16px;
i.score { i.score {
color: $success_text_color; color: $success;
cursor: pointer; cursor: pointer;
} }
} }
@ -143,7 +142,7 @@
.topic-excerpt { .topic-excerpt {
font-size: 13px; font-size: 13px;
margin-top: 8px; margin-top: 8px;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
word-break: break-word; word-break: break-word;
padding-right: 50px; padding-right: 50px;
line-height: 1.4; line-height: 1.4;
@ -194,7 +193,7 @@
} }
.avatar { .avatar {
&.latest { &.latest {
@include box-shadow(0 0 6px 1px desaturate(lighten($link_color, 18%), 35%)); @include box-shadow(0 0 6px 1px desaturate(scale-color($tertiary, $lightness: 30%), 35%));
} }
} }
.num { .num {
@ -209,7 +208,7 @@
.sortable { .sortable {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
} }
@include unselectable; @include unselectable;
} }
@ -316,7 +315,7 @@
.featured-topic { .featured-topic {
margin: 6px 0; margin: 6px 0;
a.last-posted-at, a.last-posted-at:visited { a.last-posted-at, a.last-posted-at:visited {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
} }
} }
@ -358,7 +357,7 @@
.category-list-item { .category-list-item {
margin-bottom: 10px; margin-bottom: 10px;
#topic-list tbody tr:nth-child(even) { #topic-list tbody tr:nth-child(even) {
background-color: $primary_background_color; background-color: $secondary;
} }
th .badge-category { th .badge-category {
float: left; float: left;
@ -370,14 +369,14 @@
width: 165px; width: 165px;
} }
> footer { > footer {
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
border-top: 0; border-top: 0;
padding: 7px 10px; padding: 7px 10px;
background-color: lighten($topic-list-th-background-color, 2%); background-color: scale-color($primary, $lightness: 90%);
figure { figure {
float: left; float: left;
margin: 3px 7px 0 0; margin: 3px 7px 0 0;
color: lighten($topic-list-th-color, 5%); color: scale-color($primary, $lightness: 10%);
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
} }
@ -415,11 +414,11 @@
width: 200px; width: 200px;
margin: 0 auto; margin: 0 auto;
padding: 10px 0 10px 43px; padding: 10px 0 10px 43px;
color: $primary_background_color; color: $secondary;
font-size: 18px; font-size: 18px;
line-height: 25px; line-height: 25px;
background: { background: {
color: $primary_text_color; color: $primary;
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96_w.gif");
repeat: no-repeat; repeat: no-repeat;
position: 10px 50%; position: 10px 50%;
@ -434,8 +433,8 @@
.list-controls { .list-controls {
.home { .home {
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
color: $primary_text_color; color: $primary;
} }
.badge-category { .badge-category {
@ -471,7 +470,7 @@
background-color: transparent; background-color: transparent;
padding: 0; padding: 0;
border: 0; border: 0;
color: lighten($warning_text_color, 10%); color: scale-color($danger, $lightness: 20%);
font-size: 13px; font-size: 13px;
cursor: default; cursor: default;
} }
@ -512,8 +511,8 @@ ol.category-breadcrumb {
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
position: absolute; position: absolute;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
background-color: $primary_background_color; background-color: $secondary;
max-height: 350px; max-height: 350px;
padding: 8px 7px 0 7px; padding: 8px 7px 0 7px;
z-index: 100; z-index: 100;
@ -541,7 +540,7 @@ ol.category-breadcrumb {
position: fixed; position: fixed;
right: 20px; right: 20px;
padding: 5px; padding: 5px;
background-color: $primary_background_color; background-color: $secondary;
} }
button.dismiss-read { button.dismiss-read {

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

@ -1,13 +1,13 @@
.gap { .gap {
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
padding: 5px 0; padding: 5px 0;
color: lighten($primary_text_color, 35%); color: lighten($primary, 35%);
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
width: 80%; width: 80%;
&:hover { &:hover {
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
} }
@include medium-width { @include medium-width {
@ -55,10 +55,10 @@ h1 .topic-statuses .topic-status i {
right: 330px; right: 330px;
z-index: 400; z-index: 400;
padding: 2px 8px 3px; padding: 2px 8px 3px;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
font-size: 12px; font-size: 12px;
background: $primary_background_color; background: $secondary;
color: $secondary_text_color; color: scale-color($primary, $lightness: 50%);
@include medium-width { @include medium-width {
right: 300px; right: 300px;
} }
@ -111,7 +111,7 @@ section.post-menu-area, .post-actions {
nav.post-controls { nav.post-controls {
padding: 0; padding: 0;
button { button {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 60%);
margin-right: 2px; margin-right: 2px;
} }
@ -121,14 +121,14 @@ nav.post-controls {
} }
.show-replies { .show-replies {
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
padding: 8px 15px; padding: 8px 15px;
padding-bottom: 20px; padding-bottom: 20px;
margin-left: 0; margin-left: 0;
span.badge-posts {color: lighten($primary_text_color, 50%);} span.badge-posts {color: scale-color($primary, $lightness: 60%);}
&:hover { &:hover {
background: lighten($secondary_background_color, 76%); background: lighten($primary, 76%);
span.badge-posts {color: $primary_text_color;} span.badge-posts {color: $primary;}
} }
i { i {
margin-left: 5px; margin-left: 5px;
@ -137,18 +137,18 @@ nav.post-controls {
button.create { button.create {
margin-right: 0; margin-right: 0;
color: $link-color; color: $tertiary;
background: $emphasis_background_color; background: scale-color($tertiary, $lightness: 90%);
padding: 8px 20px; padding: 8px 20px;
margin-left: 10px; margin-left: 10px;
&:hover { color: $tertiary_text_color; &:hover { color: $secondary;
background: $emphasis_text_color; background: $tertiary;
} }
&:active { &:active {
background: $emphasis_background_color; background: scale-color($tertiary, $lightness: 40%);
@include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, .3)); @include box-shadow(inset 0 1px 3px rgba($primary, .3));
} }
@ -167,12 +167,12 @@ nav.post-controls {
margin-left: 3px; margin-left: 3px;
transition: all linear 0.15s; transition: all linear 0.15s;
&:hover { &:hover {
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
color: $primary_text_color; color: $primary;
} }
&:active { &:active {
@include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, .4)); @include box-shadow(inset 0 1px 3px rgba($primary, .4));
} }
&.hidden { &.hidden {
@ -183,12 +183,12 @@ nav.post-controls {
} }
&.delete:hover { &.delete:hover {
background: $warning_text_color; background: $danger;
color: $tertiary_text_color; color: $secondary;
} }
&.like:hover {color: $like_color; &.like:hover {color: $love;
background: $like_background_color; background: scale-color($love, $lightness: 75%);
} }
&.bookmark {padding: 8px 11px; } &.bookmark {padding: 8px 11px; }
@ -204,11 +204,11 @@ nav.post-controls {
} }
} }
&.last-read { &.last-read {
color: $warning_text_color; color: $danger;
} }
&.bookmarked { &.bookmarked {
&:before { &:before {
color: $link-color; color: $tertiary;
} }
} }
} }
@ -217,7 +217,7 @@ nav.post-controls {
.embedded-posts { .embedded-posts {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
a.mention {background: lighten($secondary_background_color, 70%);} a.mention {background: scale-color($primary, $lightness: 90%);}
&.bottom { &.bottom {
.topic-meta-data {padding-left: 13px;} .topic-meta-data {padding-left: 13px;}
&.hidden {display: block; opacity: 0; } &.hidden {display: block; opacity: 0; }
@ -241,13 +241,13 @@ nav.post-controls {
} }
&.top.span14 {padding-left: 0;} &.top.span14 {padding-left: 0;}
.topic-body, .topic-meta-data {border: none;} .topic-body, .topic-meta-data {border: none;}
.row {border-top: 1px solid $primary_border_color; padding-top: 7px;} .row {border-top: 1px solid scale-color($primary, $lightness: 90%); padding-top: 7px;}
.reply:first-of-type .row {border-top: none;} .reply:first-of-type .row {border-top: none;}
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
.quote .title, blockquote, .onebox, .onebox-result { .quote .title, blockquote, .onebox, .onebox-result {
background: lighten($secondary_background_color, 70%); background: scale-color($primary, $lightness: 95%);
border-left: 5px solid lighten($secondary_background_color, 60%); border-left: 5px solid scale-color($primary, $lightness: 75%);
} }
&.bottom { margin-top: -11px;} &.bottom { margin-top: -11px;}
@ -266,21 +266,21 @@ nav.post-controls {
width: 300px; width: 300px;
a { a {
font-weight: bold; font-weight: bold;
color: lighten($primary_text_color, 25%); color: scale-color($primary, $lightness: 30%);
} }
} }
.topic-meta-data-inside { .topic-meta-data-inside {
margin: -15px 0 0 0; margin: -15px 0 0 0;
color: $secondary_text_color; color: $primary;
} }
.topic-meta-data {padding-top: 20px;} .topic-meta-data {padding-top: 20px;}
} }
.bottom-round nav.post-controls .show-replies { .bottom-round nav.post-controls .show-replies {
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
margin-bottom: 0; margin-bottom: 0;
padding-bottom: 8px; padding-bottom: 8px;
&:hover {background: lighten($secondary_background_color, 76%); &:hover {background: scale-color($primary, $lightness: 90%);
} }
} }
@ -304,10 +304,10 @@ a.star {
.topic-map { .topic-map {
margin: 20px 0 0 0; margin: 20px 0 0 0;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
.buttons .btn { .buttons .btn {
&:hover {border: 1px solid $primary_border_color !important;} &:hover {border: 1px solid $primary !important;}
} }
.topic-links li { .topic-links li {
@ -316,13 +316,13 @@ a.star {
h3 { h3 {
margin-bottom: 4px; margin-bottom: 4px;
color: $primary_text_color; color: $primary;
line-height: 23px; line-height: 23px;
} }
h4 { h4 {
margin: 0 0 3px 0; margin: 0 0 3px 0;
color: $secondary_text_color; color: $primary;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
@ -340,7 +340,7 @@ a.star {
span.domain { span.domain {
font-size: 10px; font-size: 10px;
color: $secondary_text_color; color: $primary;
} }
@ -379,7 +379,7 @@ a.star {
line-height: 20px; line-height: 20px;
} }
.number, i { .number, i {
color: $secondary_text_color; color: $primary;
} }
.avatar + a { .avatar + a {
float: left; float: left;
@ -389,10 +389,10 @@ a.star {
.links, .links,
.information { .information {
padding: 7px 14px; padding: 7px 14px;
color: $primary_text_color; color: $primary;
} }
.information { .information {
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
} }
.participants { // PMs // .participants { // PMs //
@ -411,16 +411,16 @@ a.star {
float: right; float: right;
.btn { .btn {
border: 0; border: 0;
border-bottom: 1px solid lighten($secondary_background_color, 76%); border-bottom: 1px solid scale-color($primary, $lightness: 90%);
padding: 0 23px; padding: 0 23px;
color: $primary_text_color; color: $primary;
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
&:hover { &:hover {
background: lighten($secondary_background_color, 60%); background: scale-color($primary, $lightness: 75%);
color: $primary_text_color; color: $primary;
border: none !important; border: none !important;
border-bottom: 1px solid lighten($secondary_background_color, 60%) !important; border-bottom: 1px solid scale-color($primary, $lightness: 75%) !important;
span.badge-posts {color: $primary_text_color;} span.badge-posts {color: $primary;}
} }
&.collapsed { &.collapsed {
@ -440,7 +440,7 @@ a.star {
padding: 10px 10px 0 0; padding: 10px 10px 0 0;
p { p {
line-height: 32px; line-height: 32px;
color: $secondary_text_color; color: $primary;
} }
} }
@ -449,15 +449,14 @@ a.star {
clear: left; clear: left;
padding: 20px 0 15px 0; padding: 20px 0 15px 0;
#topic-list > tbody > tr:nth-child(even) { #topic-list > tbody > tr:nth-child(even) {
background-color: lighten($secondary_background_color, 77%); background-color: scale-color($primary, $lightness: 97%);
} }
#topic-list > tbody > tr:nth-child(odd) { #topic-list > tbody > tr:nth-child(odd) {
background-color: $primary_background_color; background-color: $secondary;
} }
table { table {
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
border-color: $primary_border_color;
margin-top: 10px; margin-top: 10px;
} }
@ -467,8 +466,8 @@ a.star {
} }
span.post-count { span.post-count {
background: $secondary_background_color; background: $primary;
color: $tertiary_text_color; color: $secondary;
opacity: .8; opacity: .8;
} }
@ -487,13 +486,13 @@ button.expand-post {
.quote-button { .quote-button {
display: none; display: none;
position: absolute; position: absolute;
background-color: lighten($secondary_background_color, 50%); background-color: scale-color($primary, $lightness: 50%);
color: $tertiary_text_color; color: $secondary;
padding: 10px; padding: 10px;
z-index: 401; z-index: 401;
&:hover { &:hover {
background-color: lighten($secondary_background_color, 50%); background-color: scale-color($primary, $lightness: 40%);
cursor: pointer; cursor: pointer;
} }
} }
@ -511,12 +510,12 @@ iframe {
width: 78%; width: 78%;
max-width: 800px; max-width: 800px;
.topic-statuses { .topic-statuses {
i { color: $primary_text_color; i { color: $primary;
} }
.unpinned { color: $secondary_text_color;} .unpinned { color: $primary;}
} }
.topic-link {color: $primary_text_color;} .topic-link {color: $primary;}
} }
@ -559,7 +558,7 @@ iframe {
.topic-meta-data { .topic-meta-data {
margin-bottom: 10px; margin-bottom: 10px;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
padding-top: 30px; padding-top: 30px;
width: 92px; width: 92px;
@ -599,16 +598,16 @@ iframe {
.username a { .username a {
font-weight: bold; font-weight: bold;
color: lighten($primary_text_color, 25%); color: scale-color($primary, $lightness: 20%);
font-size: 13px; font-size: 13px;
} }
.new-user a { .new-user a {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
} }
a.user-group { a.user-group {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
width: 100%; width: 100%;
} }
@ -620,7 +619,7 @@ iframe {
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
margin-top: 2px; margin-top: 2px;
a {color: $secondary_text_color;} a {color: $primary;}
} }
} }
@ -661,8 +660,8 @@ iframe {
a.mention { a.mention {
padding: 2px 4px; padding: 2px 4px;
color: $primary_text_color; color: $primary;
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
} }
@ -674,7 +673,7 @@ iframe {
.deleted { .deleted {
.topic-body { .topic-body {
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
} }
} }
@ -684,7 +683,7 @@ iframe {
.moderator { .moderator {
.topic-body { .topic-body {
background-color: $highlight_background_color; background-color: scale-color($highlight, $lightness: 60%);
} }
} }
@ -726,7 +725,7 @@ iframe {
.staff a { .staff a {
margin: -2px 0 0 0; margin: -2px 0 0 0;
background-color: $highlight_background_color; background-color: scale-color($highlight, $lightness: 60%);
} }
.topic-meta-data { .topic-meta-data {
@ -741,7 +740,7 @@ iframe {
.user-title { .user-title {
margin-top: 5px; margin-top: 5px;
color: $secondary_text_color; color: $primary;
overflow: hidden; overflow: hidden;
font-size: 80%; font-size: 80%;
line-height: 13px; line-height: 13px;
@ -749,7 +748,7 @@ iframe {
.info-line { .info-line {
margin: 10px 0; margin: 10px 0;
color: $secondary_text_color; color: $primary;
} }
@ -757,7 +756,7 @@ blockquote { /* solo quotes */
margin: 14px 0; margin: 14px 0;
padding: 12px; padding: 12px;
a.mention {background: lighten($secondary_background_color, 70%);} a.mention {background: scale-color($primary, $lightness: 90%);}
p:first-of-type {margin-top: 0;} p:first-of-type {margin-top: 0;}
p:last-of-type {margin-bottom: 0;} p:last-of-type {margin-bottom: 0;}
} }
@ -765,14 +764,14 @@ blockquote { /* solo quotes */
.quote { /* quotes with attribution */ .quote { /* quotes with attribution */
margin-top: 14px; margin-top: 14px;
blockquote {margin-top: 0; padding-top: 0; blockquote {margin-top: 0; padding-top: 0;
.onebox-result {background-color: $secondary_text_color;} .onebox-result {background-color: $primary;}
} }
.title { .title {
border-left: 5px solid $primary_border_color; border-left: 5px solid scale-color($primary, $lightness: 75%);
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
padding: 12px; padding: 12px;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
img {margin-top: -4px;} img {margin-top: -4px;}
@ -782,7 +781,7 @@ blockquote { /* solo quotes */
.quote-controls { .quote-controls {
float: right; float: right;
color: $secondary_text_color; color: $primary;
a { a {
margin: 0; margin: 0;
} }
@ -790,7 +789,7 @@ blockquote { /* solo quotes */
.quote-other-topic:before { .quote-other-topic:before {
display: inline-block; display: inline-block;
margin-left: 8px; margin-left: 8px;
color: $secondary_text_color; color: $primary;
font-family: "FontAwesome"; font-family: "FontAwesome";
position: relative; position: relative;
z-index: 20; z-index: 20;
@ -824,7 +823,7 @@ blockquote { /* solo quotes */
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 2px; margin-top: 2px;
} }
a {color: $secondary_text_color;} a {color: scale-color($primary, $lightness: 50%);}
li {margin-bottom: 10px;} li {margin-bottom: 10px;}
} }
} }
@ -832,10 +831,10 @@ blockquote { /* solo quotes */
.topic-body { .topic-body {
float: left; float: left;
position: relative; position: relative;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
padding: 20px 0 15px 0; padding: 20px 0 15px 0;
&.highlighted { &.highlighted {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 85%);
} }
img, svg { img, svg {
max-width: 100%; max-width: 100%;
@ -877,7 +876,7 @@ blockquote { /* solo quotes */
width: 0; width: 0;
height: 0; height: 0;
vertical-align: middle; vertical-align: middle;
border-top: 4px solid $primary_text_color; border-top: 4px solid $primary;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-left: 4px solid transparent; border-left: 4px solid transparent;
content: ""; content: "";
@ -894,9 +893,9 @@ blockquote { /* solo quotes */
padding: 4px 0; padding: 4px 0;
margin: 1px 0 0; margin: 1px 0 0;
list-style: none; list-style: none;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
box-shadow: 0 1px 5px rgba($primary_shadow_color, .4); box-shadow: 0 1px 5px rgba($primary, .4);
background-clip: padding-box; background-clip: padding-box;
span {font-size: 12px;} span {font-size: 12px;}
.title {font-weight: bold; display: block; font-size: 14px;} .title {font-weight: bold; display: block; font-size: 14px;}
@ -907,7 +906,7 @@ blockquote { /* solo quotes */
clear: both; clear: both;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
color: $primary_text_color; color: $primary;
& > div { & > div {
margin-left: 26px; margin-left: 26px;
@ -916,16 +915,16 @@ blockquote { /* solo quotes */
.dropdown-menu li > a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover {
color: $tertiary_text_color; color: $secondary;
text-decoration: none; text-decoration: none;
background-color: $emphasis_text_color; background-color: scale-color($tertiary, $lightness: 50%);
} }
.dropdown-menu .disabled > a, .dropdown-menu .disabled > a,
.dropdown-menu .disabled > a:hover { .dropdown-menu .disabled > a:hover {
text-decoration: none; text-decoration: none;
color: $primary_text_color; color: $primary;
background-color: $moderator_background_color; background-color: scale-color($highlight, $lightness: 25%);
cursor: default; cursor: default;
} }
@ -958,8 +957,8 @@ blockquote { /* solo quotes */
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
left: 50%; left: 50%;
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
border: 1px solid $emphasis_border_color; border: 1px solid $tertiary;
padding: 5px; padding: 5px;
margin-bottom: 5px; margin-bottom: 5px;
@ -987,7 +986,7 @@ blockquote { /* solo quotes */
} }
h3 { h3 {
font-size: 25px; font-size: 25px;
color: $primary_text_color; color: $primary;
margin-bottom: 5px; margin-bottom: 5px;
i { i {
margin-right: 7px; margin-right: 7px;
@ -995,28 +994,28 @@ blockquote { /* solo quotes */
} }
.btn { .btn {
border: none; border: none;
color: $tertiary_text_color; color: $secondary;
font-weight: normal; font-weight: normal;
margin-bottom: 10px; margin-bottom: 10px;
background: $btn-primary-background-color; background: scale-color($tertiary, $lightness: 40%);
&[href] { &[href] {
color: $tertiary_text_color; color: $secondary;
} }
&:hover &:hover
{ {
color: $tertiary_text_color; color: $secondary;
background: darken($btn-primary-background-color, 12%); background: scale-color($tertiary, $lightness: 20%);
} }
&:active { &:active {
@include linear-gradient(darken($btn-primary-background-color, 18%), darken($btn-primary-background-color, 12%)); @include linear-gradient(darken($tertiary, 18%), darken($tertiary, 12%));
@include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, 0.2)); @include box-shadow(inset 0 1px 3px rgba($primary, 0.2));
color: $tertiary_text_color; color: $secondary;
} }
&[disabled] { &[disabled] {
text-shadow: 0 1px 0 rgba($primary_shadow_color, 0.2); text-shadow: 0 1px 0 rgba($primary, 0.2);
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-dark); @include linear-gradient($tertiary, darken($tertiary, 20%));
@include box-shadow((inset 0 1px 0 rgba($primary_shadow_color, 0.33), inset 0 -1px 2px rgba($primary_shadow_color, 0.2))); @include box-shadow((inset 0 1px 0 rgba($primary, 0.33), inset 0 -1px 2px rgba($primary, 0.2)));
} }
} }
} }
@ -1025,8 +1024,8 @@ blockquote { /* solo quotes */
article.boxed { article.boxed {
.select-posts { .select-posts {
button.select-post { button.select-post {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
color: $tertiary_text_color; color: $secondary;
} }
} }
.topic-body { .topic-body {
@ -1047,12 +1046,12 @@ blockquote { /* solo quotes */
top: 4px; top: 4px;
button { button {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 70%);
border-top: 1px solid $tertiary_border_color; border-top: 1px solid $tertiary;
border-left: 1px solid $tertiary_border_color; border-left: 1px solid $tertiary;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
border-right: 1px solid $primary_border_color; border-right: 1px solid scale-color($primary, $lightness: 90%);
color: $secondary_text_color; color: $primary;
} }
} }
} }
@ -1074,7 +1073,7 @@ a.attachment:before {
position: absolute; position: absolute;
top: 0; top: 0;
left: 10px; left: 10px;
color: lighten($primary_text_color, 76%); color: scale-color($primary, $lightness: 90%);
font: 90px/1 FontAwesome; font: 90px/1 FontAwesome;
content: "\f05c"; content: "\f05c";
z-index: -5; z-index: -5;

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

@ -1,5 +1,5 @@
.post-info a { .post-info a {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 60%);
} }
@ -49,7 +49,7 @@
margin: 0; margin: 0;
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a {color: $primary_text_color;} a {color: $primary;}
a.badge-category { vertical-align: top; margin-top: 4px; } a.badge-category { vertical-align: top; margin-top: 4px; }
a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
} }
@ -63,11 +63,11 @@
.private-message-glyph { display: none; } .private-message-glyph { display: none; }
} }
.private-message-glyph { color: lighten($primary_text_color, 60%); } .private-message-glyph { color: scale-color($primary, $lightness: 75%); }
.private_message #topic-title .private-message-glyph { display: inline; } .private_message #topic-title .private-message-glyph { display: inline; }
#topic-closing-info { #topic-closing-info {
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
padding-top: 10px; padding-top: 10px;
height: 20px; height: 20px;
} }
@ -85,8 +85,8 @@
i { i {
font-size: 12px; font-size: 12px;
margin-right: 5px; margin-right: 5px;
background: $primary_background_color; background: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
padding: 2px 4px; padding: 2px 4px;
border-radius: 20px; border-radius: 20px;
transition: linear 0.15s; transition: linear 0.15s;
@ -96,12 +96,12 @@
a.reply-new { a.reply-new {
position: absolute; position: absolute;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
margin-top: -2px;} margin-top: -2px;}
a:hover.reply-new { a:hover.reply-new {
color: $link-color; color: $tertiary;
i {background: $emphasis_background_color; i {background: scale-color($tertiary, $lightness: 75%);
border: 1px solid $emphasis_border_color; border: 1px solid $tertiary;
padding: 2px 4px; padding: 2px 4px;
} }
} }
@ -113,8 +113,8 @@ a:hover.reply-new {
display: none; display: none;
} }
border: none; border: none;
background-color: lighten($primary_text_color, 70%); background-color: scale-color($primary, $lightness: 90%);
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
width: 130px; width: 130px;
height: 34px; height: 34px;
@ -134,7 +134,7 @@ a:hover.reply-new {
left: 4px; left: 4px;
border: 0; border: 0;
background: none; background: none;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
width: 50%; width: 50%;
text-align: left; text-align: left;
height: 30px; height: 30px;
@ -149,7 +149,7 @@ a:hover.reply-new {
} }
&:disabled { &:disabled {
cursor: default; cursor: default;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
} }
} }
h4 { h4 {
@ -162,10 +162,10 @@ a:hover.reply-new {
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 0; width: 0;
border-right: 1px solid $primary_border_color; border-right: 1px solid scale-color($primary, $lightness: 90%);
// background-color: #d4eaf4; // background-color: #d4eaf4;
// background-color: #C5E8F7; // background-color: #C5E8F7;
background-color: $success_background_color; background-color: scale-color($success, $lightness: 60%);
transition: width .75s; transition: width .75s;
} }
} }
@ -183,14 +183,14 @@ a:hover.reply-new {
} }
} }
.heatmap-high {color: $heatmap-high !important;} .heatmap-high {color: scale-color($danger, $lightness: 20%) !important;}
.heatmap-med {color: $heatmap-med !important;} .heatmap-med {color: $danger !important;}
.heatmap-low {color: $heatmap-low !important;} .heatmap-low {color: scale-color($danger, $lightness: -20%) !important;}
#topic-filter { #topic-filter {
background-color: $highlight_background_color; background-color: scale-color($highlight, $lightness: 25%);
padding: 8px; padding: 8px;
bottom: 0; bottom: 0;
position: fixed; position: fixed;
@ -209,8 +209,8 @@ pre {
white-space:pre-wrap; white-space:pre-wrap;
display: block; display: block;
padding: 5px 10px; padding: 5px 10px;
color: $primary_text_color; color: $primary;
background: lighten($secondary_background_color, 76%); background: scale-color($primary, $lightness: 90%);
max-height: 500px; max-height: 500px;
} }
} }
@ -226,7 +226,7 @@ sup{top:-0.5em; }
sub{bottom:-0.25em; } sub{bottom:-0.25em; }
figure{margin:0; } figure{margin:0; }
fieldset{ fieldset{
border:1px solid $primary_border_color; border:1px solid scale-color($primary, $lightness: 90%);
margin:0 2px; margin:0 2px;
padding:0.35em 0.625em 0.75em; padding:0.35em 0.625em 0.75em;
} }
@ -237,11 +237,11 @@ legend{
kbd kbd
{ {
background-color: $primary_background_color; background-color: $secondary;
border:1px solid $primary_border_color; border:1px solid scale-color($primary, $lightness: 90%);
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 0 rgba($primary_shadow_color, .9); box-shadow: 0 1px 0 rgba($primary, .9);
color: $primary_text_color; color: $primary;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
line-height: 1.4; line-height: 1.4;

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

@ -17,7 +17,7 @@
line-height: 18px; line-height: 18px;
} }
.description, .hint { .description, .hint {
color: $secondary_text_color; color: $primary;
} }
.hint { .hint {
font-style: italic; font-style: italic;

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

@ -2,7 +2,7 @@
.groups { .groups {
.group-link { .group-link {
color: $link_color; color: $tertiary;
} }
} }
@ -49,7 +49,7 @@
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
background-color: $secondary_background_color; background-color: $primary;
} }
#profile-background-controls { #profile-background-controls {
@ -57,13 +57,13 @@
} }
.static { .static {
color: $primary_text_color; color: $primary;
margin-top: 5px; margin-top: 5px;
margin-left: 5px; margin-left: 5px;
display: inline-block; display: inline-block;
} }
.instructions { .instructions {
color: $secondary_text_color; color: $primary;
margin-left: 160px; margin-left: 160px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 10px; margin-bottom: 10px;
@ -74,12 +74,12 @@
margin-left: 3px; margin-left: 3px;
} }
.instructions a[href] { .instructions a[href] {
color: $link_color; color: $tertiary;
} }
.warning { .warning {
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 30%);
padding: 5px 8px; padding: 5px 8px;
color: $primary_background_color; color: $secondary;
width: 520px; width: 520px;
} }
@ -97,7 +97,7 @@
float: left; float: left;
h3 { h3 {
color: $primary_text_color; color: $primary;
margin: 20px 0 10px 0; margin: 20px 0 10px 0;
} }
@ -130,15 +130,15 @@
} }
span.last-seen-at { span.last-seen-at {
float: right; float: right;
color: $secondary_text_color; color: $primary;
} }
} }
} }
.user-content { .user-content {
padding: 10px 8px; padding: 10px 8px;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);
margin-bottom: 10px; margin-bottom: 10px;
.btn.right { .btn.right {
@ -155,25 +155,25 @@
th { th {
text-align: left; text-align: left;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
padding: 5px; padding: 5px;
} }
td { td {
padding: 5px; padding: 5px;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
} }
} }
} }
.about { .about {
background-color: $secondary_background_color; background-color: $primary;
background-size: cover; background-size: cover;
background-position: center center; background-position: center center;
margin-bottom: 10px; margin-bottom: 10px;
overflow: hidden; overflow: hidden;
color: $secondary_text_color; color: $primary;
.details { .details {
@ -194,34 +194,33 @@
} }
a[href] { a[href] {
color: $secondary_link_color; color: $secondary;
} }
img.avatar { img.avatar {
border: 3px solid $tertiary_border_color;
margin-bottom: 10px; margin-bottom: 10px;
background-color: $secondary_background_color; background-color: $primary;
} }
.suspended { .suspended {
color: $warning_text_color; color: $danger;
} }
.primary { .primary {
margin-top: 20px; margin-top: 20px;
float: left; float: left;
width: 65%; width: 65%;
color: $tertiary_text_color; color: $secondary;
text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px; text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px;
h1, h2 {font-weight: bold;} h1, h2 {font-weight: bold;}
.bio { .bio {
color: $tertiary_text_color; color: $secondary;
text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px; text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px;
a[href] { a[href] {
color: $tertiary_text_color; color: $secondary;
text-decoration: underline; text-decoration: underline;
text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px; text-shadow: rgba(0, 0, 0, 0.5) 0 1px 1px;
@ -232,26 +231,26 @@
.secondary { .secondary {
float: right; float: right;
background-color: rgba($tertiary_background_color, .9); background-color: rgba(scale-color($primary, $lightness: 50%), .9);
text-align: right; text-align: right;
padding: 0 20px; padding: 0 20px;
max-width: 165px; max-width: 165px;
dd { dd {
color: rgba($tertiary_text_color, .7); color: rgba($secondary, .7);
margin: 0 0 7px 0; margin: 0 0 7px 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
dt { dt {
color: rgba($tertiary_text_color, .7); color: rgba($secondary, .7);
margin: 0; margin: 0;
} }
} }
} }
.controls { .controls {
background-color: $tertiary_background_color; background-color: scale-color($primary, $lightness: 50%);
padding: 12px; padding: 12px;
height: 30px; height: 30px;
@ -279,7 +278,7 @@
.avatar { .avatar {
float: left; float: left;
margin-right: 10px; margin-right: 10px;
border: 2px solid $tertiary_border_color; border: 2px solid $tertiary;
width: 45px; width: 45px;
height: 45px; height: 45px;
} }
@ -298,19 +297,20 @@
} }
} }
.user-stream { .user-stream {
.excerpt { .excerpt {
margin: 5px 0; margin: 5px 0;
font-size: 13px; font-size: 13px;
word-wrap: break-word; word-wrap: break-word;
color: $primary_text_color; color: $primary;
} }
.item.moderator-action { .item.moderator-action {
background-color: $moderator_background_color; background-color: scale-color($highlight, $lightness: 50%);
} }
.item.deleted { .item.deleted {
opacity: 0.8; opacity: 0.8;
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 50%);
} }
.item.hidden { .item.hidden {
display: block; display: block;
@ -318,19 +318,19 @@
} }
.item { .item {
padding: 20px 8px 15px 8px; padding: 20px 8px 15px 8px;
background-color: $primary_background_color; background-color: $secondary;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
} }
.type { .type {
color: $primary_text_color; color: $primary;
} }
span.name { span.name {
color: $secondary_text_color; color: $primary;
} }
.time { .time {
display: block; display: block;
float: right; float: right;
color: $secondary_text_color; color: $primary;
margin-right: 8px; margin-right: 8px;
font-size: 11px; font-size: 11px;
} }
@ -344,7 +344,7 @@
font-size: 14px; font-size: 14px;
} }
.edit-reason { .edit-reason {
background-color: $moderator_background_color; background-color: scale-color($highlight, $lightness: 25%);
padding: 3px 5px 5px 5px; padding: 3px 5px 5px 5px;
} }
} }

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

@ -12,7 +12,7 @@ article.post {
.quote .title { .quote .title {
border-left: 5px solid $primary_border_color; border-left: 5px solid $primary_border_color;
background-color: lighten($secondary_background_color, 76%); background-color: lighten($primary, 76%);
padding: 10px 10px 0 12px; padding: 10px 10px 0 12px;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
} }
@ -57,7 +57,7 @@ article.post {
} }
a.new-user { a.new-user {
color: lighten($primary_text_color, 35%); color: lighten($primary, 35%);
} }
} }
} }

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

@ -28,20 +28,20 @@ display: none;
#file-uploading { #file-uploading {
left: 51%; left: 51%;
font-size: 12px; font-size: 12px;
color: darken($tertiary_text_color, 40%); color: scale-color($secondary, $lightness: 50%);
} }
#draft-status { #draft-status {
right: 70px; right: 70px;
color: lighten($primary_text_color, 60%); color: scale-color($primary, $lightness: 75%);
&.flash { &.flash {
color: $warning_text_color; color: $danger;
} }
} }
@include transition(height 0.4s ease); @include transition(height 0.4s ease);
width: 100%; width: 100%;
z-index: 1039; z-index: 1039;
height: 0; height: 0;
background-color: $composer_background_color; background-color: scale-color($primary, $lightness: 90%);
bottom: 0; bottom: 0;
font-size: 14px; font-size: 14px;
position: fixed; position: fixed;
@ -52,7 +52,7 @@ display: none;
right: 13px; right: 13px;
position: absolute; position: absolute;
font-size: 15px; font-size: 15px;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
text-decoration: none; text-decoration: none;
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
@ -87,7 +87,7 @@ display: none;
&.draft { &.draft {
height: 60px !important; height: 60px !important;
cursor: pointer; cursor: pointer;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
.draft-text { .draft-text {
display: block; display: block;
position: absolute; position: absolute;
@ -102,7 +102,7 @@ display: none;
} }
&.saving { &.saving {
height: 40px !important; height: 40px !important;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
.saving-text { .saving-text {
display: block; display: block;
} }
@ -124,7 +124,7 @@ display: none;
height: 70px; height: 70px;
text-indent: -9999em; text-indent: -9999em;
background: { background: {
color: $primary_text_color; color: $primary;
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96_w.gif");
repeat: no-repeat; repeat: no-repeat;
size: 35px; size: 35px;
@ -197,14 +197,14 @@ display: none;
#reply-title { #reply-title {
margin-right: 10px; margin-right: 10px;
&:disabled { &:disabled {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 75%);
} }
} }
#wmd-input:disabled { #wmd-input:disabled {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 75%);
} }
#wmd-input, #wmd-preview { #wmd-input, #wmd-preview {
color: $primary_text_color; color: darken($primary, 40%);
video { video {
max-width: 100%; max-width: 100%;
@ -216,7 +216,7 @@ display: none;
} }
} }
#wmd-preview { #wmd-preview {
border: 1px dashed $primary_border_color; border: 1px dashed scale-color($primary, $lightness: 90%);
overflow: auto; overflow: auto;
visibility: visible; visibility: visible;
p { p {
@ -298,7 +298,7 @@ display: none;
min-height: 100%; min-height: 100%;
padding: 7px; padding: 7px;
margin: 0; margin: 0;
background-color: $primary_background_color; background-color: $secondary;
word-wrap: break-word; word-wrap: break-word;
// set up proper header margins in post preview // set up proper header margins in post preview
@ -357,8 +357,8 @@ display: none;
#wmd-button-bar { #wmd-button-bar {
top: 0; top: 0;
position: absolute; position: absolute;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
background-color: $primary_background_color; background-color: $secondary;
z-index: 100; z-index: 100;
} }
} }

16
app/assets/stylesheets/mobile/discourse.scss
View File

@ -3,7 +3,7 @@
// throughout the Discourse application // throughout the Discourse application
body { body {
background-color: $primary_background_color; background-color: $secondary;
} }
.container { .container {
@ -25,25 +25,25 @@ body {
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
} }
&.white { &.white {
background-color: $primary_background_color; background-color: $secondary;
} }
} }
#main { #main {
.fa-star.starred { .fa-star.starred {
color: $highlight_text_color; color: $highlight;
} }
a.star { a.star {
display: inline-block; display: inline-block;
font-size: 15px; font-size: 15px;
line-height: 1; line-height: 1;
color: $secondary_text_color; color: $primary;
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
content: "\f005"; content: "\f005";
} }
&.starred { &.starred {
color: #fe1; color: #fe1;
text-shadow: 0 0 3px rgba($primary_shadow_color, 0.5); text-shadow: 0 0 3px rgba($primary, 0.5);
@include hover { @include hover {
opacity: 1; opacity: 1;
&:before { &:before {
@ -91,8 +91,8 @@ body {
blockquote { blockquote {
/* 13px left is intentional here to properly align with post quotes */ /* 13px left is intentional here to properly align with post quotes */
padding: 10px 8px 10px 13px; padding: 10px 8px 10px 13px;
background-color: $quote-background; background-color: scale-color($secondary, $lightness: 95%);
border-left: 5px solid darken($quote-background, 20%); border-left: 5px solid scale-color($secondary, $lightness: 75%);
p { p {
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
@ -108,7 +108,7 @@ blockquote {
display: inline-block; display: inline-block;
i { i {
font-size: 15px; font-size: 15px;
color: darken($tertiary_text_color, 60%); color: darken($secondary, 60%);
} }
} }
} }

48
app/assets/stylesheets/mobile/header.scss
View File

@ -9,8 +9,8 @@
position: absolute; position: absolute;
top: 0; top: 0;
z-index: 1001; z-index: 1001;
background-color: $primary_background_color; background-color: $secondary;
box-shadow: 0 0 3px rgba($primary_shadow_color, .6); box-shadow: 0 0 3px rgba($primary, .6);
.docked & { .docked & {
position: fixed; position: fixed;
@ -47,7 +47,7 @@
float: left; float: left;
display: none; display: none;
a { a {
color: $primary_text_color; color: darken($primary, 40%);
font-size: 14px; font-size: 14px;
line-height: 40px; line-height: 40px;
} }
@ -66,24 +66,24 @@
.icon { .icon {
display: block; display: block;
padding: 4px; padding: 4px;
color: $nav-button-color; color: scale-color($primary, $lightness: 50%);
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: $nav-button-color-hover; color: $primary;
background-color: $nav-button-background-color-hover; background-color: scale-color($primary, $lightness: 75%);
} }
&:active { &:active {
color: $nav-button-color-active; color: $primary;
background-color: $nav-button-background-color-active; background-color: scale-color($primary, $lightness: 75%);
} }
} }
.active .icon { .active .icon {
position: relative; position: relative;
color: lighten($primary_text_color, 60%); color: scale-color($primary, $lightness: 75%);
background-color: $primary_background_color; background-color: $secondary;
cursor: default; cursor: default;
@include box-shadow((6px 0 6px -6px rgba($primary_shadow_color, 0.2), -6px 0 6px -6px rgba($primary_shadow_color, 0.2), inset 0 13px 13px -13px rgba($primary_shadow_color, 0.1))); @include box-shadow((6px 0 6px -6px rgba($primary, 0.2), -6px 0 6px -6px rgba($primary, 0.2), inset 0 13px 13px -13px rgba($primary, 0.1)));
&:after { &:after {
display: block; display: block;
position: absolute; position: absolute;
@ -93,7 +93,7 @@
width: 100%; width: 100%;
height: 0; height: 0;
content: ""; content: "";
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
} }
} }
[class^="fa fa-"] { [class^="fa fa-"] {
@ -114,16 +114,16 @@
} }
.unread-notifications { .unread-notifications {
right: -4px; right: -4px;
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
color: $emphasis_text_color; color: $tertiary;
} }
.unread-private-messages { .unread-private-messages {
left: -4px; left: -4px;
background-color: $success_text_color; background-color: $success;
} }
} }
.flagged-posts { .flagged-posts {
background-color: $warning_text_color; background-color: $danger;
} }
} }
@ -146,9 +146,9 @@
right: 0; right: 0;
z-index: 1100; z-index: 1100;
margin-top: -1px; margin-top: -1px;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);;
background-color: $primary_background_color; background-color: $secondary;
@include box-shadow(0 1px 1px rgba($primary_shadow_color, 0.2)); @include box-shadow(0 1px 1px rgba($primary, 0.2));
// Common // Common
@ -165,7 +165,7 @@
} }
} }
.heading { .heading {
color: $primary_text_color; color: $primary;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
@ -173,7 +173,7 @@
} }
.selected { .selected {
background-color: $header-item-highlight; background-color: $tertiary;
} }
// Notifications // Notifications
@ -183,10 +183,10 @@
color: #777; color: #777;
} }
li { li {
background-color: $header-item-highlight; background-color: $tertiary;
} }
.read { .read {
background-color: $primary_background_color; background-color: $secondary;
} }
.none { .none {
padding: 5px; padding: 5px;
@ -202,7 +202,7 @@
padding: 5px; padding: 5px;
font-size: 16px; font-size: 16px;
&:focus { &:focus {
@include box-shadow((inset 0 1px 1px rgba($primary_shadow_color, 0.075), 0 0 4px rgba(82, 168, 236, 0.6))); @include box-shadow((inset 0 1px 1px rgba($primary, 0.075), 0 0 4px rgba(82, 168, 236, 0.6)));
} }
} }
.searching { .searching {

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

@ -16,7 +16,7 @@
#login-form { #login-form {
a { a {
color: $secondary_text_color; color: $primary;
cursor: pointer; cursor: pointer;
} }
label {float: left; display: block;} label {float: left; display: block;}

10
app/assets/stylesheets/mobile/modal.scss
View File

@ -16,12 +16,12 @@
overflow: auto; overflow: auto;
width: 100%; width: 100%;
height: auto; height: auto;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($secondary, $lightness: 90%);
border: 1px solid rgba(0, 0, 0, 0.3); border: 1px solid rgba(0, 0, 0, 0.3);
@include border-radius-all (6px); @include border-radius-all (6px);
box-shadow: 0 3px 7px rgba($primary_shadow_color, 0.3); box-shadow: 0 3px 7px rgba($primary, 0.3);
background-clip: padding-box; background-clip: padding-box;
} }
@ -50,7 +50,7 @@
} }
.modal-header { .modal-header {
h3 { h3 {
color: $nav-pills-background-color-active; color: $danger;
font-size: 15px; font-size: 15px;
padding: 0 0 0 20px; padding: 0 0 0 20px;
} }
@ -60,7 +60,7 @@
padding: 15px; // more pixels to touch padding: 15px; // more pixels to touch
margin: -15px 0 0 0; margin: -15px 0 0 0;
text-decoration: none; text-decoration: none;
color: $modal-close-button-color; color: $primary;
cursor: pointer; cursor: pointer;
} }
} }

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

@ -44,13 +44,13 @@
width: 100%; width: 100%;
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);;
> tbody > tr { > tbody > tr {
background-color: $primary_background_color; background-color: $secondary;
&:nth-child(even) { &:nth-child(even) {
background-color: darken($primary_background_color, 4%); background-color: darken($secondary, 4%);
} }
&.archived a { &.archived a {
opacity: 0.6; opacity: 0.6;
@ -61,7 +61,7 @@
} }
} }
&.highlighted { &.highlighted {
background-color: $highlight_background_color; background-color: scale-color($tertiary, $lightness: 75%);
} }
} }
th, th,
@ -78,7 +78,7 @@
} }
} }
th { th {
color: $topic-list-th-color; color: $primary;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
&:first-of-type { &:first-of-type {
@ -89,14 +89,14 @@
} }
} }
td { td {
color: $topic-list-td-color; color: $primary;
font-size: 14px; font-size: 14px;
} }
.main-link { .main-link {
font-size: 16px; font-size: 16px;
i.score { i.score {
color: $success_text_color; color: $success;
cursor: pointer; cursor: pointer;
} }
} }
@ -104,7 +104,7 @@
.topic-excerpt { .topic-excerpt {
font-size: 14px; font-size: 14px;
margin-top: 8px; margin-top: 8px;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
word-break: break-word; word-break: break-word;
} }
@ -133,7 +133,7 @@
margin-right: 14px; margin-right: 14px;
} }
.fa { .fa {
color: lighten($black, 50%); color: scale-color($primary, $lightness: 50%);
} }
.fa-heart{ .fa-heart{
position: relative; position: relative;
@ -194,7 +194,7 @@
.featured-topic { .featured-topic {
margin: 8px 0; margin: 8px 0;
a.last-posted-at, a.last-posted-at:visited { a.last-posted-at, a.last-posted-at:visited {
color: lighten($primary_text_color, 50%); color: scale-color($primary, $lightness: 50%);
} }
} }
} }
@ -221,7 +221,7 @@
.category-list-item { .category-list-item {
margin-bottom: 10px; margin-bottom: 10px;
#topic-list tbody tr:nth-child(even) { #topic-list tbody tr:nth-child(even) {
background-color: $primary_background_color; background-color: $secondary;
} }
.badge-category { .badge-category {
float: left; float: left;
@ -232,18 +232,17 @@
display: none; display: none;
} }
> footer { > footer {
border-bottom: 1px solid $topic-list-border-color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
border-top: 0; border-top: 0;
padding: 7px 10px; padding: 7px 10px;
background-color: lighten($topic-list-th-background-color, 2%); background-color: scale-color($primary, $lightness: 95%);
@include box-shadow(0 1px 3px rgba($primary_shadow_color, 0.22)); @include box-shadow(0 1px 3px rgba($primary, 0.22));
figure { figure {
float: left; float: left;
margin: 3px 7px 0 0; margin: 3px 7px 0 0;
color: lighten($topic-list-th-color, 5%); color: scale-color($primary, $lightness: 10%);
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
text-shadow: 0 1px 0 $secondary_shadow_color;
} }
figcaption { figcaption {
display: inline; display: inline;
@ -279,11 +278,11 @@
width: 200px; width: 200px;
margin: 0 auto; margin: 0 auto;
padding: 10px 0 10px 43px; padding: 10px 0 10px 43px;
color: $tertiary_text_color; color: $secondary;
font-size: 18px; font-size: 18px;
line-height: 25px; line-height: 25px;
background: { background: {
color: $primary_text_color; color: #000;
image: image-url("spinner_96_w.gif"); image: image-url("spinner_96_w.gif");
repeat: no-repeat; repeat: no-repeat;
position: 10px 50%; position: 10px 50%;
@ -297,8 +296,8 @@
.list-controls { .list-controls {
.home { .home {
color: $primary_text_color; color: $primary;
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
} }
.badge-category { .badge-category {
@ -331,7 +330,7 @@
background-color: transparent; background-color: transparent;
padding: 0; padding: 0;
border: 0; border: 0;
color: lighten($warning_text_color, 10%); color: scale-color($danger, $lightness: 20%);
font-size: 13px; font-size: 13px;
cursor: default; cursor: default;
} }
@ -373,7 +372,7 @@ span.posted {
width: 0; width: 0;
height: 0; height: 0;
vertical-align: middle; vertical-align: middle;
border-top: 4px solid $primary_text_color; border-top: 4px solid $primary;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-left: 4px solid transparent; border-left: 4px solid transparent;
content: ""; content: "";
@ -390,8 +389,8 @@ span.posted {
padding: 4px 0; padding: 4px 0;
margin: 1px 0 0; margin: 1px 0 0;
list-style: none; list-style: none;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);;
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);
@ -406,14 +405,14 @@ span.posted {
clear: both; clear: both;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
color: $primary_text_color; color: $primary;
} }
.dropdown-menu li > a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover {
color: $tertiary_text_color; color: $secondary;
text-decoration: none; text-decoration: none;
background-color: $emphasis_text_color; background-color: $tertiary;
} }
.open > .dropdown-menu { .open > .dropdown-menu {
display: block; display: block;
@ -445,8 +444,8 @@ ol.category-breadcrumb {
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
position: absolute; position: absolute;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);;
background-color: $primary_background_color; background-color: $secondary;
width: 200px; width: 200px;
height: 200px; height: 200px;
padding: 8px 5px 0 7px; padding: 8px 5px 0 7px;
@ -464,4 +463,3 @@ ol.category-breadcrumb {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }

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

@ -1,13 +1,13 @@
.gap { .gap {
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
padding: 5px 15px; padding: 5px 15px;
color: $secondary_text_color; color: $primary;
text-align: center; text-align: center;
margin: 0 10px; margin: 0 10px;
} }
.topic-post { .topic-post {
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
padding: 6px 0 3px 0; padding: 6px 0 3px 0;
&:first-of-type { &:first-of-type {
border-top: none; border-top: none;
@ -15,11 +15,11 @@
} }
nav.post-controls { nav.post-controls {
background-color: $primary_background_color; background-color: $secondary;
padding: 0; padding: 0;
border-right: 1px solid $primary_border_color; border-right: 1px solid scale-color($primary, $lightness: 90%);
margin-top: 10px; margin-top: 10px;
button {color: lighten($primary_text_color, 35%); button {color: scale-color($primary, $lightness: 50%);
border-radius: 4px; border-radius: 4px;
margin-right: 2px; margin-right: 2px;
@ -42,7 +42,7 @@ span.badge-posts {
button.create { button.create {
float: right !important; float: right !important;
margin-right: 0; margin-right: 0;
color: $primary_text_color; color: $primary;
padding-right: 7px;} padding-right: 7px;}
} }
@ -75,11 +75,10 @@ button {
} }
} }
&.last-read { &.last-read {
color: $warning_text_color; color: $danger;}
}
&.bookmarked { &.bookmarked {
&:before { &:before {
color: $bookmarkColor; color: $tertiary;
} }
} }
} }
@ -130,17 +129,17 @@ a.star {
border-radius: 5px; border-radius: 5px;
margin: 15px 10px 20px 10px; margin: 15px 10px 20px 10px;
border: 1px solid $primary_border_color; border: 1px solid scale-color($primary, $lightness: 90%);;
h3 { h3 {
margin-bottom: 4px; margin-bottom: 4px;
color: $primary_text_color; color: $primary;
line-height: 23px; line-height: 23px;
} }
h4 { h4 {
margin: 0 0 3px 0; margin: 0 0 3px 0;
color: $secondary_text_color; color: $primary;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
@ -197,7 +196,7 @@ a.star {
line-height: 20px; line-height: 20px;
} }
.number { .number {
color: $emphasis_text_color; color: $tertiary;
} }
.avatar + a { .avatar + a {
float: left; float: left;
@ -207,11 +206,11 @@ a.star {
.links, .links,
.information { .information {
padding: 7px 14px; padding: 7px 14px;
color: $primary_text_color; color: $primary;
} }
.information { .information {
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);
} }
.topic-links { .topic-links {
.badge-notification { .badge-notification {
@ -222,15 +221,15 @@ a.star {
float: right; float: right;
.btn { .btn {
border: 0; border: 0;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);;
border-left: 1px solid $primary_border_color; border-left: 1px solid scale-color($primary, $lightness: 90%);;
padding: 0 23px; padding: 0 23px;
color: $primary_text_color; color: $primary;
background: lighten($secondary_background_color, 60%); background: scale-color($primary, $lightness: 75%);
&:hover { &:hover {
background: lighten($secondary_background_color, 60%); background: scale-color($primary, $lightness: 75%);
color: $primary_text_color; color: $primary;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
} }
.fa { .fa {
@ -243,7 +242,7 @@ a.star {
} }
#topic-footer-buttons { #topic-footer-buttons {
border-top: 1px solid $primary_border_color; border-top: 1px solid scale-color($primary, $lightness: 90%);;
padding: 20px 10px 0 10px; padding: 20px 10px 0 10px;
} }
@ -267,8 +266,8 @@ a.star {
span.post-count { span.post-count {
background: $secondary_background_color; background: $primary;
color: $tertiary_text_color; color: $secondary;
opacity: .8; opacity: .8;
} }
@ -283,7 +282,7 @@ span.post-count {
#topic-title { #topic-title {
z-index: 1000; z-index: 1000;
background: lighten($secondary_background_color, 76%); background:scale-color($primary, $lightness: 90%);
margin: 0 0 0 0 !important; margin: 0 0 0 0 !important;
padding: 15px 10px 15px 10px; padding: 15px 10px 15px 10px;
} }
@ -294,20 +293,20 @@ span.post-count {
height: auto; height: auto;
} }
&.moderator { &.moderator {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
} }
} }
.quote-button { .quote-button {
display: none; display: none;
position: absolute; position: absolute;
background-color: lighten($secondary_background_color, 35%); background-color: scale-color($primary, $lightness: 50%);
color: $primary_text_color; color: $primary;
padding: 10px; padding: 10px;
width: 90px; width: 90px;
&:hover { &:hover {
background-color: lighten($secondary_background_color, 50%); background-color: scale-color($primary, $lightness: 50%);
cursor: pointer; cursor: pointer;
} }
} }
@ -392,11 +391,11 @@ iframe {
} }
.deleted { .deleted {
background-color: $warning_background_color; background-color: $danger;
} }
#show-topic-admin { #show-topic-admin {
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
right: 0; right: 0;
border-right: 0; border-right: 0;
padding-right: 4px; padding-right: 4px;
@ -416,7 +415,7 @@ iframe {
} }
.new-user a { .new-user a {
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
} }
.topic-meta-data { .topic-meta-data {
@ -442,7 +441,7 @@ blockquote {
.quote-controls { .quote-controls {
float: right; float: right;
color: $primary_text_color; color: $primary;
a { a {
margin: 0; margin: 0;
} }
@ -450,7 +449,7 @@ blockquote {
.quote-other-topic:before { .quote-other-topic:before {
display: inline-block; display: inline-block;
margin-left: 8px; margin-left: 8px;
color: $primary_text_color; color: $primary;
font-family: "FontAwesome"; font-family: "FontAwesome";
position: relative; position: relative;
z-index: 20; z-index: 20;
@ -465,8 +464,8 @@ blockquote {
.quote .title { .quote .title {
border-left: 5px solid $primary_border_color; border-left: 5px solid scale-color($primary, $lightness: 90%);;
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
padding: 10px 10px 0 12px; padding: 10px 10px 0 12px;
clear: both; clear: both;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
@ -478,5 +477,5 @@ blockquote {
} }
.topic-body.highlighted { .topic-body.highlighted {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
} }

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

@ -35,7 +35,7 @@
.private-message-glyph { display: none; } .private-message-glyph { display: none; }
} }
.private-message-glyph { color: lighten($primary_text_color, 60%); } .private-message-glyph { color: scale-color($primary, $lightness: 75%); }
.private_message #topic-title .private-message-glyph { display: inline; } .private_message #topic-title .private-message-glyph { display: inline; }
.notification-options { .notification-options {
@ -49,7 +49,7 @@
} }
.docked #topic-progress { .docked #topic-progress {
box-shadow: 0 0 3px rbga($primary_shadow_color, .5); box-shadow: 0 0 3px rbga($primary, .5);
} }
#topic-progress-wrapper { #topic-progress-wrapper {
@ -64,15 +64,15 @@
#topic-progress { #topic-progress {
box-shadow: 0 0 3px rbga($primary_shadow_color, .7); box-shadow: 0 0 3px rbga($primary, .7);
position: relative; position: relative;
&.hidden { &.hidden {
display: none; display: none;
} }
border: none; border: none;
background-color: lighten($primary_background_color, 60%); background-color: scale-color($secondary, $lightness: 75%);
color: $primary_text_color; color: $primary;
width: 130px; width: 130px;
height: 34px; height: 34px;
.nums { .nums {
@ -91,7 +91,7 @@
left: 4px; left: 4px;
border: 0; border: 0;
background: none; background: none;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
width: 60px; width: 60px;
text-align: left; text-align: left;
@ -108,7 +108,7 @@
&:disabled { &:disabled {
cursor: default; cursor: default;
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
} }
} }
h4 { h4 {
@ -121,10 +121,8 @@
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 0; width: 0;
border-right: 1px solid $primary_border_color; border-right: 1px solid scale-color($secondary, $lightness: 90%);
// background-color: #d4eaf4; background-color: scale-color($success, $lightness: 50%);
// background-color: #C5E8F7;
background-color: $success_background_color;
} }
} }
@ -134,6 +132,6 @@
.post-cloak:last-of-type {padding-bottom: 40px;} .post-cloak:last-of-type {padding-bottom: 40px;}
.heatmap-high {color: $heatmap-high !important;} .heatmap-high {color: scale-color($danger, $lightness: -25%) !important;}
.heatmap-med {color: $heatmap-med !important;} .heatmap-med {color: $danger !important;}
.heatmap-low {color: $heatmap-low !important;} .heatmap-low {color: scale-color($danger, $lightness: 25%) !important;}

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

@ -7,6 +7,6 @@
line-height: 18px; line-height: 18px;
} }
.description { .description {
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
} }
} }

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

@ -13,13 +13,13 @@
height: 100px; height: 100px;
} }
.static { .static {
color: $primary_text_color; color: $primary;
margin-top: 5px; margin-top: 5px;
margin-left: 5px; margin-left: 5px;
display: inline-block; display: inline-block;
} }
.instructions { .instructions {
color: $secondary_text_color; color: $primary;
margin-top: 5px; margin-top: 5px;
} }
.category-controls { .category-controls {
@ -29,13 +29,13 @@
margin-left: 3px; margin-left: 3px;
} }
.instructions a[href] { .instructions a[href] {
color: $secondary_text_color; color: $primary;
} }
.warning { .warning {
@include border-radius-all(6px); @include border-radius-all(6px);
background-color: $warning_background_color; background-color: $danger;
padding: 5px 8px; padding: 5px 8px;
color: $primary_text_color; color: $primary;
width: 520px; width: 520px;
} }
@ -67,7 +67,7 @@
height: 150px; height: 150px;
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
background-color: $secondary_background_color; background-color: $primary;
} }
.bio-composer #wmd-quote-post { .bio-composer #wmd-quote-post {
@ -81,15 +81,15 @@
display: block; display: block;
width: 220px; width: 220px;
min-height: 200px; min-height: 200px;
background-color: lighten($secondary_background_color, 76%); background-color: scale-color($primary, $lightness: 90%);
color: $primary_text_color; color: $primary;
word-wrap: break-word; word-wrap: break-word;
} }
.user-navigation { .user-navigation {
h3 { h3 {
color: lighten($primary_text_color, 35%); color: scale-color($primary, $lightness: 50%);
padding-left: 5px; padding-left: 5px;
} }
.nav-stacked { .nav-stacked {
@ -104,12 +104,12 @@
margin-bottom: 50px; margin-bottom: 50px;
.about { .about {
background-color: $secondary_background_color; background-color: scale-color($primary, $lightness: 90%);
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
margin-bottom: 10px; margin-bottom: 10px;
overflow: hidden; overflow: hidden;
color: $primary_text_color; color: $primary;
.details { .details {
text-align: center; text-align: center;
@ -127,32 +127,32 @@
} }
a[href] { a[href] {
color: $primary_text_color; color: $primary;
} }
img.avatar { img.avatar {
border: 3px solid $primary_border_color; border: 3px solid scale-color($primary, $lightness: 90%);
margin-bottom: 4px; margin-bottom: 4px;
} }
.secondary { .secondary {
background-color: $secondary_background_color; background-color: $primary;
text-align: left; text-align: left;
padding: 0 10px; padding: 0 10px;
dd { dd {
color: $tertiary_text_color; color: $secondary;
margin: 0 0 7px 0; margin: 0 0 7px 0;
} }
dt { dt {
color: $secondary_text_color; color: $primary;
margin: 0; margin: 0;
} }
} }
} }
.controls { .controls {
background-color: lighten($secondary_background_color, 60%); background-color: scale-color($primary, $lightness: 75%);
margin-top: 0; margin-top: 0;
padding: 10px 10px 0 10px; padding: 10px 10px 0 10px;
@ -180,7 +180,7 @@
.avatar { .avatar {
float: left; float: left;
margin-right: 10px; margin-right: 10px;
border: 2px solid $tertiary_border_color; border: 2px solid $tertiary;
width: 45px; width: 45px;
height: 45px; height: 45px;
} }
@ -205,14 +205,14 @@
margin: 5px 0; margin: 5px 0;
font-size: 13px; font-size: 13px;
word-wrap: break-word; word-wrap: break-word;
color: lighten($primary_text_color, 30%); color: scale-color($primary, $lightness: 50%);
} }
.item.moderator-action { .item.moderator-action {
background-color: $emphasis_background_color; background-color: scale-color($tertiary, $lightness: 40%);
} }
.item.deleted { .item.deleted {
opacity: 0.8; opacity: 0.8;
background-color: $warning_background_color; background-color: scale-color($danger, $lightness: 50%);
} }
.item.hidden { .item.hidden {
display: block; display: block;
@ -220,19 +220,19 @@
} }
.item { .item {
padding: 10px 8px; padding: 10px 8px;
background-color: $primary_background_color; background-color: $secondary;
border-bottom: 1px solid $primary_border_color; border-bottom: 1px solid scale-color($primary, $lightness: 90%);
} }
.type { .type {
color: lighten($primary_text_color, 40%); color: scale-color($primary, $lightness: 50%);
} }
span.name { span.name {
color: lighten($primary_text_color, 40%); color: scale-color($primary, $lightness: 50%);
} }
.time { .time {
display: block; display: block;
float: right; float: right;
color: $secondary_text_color; color: $primary;
margin-right: 8px; margin-right: 8px;
font-size: 11px; font-size: 11px;
} }
@ -246,7 +246,7 @@
font-size: 14px; font-size: 14px;
} }
.edit-reason { .edit-reason {
background-color: $highlight_background_color; background-color: scale-color($highlight, $lightness: 50%);
padding: 3px 5px 5px 5px; padding: 3px 5px 5px 5px;
} }
} }