+
{{ form_rest(form_add_participation_by_person) }}
@@ -138,7 +138,7 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
index 2142998f5..3f2f5b146 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
@@ -10,10 +10,10 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
index f1b2f9acd..308974770 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
@@ -22,10 +22,10 @@
|
@@ -36,7 +36,7 @@
{% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
index b4aa07626..e7d2f0d66 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
@@ -10,10 +10,10 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
index 56edf0a19..3e0aaba03 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
@@ -23,14 +23,14 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
index 18465d241..a50615414 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
@@ -49,12 +49,12 @@
-
-
+
{{ 'Back to the event'|trans }}
-
- {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-edit' } } ) }}
+ {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
index 93956c5f0..19592526e 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
@@ -32,12 +32,12 @@
{% set returnPath = app.request.get('return_path') %}
{% set returnLabel = app.request.get('return_label') %}
-
+
{{ returnLabel |default('Back to the event'|trans) }}
- {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-edit' } } ) }}
+ {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index f73744a59..2e7dd6cdb 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -52,14 +52,13 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 514161c35..33f7bc213 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -33,13 +33,12 @@
-
-
-
+
{{ 'Back to the event'|trans }}
-
- {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
+ {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
index 0df6e12de..a0b2d4f92 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
@@ -10,10 +10,10 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
index f6b071924..4fb4f866f 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
@@ -24,10 +24,10 @@
|
@@ -38,7 +38,7 @@
{% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
index 1bc923f09..da0a3e459 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
@@ -11,10 +11,10 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
index 5d24ef14f..2fb920eb2 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
@@ -27,14 +27,14 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
index 449ddcb1f..e376e05e3 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
@@ -11,10 +11,10 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
index 8dec02493..7ac4ed37e 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
@@ -24,10 +24,10 @@
|
@@ -38,7 +38,7 @@
{% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
index f88738d23..aa3ecc374 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
@@ -11,10 +11,10 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
index e79de3b1c..624997026 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
@@ -27,14 +27,14 @@
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
index 09c2390c2..2750b285f 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
@@ -42,7 +42,7 @@
-
-
+
{{ 'Show the event'|trans }}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
index 894f65479..9cf4011e4 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
@@ -26,12 +26,12 @@
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
index b74fd106d..fc6402621 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
@@ -65,17 +65,17 @@
{% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::SHOW'), f) %}
-
-
+
{% endif %}
{% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), f) %}
-
-
+
{% endif %}
{% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::DELETE'), f) %}
-
-
+
{% endif %}
@@ -116,7 +116,7 @@
{% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::CREATE'), person) %}
{% endif %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
index c691bba7e..12b05cb58 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
@@ -26,12 +26,12 @@
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
index 357486102..a84f695a8 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
@@ -73,13 +73,13 @@
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
index 378597a61..2400b23dd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
@@ -2,19 +2,17 @@
* These custom styles will override bootstrap enabled stylesheets
*/
+/// chill buttons
+@import 'custom/_buttons';
+
+// chill record_actions
+@import 'custom/_record_actions';
+
/// titles
h1, h2, .h1, .h2 {
font-weight: $headings-font-weight + 200;
}
-/// buttons
-.btn-success,
-.btn-success:hover,
-.btn-warning,
-.btn-warning:hover {
- color: $gray-100;
-}
-
/// typography
.open_sansbold {
font-weight: bold;
@@ -236,11 +234,11 @@ div.vertical-menu {
border-radius: 0;
margin-top: 0.5rem;
a.list-group-item {
- background-color: $info;
+ background-color: $chill-yellow;
border: 0;
margin-bottom: 0.25rem;
&:hover {
- background-color: shade-color($info, 5%)
+ background-color: tint-color($chill-yellow, 20%)
}
}
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
new file mode 100644
index 000000000..07f61e9bf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
@@ -0,0 +1,87 @@
+
+/// buttons
+
+.btn-success,
+.btn-success:hover,
+.btn-warning,
+.btn-warning:hover {
+ color: $light;
+}
+
+.btn {
+ &.btn-submit,
+ &.btn-save,
+ &.btn-create,
+ &.btn-new,
+ &.btn-duplicate,
+ &.btn-not-duplicate {
+ background-color: $chill-green;
+ color: $light;
+ }
+
+ &.btn-reset,
+ &.btn-delete,
+ &.btn-danger,
+ &.btn-remove {
+ background-color: $chill-red;
+ color: $light;
+ }
+
+ &.btn-action,
+ &.btn-edit,
+ &.btn-update {
+ background-color: $chill-orange;
+ color: $light;
+ }
+
+ &.btn-show,
+ &.btn-view {
+ background-color: $chill-blue;
+ color: $light;
+ }
+
+ &.btn-cancel {
+ background-color: $chill-light-gray;
+ color: $black;
+ }
+}
+
+.btn {
+ &.btn-new::before,
+ &.btn-create::before,
+ &.btn-edit::before,
+ &.btn-update::before,
+ &.btn-show::before,
+ &.btn-view::before,
+ &.btn-save::before,
+ &.btn-duplicate::before,
+ &.btn-not-duplicate::before,
+ &.btn-submit::before,
+ &.btn-reset::before,
+ &.btn-action::before,
+ &.btn-delete::before,
+ &.btn-remove::before,
+ &.btn-cancel::before {
+ font: normal normal normal 14px/1 ForkAwesome;
+ margin-right: 0.5em;
+ }
+ &[class*='btn-']:empty {
+ &::before {
+ margin-right: 0;
+ }
+ }
+}
+
+.btn {
+ &.btn-new::before,
+ &.btn-create::before { content: "\f067"; } // fa-plus
+ &.btn-edit::before,
+ &.btn-update::before { content: "\f040"; } // fa-pencil
+ &.btn-show::before,
+ &.btn-view::before { content: "\f06e"; } // fa-eye
+ &.btn-save::before { content: "\f0c7"; } // fa-floppy-o
+ &.btn-duplicate::before { content: "\f24d"; } // fa-clone // f0c5 fa-files-o
+ &.btn-delete::before { content: "\f1f8"; } // fa-trash
+ &.btn-remove::before { content: "\f00d"; } // fa-times
+ &.btn-cancel::before { content: "\f060"; } // fa-arrow-left
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss
new file mode 100644
index 000000000..ccbc5912a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss
@@ -0,0 +1,58 @@
+// Symfony records actions
+/*ul.record_actions {
+ padding-left: 0;
+}
+ul.record_actions li {
+ display: inline-block;
+}*/
+
+ul.record_actions, ul.record_actions_column {
+ display: flex;
+ justify-content: flex-end;
+
+ &.record_actions--left {
+ justify-content: flex-start;
+ }
+
+ padding: 0.5em 0;
+ flex-wrap: wrap-reverse;
+
+ 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 {
+ padding-left: 1em;
+ padding-right: 1em;
+}
+
+// inside table, little space between elements
+td ul.record_actions,
+ ul.record_actions_small {
+ li {
+ margin-right: 0.2em;
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss
index e6e6e25ad..e08569ff9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss
@@ -19,6 +19,21 @@ $gray-900: #212529 !default;
$black: #111 !default;
// scss-docs-end gray-color-variables
+/*
+ * CHILL Theme colors
+ * (apply chill colors, add missing colors, trust in bootstrap grey scale)
+*/
+// scss-docs-start color-variables
+$blue: #334d5c !default;
+$green: #43b29d !default;
+$yellow: #eec84a !default;
+$orange: #e2793d !default;
+$red: #df4949 !default;
+$pink: #dd506d !default;
+$beige: #cabb9f !default;
+// scss-docs-end color-variables
+
+
// fusv-disable
// scss-docs-start gray-colors-map
$grays: (
@@ -35,70 +50,6 @@ $grays: (
// scss-docs-end gray-colors-map
// fusv-enable
-/*
- * CHILL Theme colors
- * (apply chill colors, add missing colors, trust in bootstrap grey scale)
-*/
-// scss-docs-start color-variables
-$blue: #334d5c !default;
-$green: #43b29d !default;
-$yellow: #eec84a !default;
-$orange: #e2793d !default;
-$red: #df4949 !default;
-$pink: #dd506d !default;
-$green-dark: #328474 !default;
-$beige: #cabb9f !default;
-// scss-docs-end color-variables
-
-
-// scss-docs-start colors-map
-$colors: (
- "blue": $blue,
- "green": $green,
- "yellow": $yellow,
- "orange": $orange,
- "red": $red,
- "pink": $pink,
- "green-dark": $green-dark,
- "beige": $beige,
- "white": $white,
- "gray": $gray-600,
- "gray-dark": $gray-800
-) !default;
-// scss-docs-end colors-map
-
-// scss-docs-start theme-color-variables
-$primary: $blue;
-$secondary: $gray-200;
-$success: $green;
-$info: $yellow;
-$warning: $orange;
-$danger: $red;
-$light: $gray-100;
-$dark: $gray-800;
-// scss-docs-end theme-color-variables
-
-// scss-docs-start theme-colors-map
-$theme-colors: (
- "primary": $primary,
- "secondary": $secondary,
- "success": $success,
- "info": $info,
- "warning": $warning,
- "danger": $danger,
- "light": $light,
- "dark": $dark
-) !default;
-// scss-docs-end theme-colors-map
-
-// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
-// See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
-$min-contrast-ratio: 4.5 !default;
-
-// Customize the light and dark text colors for use in our color contrast function.
-$color-contrast-dark: $black !default;
-$color-contrast-light: $white !default;
-
// fusv-disable
$blue-100: tint-color($blue, 80%) !default;
$blue-200: tint-color($blue, 60%) !default;
@@ -110,16 +61,6 @@ $blue-700: shade-color($blue, 40%) !default;
$blue-800: shade-color($blue, 60%) !default;
$blue-900: shade-color($blue, 80%) !default;
-$green-dark-100: tint-color($green-dark, 80%) !default;
-$green-dark-200: tint-color($green-dark, 60%) !default;
-$green-dark-300: tint-color($green-dark, 40%) !default;
-$green-dark-400: tint-color($green-dark, 20%) !default;
-$green-dark-500: $green-dark !default;
-$green-dark-600: shade-color($green-dark, 20%) !default;
-$green-dark-700: shade-color($green-dark, 40%) !default;
-$green-dark-800: shade-color($green-dark, 60%) !default;
-$green-dark-900: shade-color($green-dark, 80%) !default;
-
$beige-100: tint-color($beige, 80%) !default;
$beige-200: tint-color($beige, 60%) !default;
$beige-300: tint-color($beige, 40%) !default;
@@ -181,6 +122,85 @@ $green-800: shade-color($green, 60%) !default;
$green-900: shade-color($green, 80%) !default;
// fusv-enable
+// scss-docs-start colors-map
+$colors: (
+ "blue": $blue,
+ "green": $green,
+ "yellow": $yellow,
+ "orange": $orange,
+ "red": $red,
+ "pink": $pink,
+ "green-dark": $green-800,
+ "beige": $beige,
+ "white": $white,
+ "gray": $gray-600,
+ "gray-dark": $gray-800
+) !default;
+// scss-docs-end colors-map
+
+// scss-docs-start theme-color-variables
+$primary: $blue;
+$secondary: $gray-200;
+$success: $green;
+$info: $yellow;
+$warning: $orange;
+$danger: $red;
+$light: $gray-100;
+$dark: $gray-800;
+$chill-blue: $blue;
+$chill-green: $green;
+$chill-green-dark: $green-800;
+$chill-orange: $orange;
+$chill-yellow: $yellow;
+$chill-red: $red;
+$chill-beige: $beige;
+$chill-pink: $pink;
+$chill-gray: $gray-600;
+$chill-dark-gray: $gray-800;
+$chill-light-gray: $gray-200;
+$chill-llight-gray: $gray-100;
+// scss-docs-end theme-color-variables
+
+
+// scss-docs-start theme-colors-map
+$theme-colors: (
+ "primary": $primary,
+ "secondary": $secondary,
+ "success": $success,
+ "info": $info,
+ "warning": $warning,
+ "danger": $danger,
+ "light": $light,
+ "dark": $dark,
+) !default;
+// scss-docs-end theme-colors-map
+
+$chill-colors: (
+ "chill-blue": $chill-blue,
+ "chill-green": $chill-green,
+ "chill-green-dark": $chill-green-dark,
+ "chill-orange": $chill-orange,
+ "chill-yellow": $chill-yellow,
+ "chill-red": $chill-red,
+ "chill-beige": $chill-beige,
+ "chill-pink": $chill-pink,
+ "chill-gray": $chill-gray,
+ "chill-dark-gray": $chill-dark-gray,
+ "chill-light-gray": $chill-light-gray,
+ "chill-llight-gray": $chill-llight-gray,
+);
+
+// Merge the maps
+$theme-colors: map-merge($theme-colors, $chill-colors);
+
+// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
+// See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
+$min-contrast-ratio: 4.5 !default;
+
+// Customize the light and dark text colors for use in our color contrast function.
+$color-contrast-dark: $black !default;
+$color-contrast-light: $white !default;
+
// Characters which are escaped by the escape-svg function
$escaped-characters: (
("<", "%3c"),
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 438e94892..fa78c7e3d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -36,11 +36,11 @@
{% endif %}
- {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-create' }, 'label' : 'Go to formatter options' } ) }}
+ {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' }, 'label' : 'Go to formatter options' } ) }}
{{ form_end(form) }}
{% endblock layout_wvm_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 639b0791f..f00419c9d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -44,7 +44,7 @@
{% endfor %}
{% endif %}
- {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action bt-create' }, 'label' : 'Go to export options' } ) }}
+ {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}
{{ form_end(form) }}
{% endblock layout_wvm_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
index 72a00daeb..43a5f63ec 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
@@ -46,7 +46,7 @@
{{ form_end(form) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index de1243b28..2e403f1f3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -167,7 +167,7 @@
{% if form.vars.allow_add == 1 %}
-