Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2026-04-08 14:03:44 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into 1.0

Browse Source 
Conflicts:
	Resources/public/css/scratch.css.map
This commit is contained in:
Julien Fastré
2016-01-05 14:17:58 +01:00
parent daf7d1f71f c8077ac575
commit 09099b0566
10 changed files with 146 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5626,10 +5626,11 @@ div.input_with_post_text {
align-items: center; }
@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:\00003139}}
div.input_with_post_text span {
flex: 1; }
div.input_with_post_text span.post_text {
flex: 1;
margin-left: 0.5em; }
@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:\00003142}}
@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:\00003143}}
div.input_with_post_text input {
width: 70%;
display: inline-block;