more renaming

nitinprakash96 · nitinprakash96 · commit 029999db0d54 · 2018-03-29T13:03:02.000+05:30
diff --git a/warehouse/static/sass/base/_typography.scss b/warehouse/static/sass/base/_typography.scss
@@ -106,19 +106,19 @@ strong {
 }
 
 a {
-  color: $highlight-color;
+  color: $primary-color;
   text-decoration: none;
 
   &:hover {
-    color: darken($highlight-color, 10);
+    color: darken($primary-color, 10);
     text-decoration: underline;
   }
 
   @include link-focus
 }
 
 @include selection {
-  color: darken($highlight-color, 15);
+  color: darken($primary-color, 15);
   background: $highlight-color;
 }
 
diff --git a/warehouse/static/sass/blocks/_badge.scss b/warehouse/static/sass/blocks/_badge.scss
@@ -22,7 +22,7 @@
 .badge {
   font-size: $small-font-size;
   text-transform: uppercase;
-  background-color: $highlight-color;
+  background-color: $primary-color;
   color: $white;
   padding: 2px 7px;
   border-radius: 3px;
diff --git a/warehouse/static/sass/blocks/_button.scss b/warehouse/static/sass/blocks/_button.scss
@@ -50,8 +50,8 @@
   &:focus,
   &:hover,
   &:active {
-    border-color: $highlight-color;
-    color: darken($highlight-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;
@@ -64,16 +64,16 @@
   }
 
   &--primary {
-    border-color: $highlight-color;
-    background-color: $highlight-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($highlight-color, 10);
-      background-color: darken($highlight-color, 9);
+      border-color: darken($primary-color, 10);
+      background-color: darken($primary-color, 9);
       text-decoration-color: transparentize($white, 0.8);
       color: $white;
     }
diff --git a/warehouse/static/sass/blocks/_callout-block.scss b/warehouse/static/sass/blocks/_callout-block.scss
@@ -30,7 +30,7 @@
 
 .callout-block {
   padding: 15px 15px 15px 30px;
-  border: 2px solid $highlight-color;
+  border: 2px solid $primary-color;
   margin: 15px 0;
   position: relative;
   z-index: index($z-index-scale, "callout-block");
@@ -43,7 +43,7 @@
   &:before {
     content: "";
     width: 15px;
-    background-color: $highlight-color;
+    background-color: $primary-color;
     position: absolute;
     top: -1px;
     left: -2px;
diff --git a/warehouse/static/sass/blocks/_faq-group.scss b/warehouse/static/sass/blocks/_faq-group.scss
@@ -42,7 +42,7 @@
       font-family: "FontAwesome";
       content: "\f059";
       margin-right: 5px;
-      color: $highlight-color;
+      color: $primary-color;
     }
   }
 
diff --git a/warehouse/static/sass/blocks/_filter-badge.scss b/warehouse/static/sass/blocks/_filter-badge.scss
@@ -34,7 +34,7 @@
   font-weight: 500;
   font-size: $small-font-size;
   border-radius: 2px;
-  background-color: $highlight-color;
+  background-color: $primary-color;
   color: $white;
   display: table;
   float: left;
@@ -43,7 +43,7 @@
   &__icon {
     display: table-cell;
     padding: 6px 0 6px 6px;
-    color: darken($highlight-color, 10%);
+    color: darken($primary-color, 10%);
     vertical-align: middle;
   }
 
@@ -61,7 +61,7 @@
 
     &:hover {
       color: $white;
-      background-color: darken($highlight-color, 5%);
+      background-color: darken($primary-color, 5%);
     }
   }
 }
diff --git a/warehouse/static/sass/blocks/_filter-panel.scss b/warehouse/static/sass/blocks/_filter-panel.scss
@@ -42,7 +42,7 @@
     height: 100%;
     top: 0;
     left: 0;
-    background-color: $highlight-color;
+    background-color: $primary-color;
     width: 300px;
     max-width: 100%;
     z-index: index($z-index-scale, "filter-panel");
