consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4520 from consul/border_color

Browse Source 
Simplify using current color on borders
This commit is contained in:
Javi Martín
2021-06-30 13:54:55 +02:00
committed by GitHub
parent 28ae1a369a b2a05322fd
commit d4bebc810a
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/admin.scss
View File

@@ -155,10 +155,6 @@ $table-header: #ecf1f6;
color: $admin-color; color: $admin-color;
} }
.dropdown.menu > .is-dropdown-submenu-parent > a::after {
border-color: #000 transparent transparent;
}
.fieldset { .fieldset {
select { select {
@@ -295,7 +291,6 @@ $table-header: #ecf1f6;
} }
.is-active { .is-active {
border-bottom: 2px solid $admin-color;
color: $admin-color; color: $admin-color;
font-weight: bold; font-weight: bold;
} }
@@ -455,7 +450,7 @@ code {
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
border-bottom: 1px dotted #fff; border-bottom-color: transparent;
color: #cf2a0e; color: #cf2a0e;
} }
} }
@@ -586,7 +581,7 @@ code {
background: #fafafa; background: #fafafa;
border-bottom-left-radius: rem-calc(6); border-bottom-left-radius: rem-calc(6);
border-bottom-right-radius: rem-calc(6); border-bottom-right-radius: rem-calc(6);
border-top: 2px solid #000; border-top: 2px solid;
font-size: $small-font-size; font-size: $small-font-size;
padding: $line-height / 2; padding: $line-height / 2;
} }

7
app/assets/stylesheets/dashboard.scss
View File

@@ -182,14 +182,13 @@
background: #feeaeb; background: #feeaeb;
&::before { &::before {
border: 2px solid #fb9497;
color: #fb9497; color: #fb9497;
content: "\74"; content: "\74";
} }
} }
&::before { &::before {
border: 2px solid #00cb96; border: 2px solid;
border-radius: rem-calc(40); border-radius: rem-calc(40);
color: #00cb96; color: #00cb96;
content: "\6c"; content: "\6c";
@@ -341,7 +340,7 @@
&::before { &::before {
background: linear-gradient(to right, rgba(231, 236, 240, 1) 0%, rgba(251, 251, 251, 1) 90%); background: linear-gradient(to right, rgba(231, 236, 240, 1) 0%, rgba(251, 251, 251, 1) 90%);
border-left: 4px solid $brand; border-left: 4px solid;
content: ""; content: "";
height: rem-calc(48); height: rem-calc(48);
left: 0; left: 0;
@@ -367,7 +366,7 @@
} }
.submenu-active { .submenu-active {
border-bottom: 2px solid $brand; border-bottom: 2px solid;
.has-tip { .has-tip {
@include brand-text; @include brand-text;

16
app/assets/stylesheets/layout.scss
View File

@@ -101,7 +101,7 @@ a {
.button.hollow { .button.hollow {
@include normal-selection; @include normal-selection;
border: 1px solid $link; border: 1px solid;
color: $link; color: $link;
} }
@@ -235,7 +235,7 @@ a {
&.is-active { &.is-active {
@include brand-text; @include brand-text;
border-bottom: 2px solid $brand; border-bottom: 2px solid;
padding-bottom: rem-calc(1); padding-bottom: rem-calc(1);
} }
@@ -272,7 +272,7 @@ a {
&.is-active { &.is-active {
@include brand-text; @include brand-text;
border-bottom: 2px solid $brand; border-bottom: 2px solid;
} }
} }
@@ -346,7 +346,7 @@ a {
&::after { &::after {
background: $brand; background: $brand;
border-bottom: 2px solid $brand; border-bottom: 2px solid;
bottom: 0; bottom: 0;
content: ""; content: "";
left: 0; left: 0;
@@ -644,7 +644,7 @@ body > header,
} }
&.is-dropdown-submenu-parent > a::after { &.is-dropdown-submenu-parent > a::after {
border-color: #fff transparent transparent; border-top-color: currentcolor;
} }
} }
@@ -726,7 +726,7 @@ body > header,
@include breakpoint(medium) { @include breakpoint(medium) {
@include brand-text; @include brand-text;
border-bottom: 2px solid $brand; border-bottom: 2px solid;
} }
} }
} }
@@ -798,7 +798,7 @@ body > header,
.is-active { .is-active {
@include brand-text; @include brand-text;
border-bottom: 2px solid $brand; border-bottom: 2px solid;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
@@ -2497,7 +2497,7 @@ table {
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
border-bottom: 1px solid #cf2a0e; border-bottom-style: solid;
color: #cf2a0e; color: #cf2a0e;
text-decoration: none; text-decoration: none;
} }

8
app/assets/stylesheets/participation.scss
View File

@@ -29,7 +29,7 @@
.icon-like, .icon-like,
.icon-unlike { .icon-unlike {
background: #fff; background: #fff;
border: 2px solid $text-light; border: 2px solid;
border-radius: rem-calc(3); border-radius: rem-calc(3);
color: $text-light; color: $text-light;
display: inline-block; display: inline-block;
@@ -1577,11 +1577,11 @@
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
.column:nth-child(odd) { .column:nth-child(odd) {
border-right: 2px solid $text; border-right: 2px solid;
} }
.answer-divider { .answer-divider {
border-bottom: 2px solid $text; border-bottom: 2px solid;
border-right: 0 !important; border-right: 0 !important;
margin-bottom: $line-height; margin-bottom: $line-height;
padding-bottom: $line-height; padding-bottom: $line-height;
@@ -1776,7 +1776,7 @@
margin: $line-height 0; margin: $line-height 0;
span { span {
border-bottom: 1px solid #000; border-bottom: 1px solid;
} }
} }