Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade-sf3' into upgrade-sf3

Browse Source
This commit is contained in:
Julien Fastré 2018-05-04 10:43:24 +02:00
commit 5cef93abd0
7 changed files with 59 additions and 42 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
.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);
// }

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

@ -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;
}
}
}

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

@ -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;

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

@ -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%;
}
}

8
Resources/views/Menu/user.html.twig
View File

@ -1,5 +1,5 @@
{#
* Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
* Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
<info@champs-libres.coop> / <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
@ -23,9 +23,11 @@
<b>{{ app.user.username }}{{ render(controller('ChillMainBundle:UI:showNotificationUserCounter')) }}</b>
</a>
</div>
<ul class="submenu width-11-em">
<ul class="submenu width-11-em" style="padding-left: 0; padding-right: 0; background-color:transparent;">
{% for menu in menus %}
<li><a href="{{ menu.uri }}" style="font-family: 'Open Sans'; font-weight:300; font-size: 0.9em;">{% if menu.extras.icon is defined %}<i class="fa fa-{{ menu.extras.icon }}"></i> {% endif %}{{ menu.label|trans }}</a></li>
<li style="display:block; background-color: #333333; border-bottom: 1px solid #FFF;padding-top:0; padding-bottom:0; padding-left:1.5em;">
<a href="{{ menu.uri }}" style="font-family: 'Open Sans'; font-weight:300; font-size: 0.9em;">{% if menu.extras.icon is defined %}<i class="fa fa-{{ menu.extras.icon }}"></i> {% endif %}{{ menu.label|trans }}</a>
</li>
{% endfor %}
</ul>
</li>

3
Resources/views/layout.html.twig
View File

@ -23,6 +23,9 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ installation.name }} - {% block title %}{% endblock %}</title>
<link rel="shortcut icon" href="/bundles/chillmain/img/favicon.ico" type="image/x-icon">

2
chill.webpack.config.js
View File

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