From 65251650fccb5c0050f34ffb9cc41e3369859904 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 2 May 2018 09:32:07 +0200 Subject: [PATCH 1/3] add HTML meta tags in the HEAD of layout.html.twig --- Resources/views/layout.html.twig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index effc1624e..d971b2107 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -23,6 +23,9 @@ + + + {{ installation.name }} - {% block title %}{% endblock %} From 730e547b77b529c9aa6a0c9d646abd700e06df22 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 2 May 2018 09:33:18 +0200 Subject: [PATCH 2/3] fix sass variables for compilation with webpack --- .../public/sass/custom/_flash_messages.scss | 16 +++---- .../public/sass/custom/_record_actions.scss | 21 ++++++--- .../public/sass/custom/config/_colors.scss | 7 ++- .../public/sass/custom/modules/_buttons.scss | 44 +++++++++---------- chill.webpack.config.js | 2 +- 5 files changed, 51 insertions(+), 39 deletions(-) diff --git a/Resources/public/sass/custom/_flash_messages.scss b/Resources/public/sass/custom/_flash_messages.scss index e539171d0..62f875dfa 100644 --- a/Resources/public/sass/custom/_flash_messages.scss +++ b/Resources/public/sass/custom/_flash_messages.scss @@ -4,11 +4,11 @@ // note that other level are defined in modules/_alerts.scss -.alert { - // override in modules/_alerts.scss - @include alert($red); -} - -.warning { - @include alert($orange); -} +// .alert { +// // override in modules/_alerts.scss +// @include alert($red); +// } +// +// .warning { +// @include alert($orange); +// } diff --git a/Resources/public/sass/custom/_record_actions.scss b/Resources/public/sass/custom/_record_actions.scss index 7b73db79f..3cd9fc9a5 100644 --- a/Resources/public/sass/custom/_record_actions.scss +++ b/Resources/public/sass/custom/_record_actions.scss @@ -6,29 +6,36 @@ ul.record_actions li { display: inline-block; }*/ -ul.record_actions { +ul.record_actions, ul.record_actions_column { display: flex; - flex-direction: row; justify-content: flex-end; padding: 0.5em 0; - + li { display: inline-block; list-style-type: none; margin-right: 1em; order: 99; - + &:last-child { margin-right: 0; } } - + li.cancel { order: 1; margin-right: auto; } - + +} + +ul.record_actions { + flex-direction: row; +} + +ul.record_actions_column { + flex-direction: column; } ul.record_actions.sticky-form-buttons { @@ -42,4 +49,4 @@ td ul.record_actions, li { margin-right: 0.2em; } -} \ No newline at end of file +} diff --git a/Resources/public/sass/custom/config/_colors.scss b/Resources/public/sass/custom/config/_colors.scss index fee58a852..f19899f6c 100644 --- a/Resources/public/sass/custom/config/_colors.scss +++ b/Resources/public/sass/custom/config/_colors.scss @@ -10,7 +10,9 @@ $chill-beige :#cabb9f; $chill-pink :#dd506d; $chill-dark-gray: #333333; $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-code: #334d5c #43b29d #328474 #eec84a #e2793d #df4949 #ececec #cabb9f #dd506d #333333 #b2b2b2; @@ -27,3 +29,6 @@ $green: $chill-green; $blue: $chill-blue; $yellow: $chill-yellow; +$black: #111111; +$white: #ffffff; +$light-grey: $chill-light-gray; diff --git a/Resources/public/sass/custom/modules/_buttons.scss b/Resources/public/sass/custom/modules/_buttons.scss index 9dfecf8a1..4a05c3089 100644 --- a/Resources/public/sass/custom/modules/_buttons.scss +++ b/Resources/public/sass/custom/modules/_buttons.scss @@ -1,27 +1,27 @@ .sc-button { &.bt-submit, &.bt-save, &.bt-create, &.bt-new { - @include button($green, $white); + @include button($green, $white); } &.bt-reset, &.bt-delete { - @include button($red, $white); + @include button($red, $white); } &.bt-action, &.bt-edit, &.bt-update { - @include button($orange, $white); + @include button($orange, $white); } &.bt-show, &.bt-view { @include button($blue, $white); } - + &:not(.change-icon) { - &.bt-create::before, + &.bt-create::before, &.bt-save::before, - &.bt-new::before, - &.bt-delete::before, - &.bt-update::before, + &.bt-new::before, + &.bt-delete::before, + &.bt-update::before, &.bt-edit::before, &.bt-cancel::before, &.bt-view::before, @@ -52,7 +52,7 @@ &.bt-cancel::before { // add an arrow left - content: ""; + content: ""; } &.bt-show::before, &.bt-view::before { @@ -70,11 +70,11 @@ margin-right: 0; } &:not(.change-icon) { - &.bt-create::before, + &.bt-create::before, &.bt-save::before, - &.bt-new::before, - &.bt-delete::before, - &.bt-update::before, + &.bt-new::before, + &.bt-delete::before, + &.bt-update::before, &.bt-edit::before, &.bt-cancel::before, &.bt-view::before, @@ -83,13 +83,13 @@ } } } - + &.has-hidden > span.show-on-hover { display: none; } - + &.has-hidden:hover { - + > span.show-on-hover { display: inline-block; } @@ -97,13 +97,13 @@ > i.fa { margin-right: 0.5em; } - + &:not(.change-icon) { - &.bt-create::before, + &.bt-create::before, &.bt-save::before, - &.bt-new::before, - &.bt-delete::before, - &.bt-update::before, + &.bt-new::before, + &.bt-delete::before, + &.bt-update::before, &.bt-edit::before, &.bt-cancel::before, &.bt-view::before, @@ -144,4 +144,4 @@ .sticky-form-buttons .margin-10 { margin-left: 10%; margin-right: 10%; -} \ No newline at end of file +} diff --git a/chill.webpack.config.js b/chill.webpack.config.js index 0decfaf47..b14331e57 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -18,7 +18,7 @@ import {chill} from './Resources/public/js/chill.js'; global.chill = chill; // css -//require('./Resources/public/sass/_custom.scss'); +require('./Resources/public/sass/_custom.scss'); require('./Resources/public/css/chillmain.css'); require('./Resources/public/css/pikaday.css'); require('./Resources/public/css/scratch.css'); From ce39359fceca55959cdd72ca930664dc2bdb883a Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 2 May 2018 10:48:08 +0200 Subject: [PATCH 3/3] style user menu --- Resources/views/Menu/user.html.twig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/views/Menu/user.html.twig b/Resources/views/Menu/user.html.twig index 420c82809..f79b47e78 100644 --- a/Resources/views/Menu/user.html.twig +++ b/Resources/views/Menu/user.html.twig @@ -1,5 +1,5 @@ {# - * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, + * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, / * * This program is free software: you can redistribute it and/or modify @@ -23,9 +23,11 @@ {{ app.user.username }}{{ render(controller('ChillMainBundle:UI:showNotificationUserCounter')) }} -