Commit 83b1b19f authored by Julien Fastré's avatar Julien Fastré

move activity.scss to own bundle + create namespace for sass

parent fe425317
Pipeline #292535 failed with stages
......@@ -119,3 +119,9 @@ Version 1.5.17
- [CRUD] add step delete
- [CRUD] check that action exists before inserting them in edit and view template
- [CRUD] fix error when no crud are created
Master branch
=============
- [webpack] add namespace for import sass ;
- [activity] move activity.scss to own bundle ;
......@@ -2,19 +2,6 @@ parameters:
# cl_chill_main.example.class: Chill\MainBundle\Example
services:
twig_intl:
class: Twig_Extensions_Extension_Intl
tags:
- { name: twig.extension }
twig_date:
class: Twig_Extensions_Extension_Date
arguments:
- "@translator"
tags:
- { name: twig.extension }
chill.main.helper.translatable_string:
class: Chill\MainBundle\Templating\TranslatableStringHelper
arguments:
......
services:
twig_intl:
class: Twig_Extensions_Extension_Intl
tags:
- { name: twig.extension }
twig_date:
class: Twig_Extensions_Extension_Date
arguments:
- "@translator"
tags:
- { name: twig.extension }
twig_text:
class: Twig_Extensions_Extension_Text
tags:
- { name: twig.extension }
Chill\MainBundle\Templating\ChillTwigHelper:
tags:
- { name: twig.extension }
......
......@@ -4,7 +4,6 @@
@import 'custom/fonts';
@import 'custom/timeline';
@import 'custom/mixins/entity';
@import 'custom/activity';
@import 'custom/report';
@import 'custom/person';
@import 'custom/pagination';
......
span.entity.entity-activity.activity-reason {
@include entity($chill-pink, white);
}
.activity {
color: $chill-green;
}
@mixin entity($background-color, $color: white) {
font-variant: small-caps;
display: inline;
display: inline-block;
padding: .2em .6em .3em;
font-size: 88%;
font-weight: bold;
......@@ -11,5 +11,6 @@
border-radius: .25em;
color: $color;
background-color: $background-color;
margin: 0.5em;
}
......@@ -4,6 +4,7 @@ module.exports = function(encore, entries) {
encore.addEntry('login', './vendor/chill-project/main/Resources/public/modules/login_page/index.js');
encore.addEntry('tabs', './vendor/chill-project/main/Resources/public/modules/tabs/index.js');
encore.addAliases({
ShowHide: __dirname + '/Resources/public/modules/show_hide/'
ShowHide: __dirname + '/Resources/public/modules/show_hide/',
ChillMainSass: __dirname + '/Resources/public/sass'
});
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment