IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 02:40:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reducing some specificity, color fix

Browse Source
This commit is contained in:
Kris 2018-08-03 17:43:07 -04:00
parent 066010db7d
commit 84d822959a
9 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ $mobile-breakpoint: 700px;
padding: 0 0 0 10px;
}
.nav.nav-pills {
.nav-pills {
display: inline-flex;
width: calc(100% - 10px);
flex: 1 0 auto;
@ -508,7 +508,7 @@ $mobile-breakpoint: 700px;
}
}
.nav.nav-pills {
.nav-pills {
width: calc(100% - 10px);
display: inline-flex;
padding: 10px;

2
app/assets/stylesheets/common/admin/customize.scss
View File

@ -136,7 +136,7 @@
}
}
.nav.nav-pills.fields {
.nav-pills.fields {
margin-left: 10px;
}
.content-list,

10
app/assets/stylesheets/common/base/menu-panel.scss
View File

@ -55,8 +55,8 @@
}
.menu-panel {
ul.menu-links li,
ul li.heading {
li,
li.heading {
a {
padding: 0.25em 0.5em;
display: block;
@ -81,6 +81,12 @@
padding: 0.25em 0.5em;
width: 50%;
box-sizing: border-box;
a {
&:hover,
&:focus {
background: transparent;
}
}
.badge-notification {
color: dark-light-choose($primary-medium, $secondary-medium);
background-color: transparent;

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

@ -254,7 +254,7 @@ aside.quote {
}
.topic-map {
background: blend-primary-secondary(5%);
background: $primary-very-low;
border: 1px solid $primary-low;
border-top: none; // would cause double top border

11
app/assets/stylesheets/common/select-kit/composer-actions.scss
View File

@ -8,17 +8,16 @@
padding: 0;
margin-right: 5px;
.d-icon {
border: 1px solid $primary-low;
padding: 4px 5px;
margin: 0 !important;
}
&:hover,
&:focus {
background: $primary-low;
}
}
.d-icon {
border: 1px solid $primary-low;
padding: 4px 5px;
margin: 0 !important;
}
}
}
}

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

@ -617,7 +617,7 @@ blockquote {
.quote {
& > blockquote {
.onebox-result {
background-color: blend-primary-secondary(5%);
background-color: $primary-very-low;
}
}
aside {
@ -626,7 +626,7 @@ blockquote {
blockquote,
.onebox,
.onebox-result {
background: blend-primary-secondary(5%);
background: $primary-very-low;
border-left: 5px solid $primary-low;
}
aside.quote > blockquote,

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

@ -288,7 +288,7 @@ $user_card_background: $secondary;
margin-top: 5px;
.user-badge {
background: scale-color($user_card_background, $lightness: -5%);
background: $primary-very-low;
border: 1px solid $primary-low;
color: $user_card_primary;
}

32
plugins/poll/assets/stylesheets/common/poll.scss
View File

@ -1,11 +1,6 @@
$border-color: rgb(219, 219, 219);
$text-color: #9e9e9e;
$option-background: dark-light-diff($primary, $secondary, 90%, -65%);
div.poll {
margin: 10px 0;
border: 1px solid $border-color;
border: 1px solid $primary-low;
@include unselectable;
@ -34,23 +29,8 @@ div.poll {
height: auto;
}
.button {
display: inline-block;
padding: 6px 12px;
margin-right: 5px;
text-align: center;
cursor: pointer;
color: $primary;
background: dark-light-diff($primary, $secondary, 90%, -65%);
&:hover {
background: dark-light-diff($primary, $secondary, 65%, -75%);
color: #fff;
}
}
.poll-info {
color: $text-color;
color: $primary-medium;
text-align: center;
vertical-align: middle;
@ -83,7 +63,7 @@ div.poll {
}
.info-text {
margin: 0 5px;
color: $text-color;
color: $primary-medium;
}
}
@ -111,17 +91,17 @@ div.poll {
.percentage {
font-size: 20px;
float: right;
color: $text-color;
color: $primary-medium;
margin-left: 5px;
}
.bar-back {
background: $option-background;
background: $primary-low;
}
.bar {
height: 10px;
background: dark-light-diff($primary, $secondary, 50%, -25%);
background: $primary-medium;
}
.chosen .bar {

4
plugins/poll/assets/stylesheets/desktop/poll.scss
View File

@ -8,7 +8,7 @@ div.poll {
min-width: 150px;
width: 100%;
display: table-cell;
border-left: 1px solid $border-color;
border-left: 1px solid $primary-low;
p {
margin: 40px 20px;
@ -26,7 +26,7 @@ div.poll {
}
.poll-buttons {
border-top: 1px solid $border-color;
border-top: 1px solid $primary-low;
padding: 10px;
.toggle-status {