Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix sass variables for compilation with webpack

Browse Source
This commit is contained in:
nobohan 2018-05-02 09:33:18 +02:00
parent 65251650fc
commit 730e547b77
5 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/public/sass/custom/_flash_messages.scss
View File

@ -4,11 +4,11 @@
// note that other level are defined in modules/_alerts.scss // note that other level are defined in modules/_alerts.scss
.alert { // .alert {
// override in modules/_alerts.scss // // override in modules/_alerts.scss
@include alert($red); // @include alert($red);
} // }
//
.warning { // .warning {
@include alert($orange); // @include alert($orange);
} // }

21
Resources/public/sass/custom/_record_actions.scss
View File

@ -6,29 +6,36 @@ ul.record_actions li {
display: inline-block; display: inline-block;
}*/ }*/
ul.record_actions { ul.record_actions, ul.record_actions_column {
display: flex; display: flex;
flex-direction: row;
justify-content: flex-end; justify-content: flex-end;
padding: 0.5em 0; padding: 0.5em 0;
li { li {
display: inline-block; display: inline-block;
list-style-type: none; list-style-type: none;
margin-right: 1em; margin-right: 1em;
order: 99; order: 99;
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
} }
} }
li.cancel { li.cancel {
order: 1; order: 1;
margin-right: auto; margin-right: auto;
} }
}
ul.record_actions {
flex-direction: row;
}
ul.record_actions_column {
flex-direction: column;
} }
ul.record_actions.sticky-form-buttons { ul.record_actions.sticky-form-buttons {
@ -42,4 +49,4 @@ td ul.record_actions,
li { li {
margin-right: 0.2em; margin-right: 0.2em;
} }
} }

7
Resources/public/sass/custom/config/_colors.scss
View File

@ -10,7 +10,9 @@ $chill-beige :#cabb9f;
$chill-pink :#dd506d; $chill-pink :#dd506d;
$chill-dark-gray: #333333; $chill-dark-gray: #333333;
$chill-light-gray: #b2b2b2; $chill-light-gray: #b2b2b2;
$chill-llight-gray: $grey-10; $chill-llight-gray: $chill-light-gray;
$dark-grey: $chill-dark-gray;
$color-name: "blue" "green" "green-dark" "yellow" "orange" "red" "gray" "beige" "pink" "dark-gray" "light-gray"; $color-name: "blue" "green" "green-dark" "yellow" "orange" "red" "gray" "beige" "pink" "dark-gray" "light-gray";
$color-code: #334d5c #43b29d #328474 #eec84a #e2793d #df4949 #ececec #cabb9f #dd506d #333333 #b2b2b2; $color-code: #334d5c #43b29d #328474 #eec84a #e2793d #df4949 #ececec #cabb9f #dd506d #333333 #b2b2b2;
@ -27,3 +29,6 @@ $green: $chill-green;
$blue: $chill-blue; $blue: $chill-blue;
$yellow: $chill-yellow; $yellow: $chill-yellow;
$black: #111111;
$white: #ffffff;
$light-grey: $chill-light-gray;

44
Resources/public/sass/custom/modules/_buttons.scss
View File

@ -1,27 +1,27 @@
.sc-button { .sc-button {
&.bt-submit, &.bt-save, &.bt-create, &.bt-new { &.bt-submit, &.bt-save, &.bt-create, &.bt-new {
@include button($green, $white); @include button($green, $white);
} }
&.bt-reset, &.bt-delete { &.bt-reset, &.bt-delete {
@include button($red, $white); @include button($red, $white);
} }
&.bt-action, &.bt-edit, &.bt-update { &.bt-action, &.bt-edit, &.bt-update {
@include button($orange, $white); @include button($orange, $white);
} }
&.bt-show, &.bt-view { &.bt-show, &.bt-view {
@include button($blue, $white); @include button($blue, $white);
} }
&:not(.change-icon) { &:not(.change-icon) {
&.bt-create::before, &.bt-create::before,
&.bt-save::before, &.bt-save::before,
&.bt-new::before, &.bt-new::before,
&.bt-delete::before, &.bt-delete::before,
&.bt-update::before, &.bt-update::before,
&.bt-edit::before, &.bt-edit::before,
&.bt-cancel::before, &.bt-cancel::before,
&.bt-view::before, &.bt-view::before,
@ -52,7 +52,7 @@
&.bt-cancel::before { &.bt-cancel::before {
// add an arrow left // add an arrow left
content: ""; content: "";
} }
&.bt-show::before, &.bt-view::before { &.bt-show::before, &.bt-view::before {
@ -70,11 +70,11 @@
margin-right: 0; margin-right: 0;
} }
&:not(.change-icon) { &:not(.change-icon) {
&.bt-create::before, &.bt-create::before,
&.bt-save::before, &.bt-save::before,
&.bt-new::before, &.bt-new::before,
&.bt-delete::before, &.bt-delete::before,
&.bt-update::before, &.bt-update::before,
&.bt-edit::before, &.bt-edit::before,
&.bt-cancel::before, &.bt-cancel::before,
&.bt-view::before, &.bt-view::before,
@ -83,13 +83,13 @@
} }
} }
} }
&.has-hidden > span.show-on-hover { &.has-hidden > span.show-on-hover {
display: none; display: none;
} }
&.has-hidden:hover { &.has-hidden:hover {
> span.show-on-hover { > span.show-on-hover {
display: inline-block; display: inline-block;
} }
@ -97,13 +97,13 @@
> i.fa { > i.fa {
margin-right: 0.5em; margin-right: 0.5em;
} }
&:not(.change-icon) { &:not(.change-icon) {
&.bt-create::before, &.bt-create::before,
&.bt-save::before, &.bt-save::before,
&.bt-new::before, &.bt-new::before,
&.bt-delete::before, &.bt-delete::before,
&.bt-update::before, &.bt-update::before,
&.bt-edit::before, &.bt-edit::before,
&.bt-cancel::before, &.bt-cancel::before,
&.bt-view::before, &.bt-view::before,
@ -144,4 +144,4 @@
.sticky-form-buttons .margin-10 { .sticky-form-buttons .margin-10 {
margin-left: 10%; margin-left: 10%;
margin-right: 10%; margin-right: 10%;
} }

2
chill.webpack.config.js
View File

@ -18,7 +18,7 @@ import {chill} from './Resources/public/js/chill.js';
global.chill = chill; global.chill = chill;
// css // css
//require('./Resources/public/sass/_custom.scss'); require('./Resources/public/sass/_custom.scss');
require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/chillmain.css');
require('./Resources/public/css/pikaday.css'); require('./Resources/public/css/pikaday.css');
require('./Resources/public/css/scratch.css'); require('./Resources/public/css/scratch.css');