Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

removing scale-color, first pass

Browse source
This commit is contained in:
Kris 2017-10-10 16:07:46 -04:00 • committed by Robin Ward
parent c2a8b95e83
commit dc2d9f05dc
63 changed files with 285 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/assets/stylesheets/common/base/_topic-list.scss
View file

@ -74,7 +74,7 @@
border: none;
td {
border-bottom: 1px solid scale-color($danger, $lightness: 60%);
border-bottom: 1px solid $danger-low;
line-height: 0.1em;
padding: 0px;
text-align: center;
@ -82,7 +82,7 @@
td span {
background-color: $secondary;
color: scale-color($danger, $lightness: 60%);
color: $danger-low;
padding: 0px 8px;
font-size: 0.929em;
}
@ -100,14 +100,14 @@
}
th {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: 1em;
button .d-icon {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));}
button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
}
td {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: 1em;
}
@ -122,7 +122,7 @@
.topic-excerpt {
font-size: 0.929em;
margin-top: 8px;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
word-wrap: break-word;
line-height: 1.4;
padding-right: 20px;
@ -167,7 +167,7 @@
.category .badge-notification {
background-color:transparent;
color: scale-color($primary, $lightness: 50%);
color: $primary-medium;
}
.subcategories .badge {
@ -224,7 +224,7 @@
background-color: transparent;
padding: 0;
border: 0;
color: scale-color($danger, $lightness: 20%);
color: $danger-medium;
font-size: 0.929em;
cursor: default;
}
@ -309,7 +309,7 @@ ol.category-breadcrumb {
}
.top-date-string {
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
font-weight: normal;
text-transform: uppercase;
}
@ -369,12 +369,12 @@ ol.category-breadcrumb {
}
div.education {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.list-cell {
padding: 12px 5px;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
}
.table-heading {

4
app/assets/stylesheets/common/base/alert.scss
View file

@ -1,6 +1,6 @@
.alert {
padding: 8px 35px 8px 14px;
background-color: scale-color($danger, $lightness: 75%);
background-color: $danger-low;
color: #c09853;
.close {
@ -30,7 +30,7 @@
-webkit-appearance: none;
}
&.alert-success {
background-color: $success-low;
background-color: $success-medium;
color: $primary;
}
&.alert-error {

2
app/assets/stylesheets/common/base/category-list.scss
View file

@ -76,7 +76,7 @@
padding: 0 1em 1em 1em;
text-align: center;
font-size: 1.05em;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
.overflow {
max-height: 6em;
overflow: hidden;

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

@ -26,7 +26,7 @@
.select2-drop {
background: $secondary;
.d-icon {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
}

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

@ -35,7 +35,7 @@
background-color: $tertiary-low;
}
@include hover {
background-color: $highlight-low;
background-color: dark-light-choose($highlight-low, $highlight-medium);
text-decoration: none;
}
}
@ -92,8 +92,8 @@ div.ac-wrap div.item a.remove, .remove-link {
display: inline-block;
border: 1px solid $primary-low;
&:hover {
background-color: scale-color($danger, $lightness: 75%);
border: 1px solid scale-color($danger, $lightness: 30%);
background-color: $danger-low;
border: 1px solid $danger-medium;
text-decoration: none;
color: $danger;
}
@ -162,7 +162,7 @@ div.ac-wrap {
}
#draft-status, #file-uploading {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.composer-bottom-right {

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

@ -36,10 +36,10 @@
tr.me {
td {
background-color: $highlight-low;
background-color: dark-light-choose($highlight-low, $highlight-medium);
.username a, .name, .title, .number, .time-read {
color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%));
color: dark-light-choose(scale-color($highlight, $lightness: -50%), $highlight-medium);
}
}
}

10
app/assets/stylesheets/common/base/discourse.scss
View file

@ -132,7 +132,7 @@ input {
}
&.invalid {
background-color: dark-light-choose(scale-color($danger, $lightness: 80%), scale-color($danger, $lightness: -60%));
background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%));
}
.radio &[type="radio"],
@ -191,19 +191,19 @@ input {
}
// the default for table cells in topic list
// is scale-color($primary, $lightness: 50%)
// is $primary-medium
// numbers get dimmer as they get colder
.coldmap {
&-high {
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important;
color: dark-light-choose($primary-low-mid, $secondary-high) !important;
}
&-med {
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)) !important;
color: dark-light-choose($primary-medium, $secondary-high) !important;
}
&-low {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important;
color: dark-light-choose($primary-medium, $secondary-medium) !important;
}
}