diff --git a/warehouse/static/sass/blocks/_footer.scss b/warehouse/static/sass/blocks/_footer.scss
@@ -36,7 +36,7 @@
 
 .footer {
   $footer-faded-color: transparentize($white, 0.3);
-  background-color: lighten($highlight-color, 2);
+  background-color: lighten($primary-color, 2);
   color: $white;
   padding: 60px 0;
   width: 100%;
diff --git a/warehouse/static/sass/blocks/_mobile-search-bar.scss b/warehouse/static/sass/blocks/_mobile-search-bar.scss
@@ -21,7 +21,7 @@
 .mobile-search {
   display: none;
   padding: 10px;
-  background-color: darken($highlight-color, 5);
+  background-color: darken($primary-color, 5);
 
   @media screen and (max-width: $tablet) {
     display: block;
diff --git a/warehouse/static/sass/blocks/_notification-bar.scss b/warehouse/static/sass/blocks/_notification-bar.scss
@@ -37,11 +37,7 @@
 .notification-bar {
   border-bottom: 2px solid $white;
   text-align: center;
-<<<<<<< HEAD
-  background-color: darken($highlight-color, 10);
-=======
-  background-color: $brand-color-dark;
->>>>>>> 84086f9018dd8f4b0b53917d2e405708fdde0334
+  background-color: $primary-color-dark;
   color: $white;
   padding: ($spacing-unit / 2);
   position: relative;
diff --git a/warehouse/static/sass/blocks/_project-description.scss b/warehouse/static/sass/blocks/_project-description.scss
@@ -167,10 +167,10 @@
 
 // PYGMENTS THEME
 
-$blue:          $highlight-color;
-$light-blue:    lighten($highlight-color, 10);
-$dark-blue:     darken($highlight-color, 10);
-$darkest-blue:  darken($highlight-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;
diff --git a/warehouse/static/sass/blocks/_sponsors.scss b/warehouse/static/sass/blocks/_sponsors.scss
@@ -30,8 +30,8 @@
 
 .sponsors {
   text-align: center;
-  border-top: 1px solid darken($highlight-color, 2);
-  background-color: $highlight-color;
+  border-top: 1px solid darken($primary-color, 2);
+  background-color: $primary-color;
   padding: ($spacing-unit / 2);
 
   &__title {
diff --git a/warehouse/static/sass/blocks/_statistics-bar.scss b/warehouse/static/sass/blocks/_statistics-bar.scss
@@ -26,7 +26,7 @@
   text-align: center;
 
   &__statistic {
-    color: darken($highlight-color, 15);
+    color: darken($primary-color, 15);
     font-size: 20px;
     display: inline-block;
     padding: 10px 20px;
diff --git a/warehouse/static/sass/blocks/_vertical-tabs.scss b/warehouse/static/sass/blocks/_vertical-tabs.scss
@@ -58,7 +58,7 @@
 
     &:hover {
       text-decoration: none;
-      color: darken($highlight-color, 10)
+      color: darken($primary-color, 10)
     }
 
     &--mobile {
@@ -81,7 +81,7 @@
 
     &--is-active,
     &--is-active:hover {
-      background: $highlight-color;
+      background: $primary-color;
       color: $white;
       border-color: transparent;
     }
diff --git a/warehouse/static/sass/blocks/_viewport-section.scss b/warehouse/static/sass/blocks/_viewport-section.scss
@@ -65,7 +65,7 @@
   }
 
   &--dark {
-    background-color: $highlight-color;
+    background-color: $primary-color;
     color: $white;
 
     a {
@@ -86,7 +86,7 @@
       display: inline;
       font-family: "Ewert", cursive;
       font-weight: 400;
-      color: darken($highlight-color, 15);
+      color: darken($primary-color, 15);
       background: $highlight-color;
 
       span {
@@ -129,9 +129,9 @@
         padding-bottom: 56.25%;
         padding-top: 25px;
         height: 0;
-        background-color: darken($highlight-color, 15);
+        background-color: darken($primary-color, 15);
         border: 9px dashed #fff;
-        outline: 9px solid darken($highlight-color, 15);
+        outline: 9px solid darken($primary-color, 15);
 
         iframe {
           position: absolute;
diff --git a/warehouse/static/sass/layout-helpers/_banner.scss b/warehouse/static/sass/layout-helpers/_banner.scss
@@ -18,7 +18,7 @@
 */
 
 .banner {
-  background-color: $highlight-color;
+  background-color: $primary-color;
   color: $white;
   padding: 50px 0;
 
diff --git a/warehouse/static/sass/settings/_colours.scss b/warehouse/static/sass/settings/_colours.scss
@@ -32,5 +32,5 @@ $border-color:                darken($base-grey, 10);
 $text-color:                  #464646;
 $transparent-white:           transparentize($white, 0.6);
 
-$header-background-color:     lighten($highlight-color, 2);
-$header-border-color:         darken($highlight-color, 2);
+$header-background-color:     lighten($primary-color, 2);
+$header-border-color:         darken($primary-color, 2);

Original file line number	Diff line number	Diff line change
`@@ -106,19 +106,19 @@ strong {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`a {`
`109`		`- color: $highlight-color;`
	`109`	`+ color: $primary-color;`
`110`	`110`	`text-decoration: none;`
`111`	`111`
`112`	`112`	`&:hover {`
`113`		`- color: darken($highlight-color, 10);`
	`113`	`+ color: darken($primary-color, 10);`
`114`	`114`	`text-decoration: underline;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@include link-focus`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`@include selection {`
`121`		`- color: darken($highlight-color, 15);`
	`121`	`+ color: darken($primary-color, 15);`
`122`	`122`	`background: $highlight-color;`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`font-family: "FontAwesome";`
`43`	`43`	`content: "\f059";`
`44`	`44`	`margin-right: 5px;`
`45`		`- color: $highlight-color;`
	`45`	`+ color: $primary-color;`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`font-weight: 500;`
`35`	`35`	`font-size: $small-font-size;`
`36`	`36`	`border-radius: 2px;`
`37`		`- background-color: $highlight-color;`
	`37`	`+ background-color: $primary-color;`
`38`	`38`	`color: $white;`
`39`	`39`	`display: table;`
`40`	`40`	`float: left;`
`@@ -43,7 +43,7 @@`
`43`	`43`	`&__icon {`
`44`	`44`	`display: table-cell;`
`45`	`45`	`padding: 6px 0 6px 6px;`
`46`		`- color: darken($highlight-color, 10%);`
	`46`	`+ color: darken($primary-color, 10%);`
`47`	`47`	`vertical-align: middle;`
`48`	`48`	`}`
`49`	`49`
`@@ -61,7 +61,7 @@`
`61`	`61`
`62`	`62`	`&:hover {`
`63`	`63`	`color: $white;`
`64`		`- background-color: darken($highlight-color, 5%);`
	`64`	`+ background-color: darken($primary-color, 5%);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`
`59`	`59`	`&:hover {`
`60`	`60`	`text-decoration: none;`
`61`		`- color: darken($highlight-color, 10)`
	`61`	`+ color: darken($primary-color, 10)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`&--mobile {`
`@@ -81,7 +81,7 @@`
`81`	`81`
`82`	`82`	`&--is-active,`
`83`	`83`	`&--is-active:hover {`
`84`		`- background: $highlight-color;`
	`84`	`+ background: $primary-color;`
`85`	`85`	`color: $white;`
`86`	`86`	`border-color: transparent;`
`87`	`87`	`}`