Skip to content

Commit

Permalink
updated the sass mixin
Browse files Browse the repository at this point in the history
fixes #2885
  • Loading branch information
brandonkelly committed May 22, 2018
1 parent 104e1cb commit 29691a3
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 33 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
### Changed
- Fixed a bug where Craft was checking the file system when determining if an asset was a GIF, when it should have just been checking the file extension.
- `craft\base\Plugin` now sets the default `$controllerNamespace` value to the plugin class’ namespace + `\controllers` or `\console\controllers`, depending on whether it’s a web or console request.
- Improved the contrast of success and error notices in the Control Panel to meet WCAG AA requirements. ([#2885](https://github.com/craftcms/cms/issues/2885))

### Fixed
- Fixed a bug where the Plugin Store was listing featured plugins (e.g. “Recently Added”) in alphabetical order rather than the API-defined order. ([pixelandtonic/craftnet#83](https://github.com/pixelandtonic/craftnet/issues/83))
Expand Down
8 changes: 4 additions & 4 deletions lib/craftcms-sass/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ $secondarySubmitHoverColor: hsl($hue, 10%, 50%);
$secondarySubmitActiveColor: hsl($hue, 10%, 40%);

// alert/notice colors
$errorColor: $orange;
$warningColor: $orange;
$successColor: $green;
$noticeColor: $blue;
$errorColor: darken($orange, 17%);
$warningColor: $errorColor;
$successColor: darken($green, 10%);
$noticeColor: darken($blue, 10%);

// UI element styles
$btnBorderRadius: 2px;
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"accounting": "^0.4.1",
"autoprefixer": "^7.1.4",
"bootstrap": "3.3.* || 3.2.* || 3.1.*",
"craftcms-sass": "^1.6.2",
"craftcms-sass": "^1.6.4",
"d3": "^4.11.0",
"d3-format": "^1.3.0",
"d3-time-format": "^2.1.0",
Expand All @@ -39,7 +39,7 @@
"gulp": "^3.9.1",
"gulp-concat": "^2.6.1",
"gulp-json-minify": "^1.2.0",
"gulp-rename": "^1.2.2",
"gulp-rename": "^1.2.3",
"gulp-sourcemaps": "^2.6.0",
"gulp-uglify": "^3.0.0",
"inputmask": "~3.2.2 || ~3.3.5",
Expand Down
4 changes: 4 additions & 0 deletions src/web/assets/cp/dist/css/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,10 @@ td.right {
color: $successColor !important;
}

.notice {
color: $noticeColor !important;
}

.warning {
color: $warningColor !important;
}
Expand Down
38 changes: 20 additions & 18 deletions src/web/assets/cp/dist/css/craft.css

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

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/craft.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/updates/dist/updates.css

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

2 changes: 1 addition & 1 deletion src/web/assets/updates/dist/updates.css.map

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

0 comments on commit 29691a3

Please sign in to comment.