diff --git a/js/src/components/Event/EventCard.vue b/js/src/components/Event/EventCard.vue index 653f593ee..018d717f3 100644 --- a/js/src/components/Event/EventCard.vue +++ b/js/src/components/Event/EventCard.vue @@ -46,8 +46,9 @@ A simple card for an event {{ $t('By {name}', { name: actorDisplayName }) }} + - - - {{ event.physicalAddress.locality || event.physicalAddress.description }} + {{ event.physicalAddress.locality || event.physicalAddress.description }} @@ -201,6 +202,11 @@ export default class EventCard extends Vue { } span.organizer-place-wrapper { display: flex; + padding: 0 0.5rem 0.3rem; + + span { + padding-right: 0.25rem; + } span:last-child { flex: 1; diff --git a/js/src/components/SearchField.vue b/js/src/components/SearchField.vue index bc83c04ca..275e91948 100644 --- a/js/src/components/SearchField.vue +++ b/js/src/components/SearchField.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/js/src/variables.scss b/js/src/variables.scss index 3fb70b1d2..5921c99cc 100644 --- a/js/src/variables.scss +++ b/js/src/variables.scss @@ -5,11 +5,21 @@ $primary-invert: findColorInvert($primary); $secondary: #FAB12D; $secondary-invert: findColorInvert($secondary); +$success: #78cc8a; +$success-invert: findColorInvert($success); +$info: #36bcd4; +$info-invert: findColorInvert($info); +$danger: #ff7061; +$danger-invert: findColorInvert($danger); + $colors: map-merge( $colors, ( "primary": ($primary, $primary-invert), - "secondary": ($secondary, $secondary-invert) + "secondary": ($secondary, $secondary-invert), + "success": ($success, $success-invert), + "info": ($info, $info-invert), + "danger": ($danger, $danger-invert), ) ); diff --git a/js/src/views/Account/Register.vue b/js/src/views/Account/Register.vue index d0144e041..c6840ee7f 100644 --- a/js/src/views/Account/Register.vue +++ b/js/src/views/Account/Register.vue @@ -1,70 +1,60 @@ - diff --git a/js/src/views/Event/Explore.vue b/js/src/views/Event/Explore.vue index 909abd301..489820449 100644 --- a/js/src/views/Event/Explore.vue +++ b/js/src/views/Event/Explore.vue @@ -58,6 +58,10 @@ export default class Explore extends Vue { diff --git a/js/src/views/User/Login.vue b/js/src/views/User/Login.vue index 12f2af73a..08a631516 100644 --- a/js/src/views/User/Login.vue +++ b/js/src/views/User/Login.vue @@ -1,18 +1,15 @@