Skip to content

Commit

Permalink
[MICROBA-744] Apply rebrand requests to Credentials theme
Browse files Browse the repository at this point in the history
  • Loading branch information
Albert (AJ) St. Aubin committed Dec 9, 2020
1 parent ce1984a commit 52668f9
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 73 deletions.
2 changes: 1 addition & 1 deletion edx_credentials_themes/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.42'
__version__ = '0.1.43'
5 changes: 4 additions & 1 deletion edx_credentials_themes/static/edx.org/base/sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ html, body {
// #TYPOGRAPHY
// ------------------------------
a {
color: $blue;
color: $primary-500;
&:hover {
color: $gray-700;
}
}

// ------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@
// ------------------------------
// #FOOTER
// ------------------------------
.footer-app {
@extend %text-micro;
}

.footer-app-nav {

Expand All @@ -173,4 +170,3 @@
width: 120px;
}
}

5 changes: 2 additions & 3 deletions edx_credentials_themes/static/edx.org/base/sass/_layouts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

.record-card {
margin-bottom: 0;
background: $stripe-grey;
background: $gray-200;

&:nth-of-type(even){
background: $white;
Expand All @@ -168,7 +168,6 @@

.program-title {
font-size: $font-size-lg;
color: $heading-grey;
}
}

Expand All @@ -184,7 +183,7 @@

.inline-data {
padding-right: 0.4em;
color: $paragraph-grey;
color: $primary-700;
}

}
Expand Down
8 changes: 4 additions & 4 deletions edx_credentials_themes/static/edx.org/base/sass/_lib.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
14 changes: 0 additions & 14 deletions edx_credentials_themes/static/edx.org/base/sass/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ $record-border-color: #C2C2C2;
.program-type {
display: flex;
align-items: center;
color: $gray-500;
}

.program-icon {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

92 changes: 56 additions & 36 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 52668f9

Please sign in to comment.