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

Merge pull request #3492 from awesomerobot/master 

changing color of progress bar
This commit is contained in:
Sam 2015-05-20 11:34:30 +10:00
parent bd63699d63 0ba88d2355
commit d2411ca101
11 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@
color: $primary; color: $primary;
} }
&.alert-info { &.alert-info {
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
color: $primary; color: $primary;
} }
} }

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

@ -27,7 +27,7 @@
vertical-align: middle; vertical-align: middle;
} }
&.selected { &.selected {
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
@include hover { @include hover {
background-color: dark-light-diff($highlight, $secondary, 90%, -80%); background-color: dark-light-diff($highlight, $secondary, 90%, -80%);

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

@ -186,7 +186,7 @@
} }
.selected { .selected {
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
@ -195,7 +195,7 @@
.fa { color: scale-color($primary, $lightness: 50%); } .fa { color: scale-color($primary, $lightness: 50%); }
.icon { color: scale-color($primary, $lightness: 30%); } .icon { color: scale-color($primary, $lightness: 30%); }
li { li {
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
i { i {
float: left; float: left;
margin-right: 5px; margin-right: 5px;

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

@ -72,7 +72,7 @@ aside.quote {
} }
.cooked .highlight { .cooked .highlight {
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
padding: 2px; padding: 2px;
margin: -2px; margin: -2px;
} }

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

@ -56,7 +56,7 @@
> tbody > tr { > tbody > tr {
&.highlighted { &.highlighted {
background-color: dark-light-diff($tertiary, $secondary, 90%, -41%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
} }
button.bulk-select { button.bulk-select {

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

@ -112,7 +112,7 @@ nav.post-controls {
button.create { button.create {
margin-right: 0; margin-right: 0;
color: $tertiary; color: $tertiary;
background: dark-light-diff($tertiary, $secondary, 90%, -65%); background: dark-light-diff($tertiary, $secondary, 85%, -65%);
padding: 8px 20px; padding: 8px 20px;
margin-left: 10px; margin-left: 10px;
@ -711,7 +711,7 @@ $topic-avatar-width: 45px;
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
padding: 12px $topic-body-width-padding 15px $topic-body-width-padding; padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
&.highlighted { &.highlighted {
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
} }
.topic-avatar { .topic-avatar {
@ -793,7 +793,7 @@ $topic-avatar-width: 45px;
.dropdown-menu .disabled > a:hover { .dropdown-menu .disabled > a:hover {
text-decoration: none; text-decoration: none;
color: $primary; color: $primary;
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
cursor: default; cursor: default;
} }
@ -816,7 +816,7 @@ $topic-avatar-width: 45px;
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
left: 50%; left: 50%;
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
border: 1px solid $tertiary; border: 1px solid $tertiary;
padding: 5px; padding: 5px;
margin-bottom: 5px; margin-bottom: 5px;
@ -957,7 +957,7 @@ a.attachment:before {
} }
span.highlighted { span.highlighted {
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
.username.new-user a { .username.new-user a {

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

@ -80,7 +80,7 @@ a.reply-new {
a:hover.reply-new { a:hover.reply-new {
color: $tertiary; color: $tertiary;
i { i {
background: dark-light-diff($tertiary, $secondary, 90%, -65%); background: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
} }
@ -166,8 +166,10 @@ a:hover.reply-new {
display: none; display: none;
} }
border: none; border: none;
background-color: scale-color-diff(); background-color: $secondary;
color: scale-color($primary, $lightness: 50%); color: $tertiary;
border: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
border-bottom: none;
width: 145px; width: 145px;
height: 34px; height: 34px;
@ -200,8 +202,8 @@ a:hover.reply-new {
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 0; width: 0;
border-right: 1px solid scale-color-diff(); border-right: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
background-color: desaturate(dark-light-diff($success, $secondary, 60%, -35%), 30%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
transition: width .75s; transition: width .75s;
} }

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

@ -470,7 +470,7 @@
} }
.notification { .notification {
&.unread { &.unread {
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
li { display: inline-block; } li { display: inline-block; }

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

@ -19,7 +19,6 @@ body {
} }
#main { #main {
position: relative; position: relative;
img.avatar { img.avatar {
&.header { &.header {
width: 45px; width: 45px;

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

@ -387,7 +387,7 @@ iframe {
float: left; float: left;
width: 97%; width: 97%;
padding-left: 3%; padding-left: 3%;
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
color: $secondary; color: $secondary;

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

@ -465,7 +465,7 @@
} }
.notification { .notification {
&.unread { &.unread {
background-color: dark-light-diff($tertiary, $secondary, 90%, -60%); background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
} }
li { display: inline-block; } li { display: inline-block; }