6
app/assets/stylesheets/common/base/emoji.scss
View file

@ -76,7 +76,7 @@ img.emoji {
.emoji-picker .section-header .clear-recent .fa{
margin: 0;
padding: 0;
color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
color: dark-light-choose($header_primary-medium, $header_primary);
&:hover {
color: $primary;
@ -197,7 +197,7 @@ img.emoji {
}
.emoji-picker .filter .d-icon-search {
color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
color: dark-light-choose($header_primary-medium, $header_primary);
font-size: 16px;
margin-left: 5px;
margin-right: 5px;
@ -239,7 +239,7 @@ img.emoji {
top: 12px;
border: 0;
background: none;
color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
color: dark-light-choose($header_primary-medium, $header_primary);
outline: none;
display: none;

4
app/assets/stylesheets/common/base/group.scss
View file

@ -15,7 +15,7 @@
.group-info-full-name {
font-size: 1.2em;
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
}
span {
@ -93,7 +93,7 @@ table.group-members {
border-bottom: 3px solid $primary-low;
text-align: center;
padding: 5px 0px 5px 5px;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
}

8
app/assets/stylesheets/common/base/groups.scss
View file

@ -8,7 +8,7 @@
width: 100%;
th {
border-bottom: 1px solid $primary-low;
border-bottom: 1px solid $primary-low;
padding: 5px 0px;
text-align: left;
}
@ -30,16 +30,16 @@
.groups-info-name {
font-weight: bold;
color: $primary;
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
}
.groups-info-full-name {
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
}
.groups-info-title {
font-size: 0.9em;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
span {

2
app/assets/stylesheets/common/base/header.scss
View file

@ -151,7 +151,7 @@
.unread-notifications {
left: auto;
right: 0;
background-color: scale-color($tertiary, $lightness: 50%);
background-color: dark-light-choose($tertiary-medium, $tertiary);
}
.unread-private-messages, .ring {
left: auto;

8
app/assets/stylesheets/common/base/history.scss
View file

@ -40,11 +40,11 @@
}
.diff-ins {
color: dark-light-choose($primary, $secondary);
background: scale-color($success, $lightness: 90%);
background: $success-low;
}
ins {
color: $success;
background: scale-color($success, $lightness: 90%);
background: $success-low;
}
del, .diff-del {
code, img {
@ -67,11 +67,11 @@
filter: alpha(opacity=50);
}
.diff-del {
background: scale-color($danger, $lightness: 60%);
background: $danger-low;
}
del {
color: $danger;
background: scale-color($danger, $lightness: 60%);
background: $danger-low;
}
span.date {
font-weight: bold;

10
app/assets/stylesheets/common/base/login.scss
View file

@ -29,7 +29,7 @@ $input-width: 220px;
.disclaimer {
font-size: 0.9em;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
clear: both;
}
@ -56,7 +56,7 @@ $input-width: 220px;
float: auto;
}
.instructions {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
margin: 0;
font-size: 0.929em;
font-weight: normal;
@ -70,7 +70,7 @@ $input-width: 220px;
.password-reset {
.instructions {
label {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
}
@ -98,7 +98,7 @@ $input-width: 220px;
margin-bottom: 10px;
}
.instructions {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
margin: 0;
font-size: 0.929em;
font-weight: normal;
@ -113,5 +113,5 @@ $input-width: 220px;
button#login-link, button#new-account-link
{
background: transparent;
color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
color: dark-light-choose($primary-high, $secondary-low);
}

16
app/assets/stylesheets/common/base/menu-panel.scss
View file

@ -67,7 +67,7 @@
.new {
font-size: 0.8em;
margin-left: 0.5em;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
@ -79,7 +79,7 @@
margin: 5px 5px 0 8px;
.box {margin-top: 0;}
.badge-notification {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
background-color: transparent;
display: inline;
padding: 0;
@ -88,7 +88,7 @@
// note these topic counts only appear for anons in the category hamburger drop down
b.topics-count {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: 11px;
}
@ -161,7 +161,7 @@
.topic-statuses {
float: none;
display: inline-block;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
margin: 0;
.fa {
margin: 0;
@ -183,7 +183,7 @@
transition: all linear .15s;
.user-results {
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
}
}
@ -204,8 +204,8 @@
margin: 0.5em 0;
}
.fa { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
.icon { color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); }
.fa { color: dark-light-choose($primary-medium, $secondary-medium); }
.icon { color: dark-light-choose($primary-high, $secondary-low); }
li {
background-color: $tertiary-low;
padding: 0.25em 0.5em;
@ -299,7 +299,7 @@ div.menu-links-header {
text-align: right;
}
.fa, a {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
a {

8
app/assets/stylesheets/common/base/modal.scss
View file

@ -13,7 +13,7 @@
.input-hint-text {
margin-left: 0.5em;
color: $secondary-medium;
color: $secondary-high;
}
.modal-header {
@ -327,8 +327,8 @@
.cannot_delete_reason {
position: absolute;
background: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 10%));
color: dark-light-choose(scale-color($primary, $lightness: 100%), scale-color($secondary, $lightness: 0%));
background: dark-light-choose($primary, $secondary);
color: dark-light-choose($secondary, $secondary);
text-align: center;
border-radius: 2px;
padding: 12px 8px;
@ -339,7 +339,7 @@
border: solid transparent;
content: " ";
position: absolute;
border-top-color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 10%));
border-top-color: dark-light-choose($primary, $secondary);
border-width: 8px;
}
}

2
app/assets/stylesheets/common/base/notifications-button.scss
View file

@ -1,6 +1,6 @@
.notifications-button.notifications-button.notifications-button {
.d-icon.regular, .d-icon.muted, .d-icon.watching-first-post {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.d-icon.tracking, .d-icon.watching {
color: $tertiary;

8
app/assets/stylesheets/common/base/onebox.scss
View file

@ -97,7 +97,7 @@ aside.onebox {
header {
margin-bottom: 8px;
a[href] {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
text-decoration: none;
}
}
@ -123,12 +123,12 @@ aside.onebox {
}
a[href] {
color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary);
color: dark-light-choose($tertiary, $tertiary);
text-decoration: none;
}
a[href]:visited {
color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary);
color: dark-light-choose($tertiary, $tertiary);
}
img {
@ -364,7 +364,7 @@ aside.onebox.stackexchange .onebox-body {
}
.onebox-metadata {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.onebox.xkcd .onebox-body {

12
app/assets/stylesheets/common/base/search.scss
View file

@ -10,7 +10,7 @@
}
.like-count {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
.fa { color: $love; font-size: 12px; }
}
@ -32,7 +32,7 @@
margin-right: 14px;
}
a.search-link:visited .topic-title {
color: scale-color($tertiary, $lightness: 15%);
color: $tertiary-high;
}
.search-link {
.topic-statuses, .topic-title {
@ -43,7 +43,7 @@
.topic-statuses {
float: none;
display: inline-block;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: 1.0em;
}
}
@ -52,13 +52,13 @@
line-height: 20px;
word-wrap: break-word;
max-width: 640px;
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
.date {
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
}
.search-highlight {
color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 90%));
color: dark-light-choose($primary, $secondary-low);
}
}

4
app/assets/stylesheets/common/base/share_link.scss
View file

@ -55,7 +55,7 @@
float: right;
font-size: 1.429em;
a {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
@ -67,7 +67,7 @@
.date {
float: right;
margin: 5px;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
input[type=text] {

16
app/assets/stylesheets/common/base/tagging.scss
View file

@ -83,7 +83,7 @@
margin: 0;
}
$tag-color: scale-color($primary, $lightness: 40%);
$tag-color: $primary-medium;
.discourse-tag-count {
font-size: 0.8em;
@ -109,18 +109,18 @@ $tag-color: scale-color($primary, $lightness: 40%);
}
&.box {
background-color: scale-color($primary, $lightness: 90%);
color: scale-color($primary, $lightness: 30%);
background-color: $primary-low;
color: $primary-high;
padding: 2px 8px;
.extra-info-wrapper & {
background-color: scale-color($header-primary, $lightness: 90%);
color: scale-color($header-primary, $lightness: 30%);
background-color: $header_primary-low;
color: $header_primary-medium;
}
}
&.simple, &.simple:visited, &.simple:hover {
margin-right: 0px;
color: scale-color($primary, $lightness: 30%);
color: $primary-high;
}
}
@ -183,7 +183,7 @@ $tag-color: scale-color($primary, $lightness: 40%);
.discourse-tag.bullet:before {
content: "\f04d";
font-family: FontAwesome;
color: scale-color($primary, $lightness: 70%);
color: $primary-low-mid;
margin-right: 5px;
font-size: 0.7em;
position:relative;
@ -226,7 +226,7 @@ header .discourse-tag {color: $tag-color }
.autocomplete {
.d-icon-tag {
color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
color: dark-light-choose($primary, $primary-low-mid);
padding-right: 5px;
}

28
app/assets/stylesheets/common/base/topic-post.scss
View file

@ -30,16 +30,16 @@
overflow: hidden;
text-overflow: ellipsis;
a {
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
}
}
.fa {
font-size: 11px;
margin-left: 3px;
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.new_user a, .user-title, .user-title a {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
@ -49,8 +49,8 @@
h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; }
h1 { line-height: 1em; } /* normalize.css sets h1 font size but not line height */
a { word-wrap: break-word; }
ins { background-color: dark-light-choose(scale-color($success, $lightness: 90%), scale-color($success, $lightness: -60%)); }
del { background-color: dark-light-choose(scale-color($danger, $lightness: 90%), scale-color($danger, $lightness: -60%)); }
ins { background-color: dark-light-choose($success-low, scale-color($success, $lightness: -60%)); }
del { background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%)); }
}
@ -72,7 +72,7 @@ aside.quote {
.title {
@include post-aside;
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
// IE will screw up the blockquote underneath if bottom padding is 0px
padding: 12px 12px 1px 12px;
// blockquote is underneath this and has top margin
@ -88,7 +88,7 @@ aside.quote {
}
.quote-controls, .quote-controls .d-icon {
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
color: dark-light-choose($primary-low-mid, $secondary-high);
}
.cooked .highlight {
@ -238,7 +238,7 @@ aside.quote {
}
&.via-email {
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
color: dark-light-choose($primary-low-mid, $secondary-high);
}
&.raw-email {
cursor: pointer;
@ -287,7 +287,7 @@ blockquote > *:last-child {
.gap {
padding: 0.25em 0 0.5em 4.3em;
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
cursor: pointer;
text-transform: uppercase;
font-weight: bold;
@ -329,12 +329,12 @@ blockquote > *:last-child {
font-size: 35px;
width: 45px;
text-align: center;
color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
color: dark-light-choose($primary-low-mid, $secondary-high);
}
}
.small-action-desc.timegap {
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
}
.small-action-desc {
padding: 0.25em 0 0.5em 4.3em;
@ -342,7 +342,7 @@ blockquote > *:last-child {
text-transform: uppercase;
font-weight: bold;
font-size: 0.9em;
color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
color: dark-light-choose($primary-low-mid, $secondary-high);
.custom-message {
text-transform: none;
@ -388,7 +388,7 @@ blockquote > *:last-child {
a.mention, a.mention-group {
padding: 2px 4px;
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
color: dark-light-choose($primary-high, $secondary-low);
background: $primary-low;
border-radius: 8px;
font-weight: bold;
@ -408,7 +408,7 @@ a.mention, a.mention-group {
}
.broken-image, .large-image {
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
color: dark-light-choose($primary-low-mid, $secondary-high);
border: 1px solid $primary-low;
font-size: 32px;
padding: 16px;

4
app/assets/stylesheets/common/base/topic.scss
View file

@ -149,7 +149,7 @@
}
.expand-links {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.track-link {
@ -165,7 +165,7 @@
li {
margin-bottom: 0.5em;
a[href] {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.clicks {
margin-left: 0.5em;

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

@ -196,7 +196,7 @@
.badge-groups {
margin: 20px 0;
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
h3 {
margin-bottom: 1.0em;
}
@ -222,7 +222,7 @@
}
.grant-info-item {
margin-bottom: 1em;
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
.badge-title .form-horizontal .controls {

14
app/assets/stylesheets/common/base/user.scss
View file

@ -198,7 +198,7 @@
}
a {
color: $secondary;
color: dark-light-choose($primary-medium, $secondary-high);
}
.active {
@ -253,7 +253,7 @@
}
.instructions {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
margin-top: 5px;
margin-bottom: 10px;
font-size: 80%;
@ -343,7 +343,7 @@
padding-top: 10px;
li a {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
@ -415,7 +415,7 @@
}
.topic-info {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
}
@media all and (max-width : 600px) {
@ -435,7 +435,7 @@
.links-section {
.domain {
font-size: 0.714em;
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
color: dark-light-choose($primary-medium, $secondary-high);
}
}
@ -462,7 +462,7 @@
}
.instructions {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
color: dark-light-choose($primary-medium, $secondary-medium);
margin-bottom: 10px;
font-size: 80%;
line-height: 1.4em;
@ -477,7 +477,7 @@
}
.warning {
background-color: scale-color($danger, $lightness: 30%);
background-color: $danger-medium;
padding: 5px 8px;
color: $secondary;
width: 520px;