Merge branch 'master' into '1.0'

CF #16 - Improve the layout



See merge request !2
This commit is contained in:
Julien Fastré 2015-12-11 15:03:49 +01:00
commit c1e7bc0013
3 changed files with 61 additions and 22 deletions

View File

@ -5522,36 +5522,38 @@ header {
background-size: cover; background-size: cover;
background-position: center; } background-position: center; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000334}} /* CUSTOM FIELDS -> */
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000335}}
.cf-title { .cf-title {
font-size: 2em; } font-size: 2em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000338}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000339}}
.cf-subtitle { .cf-subtitle {
font-size: 1.5em; } font-size: 1.5em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000343}} /* <- CUSTOM FIELDS */
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000345}}
ul.submenu.width-11-em { ul.submenu.width-11-em {
min-width: 11em; } min-width: 11em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000343}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000345}}
ul.submenu.width-15-em { ul.submenu.width-15-em {
min-width: 15em; } min-width: 15em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000348}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000350}}
.content { .content {
padding-top: 1em; padding-top: 1em;
padding-bottom: 1em; } padding-bottom: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000353}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000355}}
.select2 { .select2 {
width: 100%; } width: 100%; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000357}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000359}}
ul.custom_fields.choice li { ul.custom_fields.choice li {
list-style: none; } list-style: none; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000362}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000364}}
.sticky-form-buttons { .sticky-form-buttons {
margin-top: 1em; margin-top: 1em;
background-color: #e2793d; background-color: #e2793d;
@ -5561,56 +5563,74 @@ ul.custom_fields.choice li {
padding: 0.5em; padding: 0.5em;
border-radius: 0; } border-radius: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000372}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000374}}
.sticky-form-buttons .margin-5 { .sticky-form-buttons .margin-5 {
margin-left: 5%; margin-left: 5%;
margin-right: 5%; } margin-right: 5%; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000377}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000379}}
.sticky-form-buttons .margin-10 { .sticky-form-buttons .margin-10 {
margin-left: 10%; margin-left: 10%;
margin-right: 10%; } margin-right: 10%; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000382}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000384}}
.errors { .errors {
color: #df4949; } color: #df4949; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000386}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000388}}
.blop label { .blop label {
line-height: 1.5em; } line-height: 1.5em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000391}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000393}}
.footer p { .footer p {
font-family: 'open_sanslight'; } font-family: 'open_sanslight'; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\0000398}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003100}}
.time_compound input[type=text], .time_compound select { .time_compound input[type=text], .time_compound select {
width: 4em; width: 4em;
display: inline-block; display: inline-block;
text-align: center; } text-align: center; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003104}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003106}}
.time_compound .separator { .time_compound .separator {
margin-left: 0.2em; margin-left: 0.2em;
margin-right: 0.2em; } margin-right: 0.2em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003110}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003112}}
.open_sansbold { .open_sansbold {
font-family: "open_sansbold"; } font-family: "open_sansbold"; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003115}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003117}}
ul.record_actions { ul.record_actions {
padding-left: 0; } padding-left: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003118}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003120}}
ul.record_actions li { ul.record_actions li {
display: inline-block; } display: inline-block; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003122}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003124}}
dd { dd {
margin-left: 0; } margin-left: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003126}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003128}}
dt { dt {
font-family: "open_sanssemibold"; } font-family: "open_sanssemibold"; }
/* INPUT CLASS -> */
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003134}}
div.input_with_post_text {
display: flex;
align-items: center; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003139}}
div.input_with_post_text span {
flex: 1; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/_custom\.scss}line{font-family:\00003142}}
div.input_with_post_text input {
width: 70%;
display: inline-block;
flex: 2; }
/* <- INPUT CLASS */
/*# sourceMappingURL=scratch.css.map */ /*# sourceMappingURL=scratch.css.map */

File diff suppressed because one or more lines are too long

View File

@ -31,6 +31,7 @@ header {
background-position: center; background-position: center;
} }
/* CUSTOM FIELDS -> */
.cf-title { .cf-title {
font-size: 2em; font-size: 2em;
} }
@ -38,6 +39,7 @@ header {
.cf-subtitle { .cf-subtitle {
font-size: 1.5em; font-size: 1.5em;
} }
/* <- CUSTOM FIELDS */
@each $len in 11, 15 { @each $len in 11, 15 {
ul.submenu.width-#{$len}-em { ul.submenu.width-#{$len}-em {
@ -125,4 +127,21 @@ dd {
dt { dt {
font-family: "open_sanssemibold"; font-family: "open_sanssemibold";
} }
/* INPUT CLASS -> */
div.input_with_post_text {
display: flex;
align-items: center;
}
div.input_with_post_text span {
flex: 1;
}
div.input_with_post_text input {
width: 70%;
display: inline-block;
flex: 2;
}
/* <- INPUT CLASS */