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

Merge pull request #4514 from consul/link_colors

Browse Source 
Simplify using text color for links
This commit is contained in:
Javi Martín
2021-06-29 20:03:13 +02:00
committed by GitHub
parent ef21498cf5 e6c1cf7743
commit 28ae1a369a
10 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ $table-header: #ecf1f6;
}
.header {
background: transparent;
border: 0;
}
@@ -64,14 +65,9 @@ $table-header: #ecf1f6;
}
}
.admin-top-bar {
background: #fff;
}
.top-bar {
background: #fff !important;
border-bottom: 1px solid #eee;
color: #000;
color: $text;
height: auto;
padding-top: $line-height / 2;
@@ -128,7 +124,7 @@ $table-header: #ecf1f6;
}
small {
color: #000;
color: inherit;
text-transform: uppercase;
}
}
@@ -147,10 +143,6 @@ $table-header: #ecf1f6;
@include breakpoint(medium) {
height: auto !important;
}
a {
color: #000 !important;
}
}
.title-bar {
@@ -662,7 +654,7 @@ code {
.admin-content .select-heading {
a {
color: $text;
color: inherit;
display: block;
&.is-active {

6
app/assets/stylesheets/admin/menu.scss
View File

@@ -2,6 +2,7 @@
background: $sidebar;
background: linear-gradient(to bottom, #245b80 0%, #488fb5 100%);
border-right: 1px solid $border;
color: $white;
ul {
list-style-type: none;
@@ -22,7 +23,6 @@
}
[class^="icon-"] {
color: #fff;
display: inline-block;
font-size: rem-calc(20);
line-height: $line-height;
@@ -136,7 +136,7 @@
}
li a {
color: #fff;
color: inherit;
display: block;
line-height: $line-height * 2;
padding-left: $line-height / 4;
@@ -144,7 +144,7 @@
&:hover {
background: $sidebar-hover;
color: #fff;
color: inherit;
text-decoration: none;
}
}

5
app/assets/stylesheets/budgets/ballot/investment.scss
View File

@@ -11,7 +11,7 @@
position: relative;
a {
color: $text;
color: inherit;
}
.ballot-list-title {
@@ -42,9 +42,8 @@
&:hover {
@include brand-background;
a,
span {
color: #fff;
color: inherit;
outline: 0;
text-decoration: none;
}

4
app/assets/stylesheets/budgets/phases.scss
View File

@@ -75,13 +75,13 @@
a {
background: $white;
color: $black;
color: inherit;
height: 100%;
padding: $line-height $line-height * 1.5;
&:hover {
background: #e6e6e6;
color: $black;
color: inherit;
}
&:focus {

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

@@ -332,7 +332,7 @@
}
a {
color: $text;
color: inherit;
}
.is-active {

4
app/assets/stylesheets/datepicker_overrides.scss
View File

@@ -32,7 +32,7 @@
.ui-datepicker-prev,
.ui-datepicker-next {
color: #fff;
color: inherit;
cursor: pointer;
font-family: "icons" !important;
font-size: rem-calc(24);
@@ -85,7 +85,7 @@
a {
text-align: center;
line-height: $line-height;
color: $text;
color: inherit;
}
}
}

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

@@ -218,7 +218,7 @@ a {
}
a {
color: $text;
color: inherit;
display: inline-block;
font-weight: bold;
position: relative;
@@ -237,10 +237,6 @@ a {
@include brand-text;
border-bottom: 2px solid $brand;
padding-bottom: rem-calc(1);
h2 a {
@include brand-text;
}
}
&:not(.is-active) {
@@ -537,7 +533,7 @@ body > header,
}
.top-bar {
@extend %brand-background;
background-color: inherit;
padding-bottom: 0;
padding-top: 0;
@@ -559,7 +555,7 @@ body > header,
}
a {
color: #fff;
color: inherit;
padding-left: 0;
@include breakpoint(medium) {
@@ -591,6 +587,7 @@ body > header,
&.is-dropdown-submenu {
background: #fff;
color: $text;
margin: 0;
margin-top: rem-calc(-12);
padding: 0;
@@ -601,10 +598,6 @@ body > header,
display: block;
height: auto;
margin-bottom: 0;
a {
color: $text;
}
}
}
@@ -647,7 +640,7 @@ body > header,
}
&.is-active > a {
color: #fff;
color: inherit;
}
&.is-dropdown-submenu-parent > a::after {
@@ -661,7 +654,7 @@ body > header,
padding-right: $line-height / 2;
a {
color: #fff;
color: inherit;
margin: 0 rem-calc(6);
&:hover {
@@ -694,6 +687,7 @@ body > header,
@include breakpoint(medium) {
background: #fff;
color: $text;
padding-bottom: 0;
}
@@ -710,7 +704,7 @@ body > header,
}
a {
color: #fff;
color: inherit;
display: inline-block;
line-height: $line-height * 2;
position: relative;
@@ -718,7 +712,6 @@ body > header,
width: 100%;
@include breakpoint(medium) {
color: $text;
display: block;
font-weight: bold;
width: auto;
@@ -787,7 +780,7 @@ body > header,
margin-bottom: $line-height / 2;
a {
color: $text;
color: inherit;
display: inline-block;
font-weight: bold;
margin-right: $line-height / 2;
@@ -825,6 +818,9 @@ body > header,
// ----------
footer {
.logo {
color: inherit;
}
.logo a {
font-family: "Lato" !important;
@@ -846,7 +842,7 @@ footer {
a,
a:active,
a:focus {
color: $text;
color: inherit;
text-decoration: underline;
&:hover {
@@ -930,6 +926,7 @@ footer {
background: $brand image-url("auth_bg.jpg");
background-repeat: no-repeat;
background-size: cover;
color: $white;
@include breakpoint(medium) {
min-height: $line-height * 42;
@@ -939,7 +936,7 @@ footer {
margin-top: $line-height;
a {
color: #fff;
color: inherit;
display: block;
text-align: center;

2
app/assets/stylesheets/legislation.scss
View File

@@ -57,7 +57,7 @@
}
h3 a {
color: $black;
color: inherit;
margin-bottom: 1rem;
}
}

4
app/assets/stylesheets/legislation_process.scss
View File

@@ -498,7 +498,7 @@
}
a {
color: $text;
color: inherit;
&:hover,
&:active,
@@ -506,7 +506,7 @@
text-decoration: none;
h3 {
color: $text;
color: inherit;
}
.anchor::before {

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

@@ -166,7 +166,7 @@
.button-support {
background: $proposals;
color: $text;
color: inherit;
display: inline-block;
font-size: $small-font-size;
margin-top: rem-calc(12);
@@ -223,13 +223,13 @@
z-index: 2;
p {
color: $color-warning !important;
color: inherit !important;
margin: 0 rem-calc(12);
text-align: left;
}
a {
color: $color-warning !important;
color: inherit !important;
font-weight: bold;
text-decoration: underline;
}
@@ -623,7 +623,7 @@
margin-top: $line-height / 2;
a {
color: $text;
color: inherit;
}
}
@@ -725,10 +725,6 @@
margin-top: 0;
overflow: hidden;
position: relative;
a {
color: $text;
}
}
.truncate {
@@ -1046,7 +1042,7 @@
margin-bottom: 0;
a {
color: $text;
color: inherit;
font-size: rem-calc(24);
}
}
@@ -1101,7 +1097,7 @@
padding-top: 0;
a {
color: $color-warning;
color: inherit;
}
p {
@@ -1121,7 +1117,7 @@
.social-share-button .ssb-icon {
background: none;
color: $text;
color: inherit;
height: rem-calc(33);
&::before {
@@ -1174,7 +1170,7 @@
.back,
.icon-angle-left,
.description {
color: #fff;
color: inherit;
}
a {
@@ -1238,7 +1234,7 @@
font-size: $base-font-size;
a {
color: $color-warning;
color: inherit;
}
}
@@ -1459,7 +1455,7 @@
position: relative;
a {
color: $text;
color: inherit;
display: block;
img {
@@ -1765,7 +1761,7 @@
line-height: $line-height * 1.5;
a {
color: $text;
color: inherit;
}
}
}