[MICROBA-744] Apply rebrand requests to Credentials theme

openedx · Dec 9, 2020 · 52668f9 · 52668f9
1 parent ce1984a
commit 52668f9
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 73 deletions.
diff --git a/edx_credentials_themes/__init__.py b/edx_credentials_themes/__init__.py
@@ -1 +1 @@
-__version__ = '0.1.42'
+__version__ = '0.1.43'
diff --git a/edx_credentials_themes/static/edx.org/base/sass/_base.scss b/edx_credentials_themes/static/edx.org/base/sass/_base.scss
@@ -21,7 +21,10 @@ html, body {
 // #TYPOGRAPHY
 // ------------------------------
 a {
-  color: $blue;
+  color: $primary-500;
+  &:hover {
+    color: $gray-700;
+  }
 }
 
 // ------------------------------

diff --git a/edx_credentials_themes/static/edx.org/base/sass/_components.scss b/edx_credentials_themes/static/edx.org/base/sass/_components.scss
@@ -151,9 +151,6 @@
 // ------------------------------
 // #FOOTER
 // ------------------------------
-.footer-app {
-    @extend %text-micro;
-}
 
 .footer-app-nav {
 
@@ -173,4 +170,3 @@
     width: 120px;
   }
 }
-
diff --git a/edx_credentials_themes/static/edx.org/base/sass/_layouts.scss b/edx_credentials_themes/static/edx.org/base/sass/_layouts.scss
@@ -148,7 +148,7 @@
 
 .record-card {
   margin-bottom: 0;
-  background: $stripe-grey;
+  background: $gray-200;
 
   &:nth-of-type(even){
     background: $white;
@@ -168,7 +168,6 @@
 
   .program-title {
     font-size: $font-size-lg;
-    color: $heading-grey;
   }
 }
 
@@ -184,7 +183,7 @@
 
   .inline-data {
     padding-right: 0.4em;
-    color: $paragraph-grey;
+    color: $primary-700;
   }
 
 }

diff --git a/edx_credentials_themes/static/edx.org/base/sass/_lib.scss b/edx_credentials_themes/static/edx.org/base/sass/_lib.scss
@@ -4,7 +4,7 @@
 // About: third party libraries and dependencies import
 
 @import '~font-awesome/scss/font-awesome';
-@import "~@edx/brand/paragon/fonts";
-@import "~@edx/brand/paragon/variables";
-@import "~@edx/paragon/scss/core/core";
-@import "~@edx/brand/paragon/overrides";
+@import "@edx/brand/paragon/fonts";
+@import "@edx/brand/paragon/variables";
+@import "@edx/paragon/scss/core/core";
+@import "@edx/brand/paragon/overrides";
diff --git a/edx_credentials_themes/static/edx.org/base/sass/_utilities.scss b/edx_credentials_themes/static/edx.org/base/sass/_utilities.scss
@@ -16,20 +16,6 @@ $edx-d-color: #8a8c8f;
 $edx-d-x-overlap-color: #026ba4;
 $edx-x-color: #209fda;
 
-// #bootstrapupgrade
-// Colors from edX bootstrap. Remove these when we update the libraries.
-$white: #fff;
-$gray-100: #f5f5f5;
-$gray-200: #e7e7e7;
-$gray-300: #d9d9d9;
-$gray-400: #c8c8c8;
-$gray-500: #a0a0a0;
-$gray-600: #767676;
-$gray-700: #414141;
-$gray-800: #313131;
-$gray-900: #111;
-$black: #000;
-
 // Font sizes
 // Taken from edx-pattern library and put here as vars.
 $font-xxxx-large: 2.375rem;

diff --git a/edx_credentials_themes/static/edx.org/base/sass/views/_masquerade-banner.scss b/edx_credentials_themes/static/edx.org/base/sass/views/_masquerade-banner.scss
@@ -5,7 +5,7 @@ $masquerade-white: #fff;
 $masquerade-baseline: 20px;
 
 .masquerade-banner-wrapper {
-  background: theme-color("primary", 500);;
+  background: theme-color("primary", 500);
 
   .masquerade-banner-actions {
     .masquerade-info-text, .masquerade-label {

diff --git a/edx_credentials_themes/static/edx.org/base/sass/views/_program-record.scss b/edx_credentials_themes/static/edx.org/base/sass/views/_program-record.scss
@@ -133,6 +133,7 @@ $record-border-color: #C2C2C2;
     .program-type {
       display: flex;
       align-items: center;
+      color: $gray-500;
     }
 
     .program-icon {

diff --git a/edx_credentials_themes/static/edx.org/base/sass/views/_records-list.scss b/edx_credentials_themes/static/edx.org/base/sass/views/_records-list.scss
@@ -1,11 +1,9 @@
 $heading-grey: #4A4A4A;
-$paragraph-grey: #707070;
 $btn-blue: #0075b4;
 $btn-blue-hover-light: #F2F8FB;
-$stripe-grey: #F9FAFC;
 
 .paragraph-grey {
-  color: $paragraph-grey;
+  color: $gray-700;
 }
 
 .certificate-icon {

diff --git a/edx_credentials_themes/static/edx.org/css/edx.org.base.style-ltr.css b/edx_credentials_themes/static/edx.org/css/edx.org.base.style-ltr.css
diff --git a/edx_credentials_themes/static/edx.org/css/edx.org.base.style-rtl.css b/edx_credentials_themes/static/edx.org/css/edx.org.base.style-rtl.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,17 +14,17 @@
   "license": "UNLICENSED",
   "homepage": "https://github.com/edx/credentials-themes",
   "devDependencies": {
-    "@edx/brand": "npm:@edx/brand-edx.org@^1.2.5",
-    "@edx/edx-bootstrap": "^1.0.3",
-    "@edx/paragon": "^12.2.0",
+    "@edx/brand": "npm:@edx/brand-edx.org@^1.3.0",
+    "@edx/edx-bootstrap": "^2.2.2",
+    "@edx/paragon": "^12.3.1",
     "bi-app-sass": "^1.1.0",
     "bootstrap": "^4.5.3",
     "css-loader": "^5.0.1",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
     "imports-loader": "^1.2.0",
     "jquery": "^3.5.1",
-    "mini-css-extract-plugin": "^1.3.1",
+    "mini-css-extract-plugin": "^1.3.2",
     "node-sass": "^4.14.1",
     "popper.js": "^1.16.1",
     "sass-loader": "^10.1.0",