Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +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);
} // }

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

@ -6,9 +6,8 @@ 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;
@ -31,6 +30,14 @@ ul.record_actions {
} }
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 {
padding-left: 1em; padding-left: 1em;
padding-right: 1em; padding-right: 1em;

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;

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');