Skip to content

Rename color variables #3448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 1, 2018
Merged

Rename color variables #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8241655
rename brand-color-soft to primary-color-light
nitinprakash96 Mar 27, 2018
d11f3e1
rename brand-color to primary-color
nitinprakash96 Mar 27, 2018
170bcfd
rename primary-color to hightlight-color
nitinprakash96 Mar 27, 2018
d10e95f
more renaming
nitinprakash96 Mar 28, 2018
a8d3f77
Merge branch 'master' of https://github.com/pypa/warehouse into renam…
nitinprakash96 Mar 29, 2018
0bd5927
more renaming
nitinprakash96 Mar 29, 2018
d7d5809
Merge branch 'master' of https://github.com/pypa/warehouse into renam…
nitinprakash96 Mar 30, 2018
228ab24
fix indent
nitinprakash96 Mar 30, 2018
5384e69
deterministicly order journal entrys by id (#3475)
ewdurbin Mar 30, 2018
0a881cf
Fix text about classifier position (#3477)
nlhkabu Mar 31, 2018
eeee066
Add FAQ entry about requesting new Trove classifiers (#3410)
Mar 31, 2018
085f9f8
Merge branch 'master' of https://github.com/pypa/warehouse into renam…
nitinprakash96 Mar 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions warehouse/static/sass/base/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ select {
select:focus,
select:hover,
select:active {
box-shadow: inset 0 0 0 2px $brand-color-soft;
border-color: $brand-color-soft;
box-shadow: inset 0 0 0 2px $primary-color-light;
border-color: $primary-color-light;
outline: none;
}

Expand Down
8 changes: 4 additions & 4 deletions warehouse/static/sass/base/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,20 @@ strong {
}

a {
color: $brand-color;
color: $primary-color;
text-decoration: none;

&:hover {
color: darken($brand-color, 10);
color: darken($primary-color, 10);
text-decoration: underline;
}

@include link-focus
}

@include selection {
color: darken($brand-color, 15);
background: $primary-color;
color: darken($primary-color, 15);
background: $highlight-color;
}

// VERTICAL RHYTHM
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.badge {
font-size: $small-font-size;
text-transform: uppercase;
background-color: $brand-color;
background-color: $primary-color;
color: $white;
padding: 2px 7px;
border-radius: 3px;
Expand Down
12 changes: 6 additions & 6 deletions warehouse/static/sass/blocks/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
&:focus,
&:hover,
&:active {
border-color: $brand-color;
color: darken($brand-color, 10);
border-color: $primary-color;
color: darken($primary-color, 10);
text-decoration: none;
z-index: index($z-index-scale, "active-button"); // Needed for button groups
outline: none;
Expand All @@ -64,16 +64,16 @@
}

&--primary {
border-color: $brand-color;
background-color: $brand-color;
border-color: $primary-color;
background-color: $primary-color;
color: $white;
z-index: index($z-index-scale, "primary-button"); // Needed for button groups

&:focus,
&:hover,
&:active {
border-color: darken($brand-color, 10);
background-color: darken($brand-color, 9);
border-color: darken($primary-color, 10);
background-color: darken($primary-color, 9);
text-decoration-color: transparentize($white, 0.8);
color: $white;
}
Expand Down
4 changes: 2 additions & 2 deletions warehouse/static/sass/blocks/_callout-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

.callout-block {
padding: 15px 15px 15px 30px;
border: 2px solid $brand-color;
border: 2px solid $primary-color;
margin: 15px 0;
position: relative;
z-index: index($z-index-scale, "callout-block");
Expand All @@ -43,7 +43,7 @@
&:before {
content: "";
width: 15px;
background-color: $brand-color;
background-color: $primary-color;
position: absolute;
top: -1px;
left: -2px;
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_faq-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
font-family: "FontAwesome";
content: "\f059";
margin-right: 5px;
color: $brand-color;
color: $primary-color;
}
}

Expand Down
6 changes: 3 additions & 3 deletions warehouse/static/sass/blocks/_filter-badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
font-weight: 500;
font-size: $small-font-size;
border-radius: 2px;
background-color: $brand-color;
background-color: $primary-color;
color: $white;
display: table;
float: left;
Expand All @@ -43,7 +43,7 @@
&__icon {
display: table-cell;
padding: 6px 0 6px 6px;
color: darken($brand-color, 10%);
color: darken($primary-color, 10%);
vertical-align: middle;
}

Expand All @@ -61,7 +61,7 @@

&:hover {
color: $white;
background-color: darken($brand-color, 5%);
background-color: darken($primary-color, 5%);
}
}
}
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_filter-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
height: 100%;
top: 0;
left: 0;
background-color: $brand-color;
background-color: $primary-color;
width: 300px;
max-width: 100%;
z-index: index($z-index-scale, "filter-panel");
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

.footer {
$footer-faded-color: transparentize($white, 0.3);
background-color: lighten($brand-color, 2);
background-color: lighten($primary-color, 2);
color: $white;
padding: 60px 0;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_mobile-search-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
.mobile-search {
display: none;
padding: 10px;
background-color: darken($brand-color, 5);
background-color: darken($primary-color, 5);

@media screen and (max-width: $tablet) {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_notification-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.notification-bar {
border-bottom: 2px solid $white;
text-align: center;
background-color: $brand-color-dark;
background-color: $primary-color-dark;
color: $white;
padding: ($spacing-unit / 2);
position: relative;
Expand Down
8 changes: 4 additions & 4 deletions warehouse/static/sass/blocks/_project-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@

// PYGMENTS THEME

$blue: $brand-color;
$light-blue: lighten($brand-color, 10);
$dark-blue: darken($brand-color, 10);
$darkest-blue: darken($brand-color, 20);
$blue: $primary-color;
$light-blue: lighten($primary-color, 10);
$dark-blue: darken($primary-color, 10);
$darkest-blue: darken($primary-color, 20);
$green: $success-color;
$light-green: lighten($success-color, 10);
$red: $danger-color;
Expand Down
4 changes: 2 additions & 2 deletions warehouse/static/sass/blocks/_sponsors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

.sponsors {
text-align: center;
border-top: 1px solid darken($brand-color, 2);
background-color: $brand-color;
border-top: 1px solid darken($primary-color, 2);
background-color: $primary-color;
padding: ($spacing-unit / 2);

&__title {
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/blocks/_statistics-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
text-align: center;

&__statistic {
color: darken($brand-color, 15);
color: darken($primary-color, 15);
font-size: 20px;
display: inline-block;
padding: 10px 20px;
Expand Down
4 changes: 2 additions & 2 deletions warehouse/static/sass/blocks/_vertical-tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

&:hover {
text-decoration: none;
color: darken($brand-color, 10)
color: darken($primary-color, 10)
}

&--mobile {
Expand All @@ -81,7 +81,7 @@

&--is-active,
&--is-active:hover {
background: $brand-color;
background: $primary-color;
color: $white;
border-color: transparent;
}
Expand Down
10 changes: 5 additions & 5 deletions warehouse/static/sass/blocks/_viewport-section.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}

&--dark {
background-color: $brand-color;
background-color: $primary-color;
color: $white;

a {
Expand All @@ -86,8 +86,8 @@
display: inline;
font-family: "Ewert", cursive;
font-weight: 400;
color: darken($brand-color, 15);
background: $primary-color;
color: darken($primary-color, 15);
background: $highlight-color;

span {
line-height: 1;
Expand Down Expand Up @@ -129,9 +129,9 @@
padding-bottom: 56.25%;
padding-top: 25px;
height: 0;
background-color: darken($brand-color, 15);
background-color: darken($primary-color, 15);
border: 9px dashed #fff;
outline: 9px solid darken($brand-color, 15);
outline: 9px solid darken($primary-color, 15);

iframe {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion warehouse/static/sass/layout-helpers/_banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

.banner {
background-color: $brand-color;
background-color: $primary-color;
color: $white;
padding: 50px 0;

Expand Down
12 changes: 6 additions & 6 deletions warehouse/static/sass/settings/_colours.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

// SETTINGS - COLOURS

$brand-color: #006dad;
$primary-color: #ffd343;
$primary-color: #006dad;
$highlight-color: #ffd343;
$success-color: #169428;
$warn-color: #ffdf76;
$warn-text: #664e04;
$danger-color: #D52D40;
$brand-color-soft: lighten($brand-color, 45);
$brand-color-dark: darken($brand-color, 10);
$primary-color-light: lighten($primary-color, 45);
$primary-color-dark: darken($primary-color, 10);

$white: #fff;
$black: #000;
Expand All @@ -32,5 +32,5 @@ $border-color: darken($base-grey, 10);
$text-color: #464646;
$transparent-white: transparentize($white, 0.6);

$header-background-color: lighten($brand-color, 2);
$header-border-color: darken($brand-color, 2);
$header-background-color: lighten($primary-color, 2);
$header-border-color: darken($primary-color, 2);
4 changes: 2 additions & 2 deletions warehouse/static/sass/tools/_design-utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

@mixin link-focus {
&:focus {
background-color: $primary-color;
color: darken($primary-color, 50);
background-color: $highlight-color;
color: darken($highlight-color, 50);
cursor: pointer;
}
}
Expand Down