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 'framagit/master'

Browse Source
This commit is contained in:
Julien Fastré 2016-02-21 22:54:51 +01:00
commit 0801db979b
5 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Resources/public/css/scratch.css
View File

@ -5637,5 +5637,16 @@ div.input_with_post_text input {
flex: 2; }
/* <- INPUT CLASS */
@media -sass-debug-info{filename{font-family:file\:\/\/\/media\/ssd2\/julien\/dev\/chill-dev\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003151}}
dl.chill_report_view_data dt {
margin-top: 1.5em;
color: #334d5c; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/media\/ssd2\/julien\/dev\/chill-dev\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003156}}
dl.chill_report_view_data dd {
padding-left: 1.5em;
margin-top: 0.2em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/media\/ssd2\/julien\/dev\/chill-dev\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003160}}
dl.chill_report_view_data dd ul {
padding-left: 0; }
/*# sourceMappingURL=scratch.css.map */

24
Resources/public/sass/_custom.scss
View File

@ -145,4 +145,26 @@ div.input_with_post_text input {
display: inline-block;
flex: 2;
}
/* <- INPUT CLASS */
/* <- INPUT CLASS */
dl.chill_report_view_data {
dt {
margin-top: 1.5em;
color: $chill-blue;
}
dd {
padding-left: 1.5em;
margin-top: 0.2em;
ul {
padding-left: 0;
}
}
}
.flash_message {
margin-top: 2.5em;
}

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

@ -111,7 +111,7 @@
<div class="container content">
{# Flash messages ! #}
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="grid-8 centered success">
<div class="grid-8 centered success flash_message">
<span>
{{ flashMessage|raw }}
</span>
@ -119,7 +119,7 @@
{% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="grid-8 centered error">
<div class="grid-8 centered error flash_message">
<span>
{{ flashMessage|raw }}
</span>
@ -127,7 +127,7 @@
{% endfor %}
{% for flashMessage in app.session.flashbag.get('info') %}
<div class="grid-8 centered notice">
<div class="grid-8 centered notice flash_message">
<span>
{{ flashMessage|raw }}
</span>
@ -136,7 +136,7 @@
{% block content %}
<div class="container">
<div class="grid-8 centered">
<div class="grid-8 centered flash_message">
<h2>{{ 'Search'|trans }}</h2>
<form action="{{ path('chill_main_search') }}" method="get">

6
Resources/views/layoutWithVerticalMenu.html.twig
View File

@ -29,7 +29,7 @@
{# Flash messages ! #}
<div class="container">
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="grid-8 centered success">
<div class="grid-8 centered success flash_message">
<span>
{{ flashMessage|raw }}
</span>
@ -37,7 +37,7 @@
{% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="grid-8 centered error">
<div class="grid-8 centered error flash_message">
<span>
{{ flashMessage|raw }}
</span>
@ -45,7 +45,7 @@
{% endfor %}
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="grid-8 centered notice">
<div class="grid-8 centered notice flash_message">
<span>
{{ flashMessage|raw }}
</span>

6
composer.json
View File

@ -7,9 +7,9 @@
"homepage" : "http://chill.social",
"support": {
"email": "dev@lists.chill.social",
"issues": "https://redmine.champs-libres.coop/projects/chillmain/issues",
"sources": "https://github.com/chill-project/main",
"docs": "http://chill.readthedocs.org"
"issues": "https://git.framasoft.org/Chill-project/Chill-Main/issues",
"sources": "https://git.framasoft.org/Chill-project/Chill-Main",
"docs": "http://docs.chill.social"
},
"autoload": {
"psr-4": { "Chill\\MainBundle\\": "" }