Skip to content

Commit

Permalink
Merge pull request #136 from xtremespb/core_290621
Browse files Browse the repository at this point in the history
Fix: added missing styles to UI templates
  • Loading branch information
xtremespb committed Jun 29, 2021
2 parents 9669b58 + 9148a82 commit 7081c54
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 2 deletions.
53 changes: 52 additions & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zoia3",
"version": "3.1.72",
"version": "3.1.73",
"description": "ZOIA Content Management System",
"scripts": {
"config": "node ./dev/bin/config.js",
Expand Down
7 changes: 7 additions & 0 deletions src/design/templates/default/template.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import "../../../shared/fonts/source-sans-pro/source-sans-pro.css";
$mdi-font-path: "~@mdi/font/fonts";
@import "~@mdi/font/scss/materialdesignicons.scss";
@import '~pretty-checkbox/src/pretty-checkbox.scss';
@import "~bulma/bulma";
@import "./inputs.scss";

Expand Down Expand Up @@ -65,6 +66,12 @@ $mdi-font-path: "~@mdi/font/fonts";
transition: 0.09s;
}

.button.is-warning {
border: 1px solid $yellow-dark !important;
border-bottom: 2px solid $yellow-darker !important;
transition: 0.09s;
}

.button.is-primary {
border-bottom: 2px solid $primary-dark !important;
transition: 0.09s;
Expand Down
6 changes: 6 additions & 0 deletions src/shared/marko/components/admin/elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
transition: 0.09s;
}

.button.is-warning {
border: 1px solid $yellow-dark !important;
border-bottom: 2px solid $yellow-darker !important;
transition: 0.09s;
}

.button.is-primary {
border-bottom: 2px solid $primary-dark !important;
transition: 0.09s;
Expand Down
2 changes: 2 additions & 0 deletions src/shared/scss/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ $white-lightest: hsl(0, 0%, 99%) !default;
$white: hsl(0, 0%, 100%) !default;
$orange: hsl(14, 100%, 53%) !default;
$yellow: hsl(48, 100%, 67%) !default;
$yellow-dark: hsl(48, 100%, 57%) !default;
$yellow-darker: hsl(48, 100%, 47%) !default;
$green: hsl(141, 53%, 53%) !default;
$turquoise: hsl(171, 100%, 41%) !default;
$cyan: hsl(204, 71%, 53%) !default;
Expand Down

0 comments on commit 7081c54

Please sign in to comment.