diff --git a/js/src/common.scss b/js/src/common.scss index 031cd3c3a..52130c687 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -163,10 +163,17 @@ a.list-item { .setting-title { margin-top: 2rem; margin-bottom: 1rem; - + h1,h2,h3,h4,h5,h6{ + background: $secondary; + color : $white; + span{ + background: $secondary !important; + color : $white !important; + } + } h2 { display: inline; - background: $secondary; + padding: 2px 7.5px; text-transform: uppercase; font-size: 1.25rem; @@ -180,6 +187,45 @@ a.list-item { .columns{ background: white; } -.router-link-active{ - background-color: $background-color-darker; +.setting-menu-item { + background-color: $yellow-4; + + .router-link-active, + .router-link-active { + background-color: $info; + color: $white; + + a { + color: $white; + font-weight: 600 !important; + text-decoration: none; + } + } +} + +.date-component-container { + .datetime-container { + margin-right: 1em; + } +} + +.date-component { + background-color: $chapril_blue_light !important; +} + +.time.datetime-container{ + color: $white; + background: $chapril_blue_light; + span.month { + color: $white; + } +} + +/** +footer + + */ +footer.footer[data-v-40ab164b] span.select select{ + background: $chapril_blue_light; + color: #000; } diff --git a/js/src/components/Event/EventListCard.vue b/js/src/components/Event/EventListCard.vue index 81cb5d061..2404432de 100644 --- a/js/src/components/Event/EventListCard.vue +++ b/js/src/components/Event/EventListCard.vue @@ -121,8 +121,8 @@ }) " icon-left="pencil" - >{{ $t("Edit") }} + >{{ $t("Edit") }} +
  • - {{ $t("Delete") }} + {{ $t("Delete") }}
  • {{ $t("Manage participations") }} + >{{ $t("Manage participations") }} +
  • {{ $t("View event page") }} + >{{ $t("View event page") }} +
  • @@ -293,73 +293,87 @@ article.box { line-height: 1.75em; } } - div.content { - padding: 5px; - .participation-actor span, - .participant-stats span { - padding: 0 5px; + .list-card { + display: flex; + align-items: center; + padding: 0 1.5em; - button { - height: auto; - padding-top: 0; + .actions { + padding-right: 7.5px; + cursor: pointer; + } + + div.content { + flex: 1; + padding: 5px; + + .participation-actor span, + .participant-stats span { + padding: 0 5px; + + button { + height: auto; + padding-top: 0; + } + } + + div.title-wrapper { + display: flex; + align-items: center; + + div.date-component { + flex: 0; + margin-right: 16px; + } + + a { + text-decoration: none; + } + + .title { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + font-weight: 400; + line-height: 1em; + font-size: 1.6em; + padding-bottom: 5px; + margin: auto 0; + } } } - div.title-wrapper { - display: flex; - align-items: center; + .actions { + ul li { + margin: 0 auto; - div.date-component { - flex: 0; - margin-right: 16px; - } - - a { - text-decoration: none; - } - - .title { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; - font-weight: 400; - line-height: 1em; - font-size: 1.6em; - padding-bottom: 5px; - margin: auto 0; - } - } - } - - .actions { - ul li { - margin: 0 auto; - .is-link { - cursor: pointer; - } - - .button.is-text { - text-decoration: none; - - ::v-deep span:first-child i.mdi::before { - font-size: 24px !important; + .is-link { + cursor: pointer; } - ::v-deep span:last-child { - padding-left: 4px; + .button.is-text { + text-decoration: none; + + ::v-deep span:first-child i.mdi::before { + font-size: 24px !important; + } + + ::v-deep span:last-child { + padding-left: 4px; + } + + &:hover { + background: #f5f5f5; + } } - &:hover { - background: #f5f5f5; + * { + font-size: 0.8rem; + color: $background-color; } } - - * { - font-size: 0.8rem; - color: $background-color; - } } } } diff --git a/js/src/components/Event/EventMetadataBlock.vue b/js/src/components/Event/EventMetadataBlock.vue index 4aab57660..c9a27e2a9 100644 --- a/js/src/components/Event/EventMetadataBlock.vue +++ b/js/src/components/Event/EventMetadataBlock.vue @@ -23,7 +23,6 @@ export default class EventMetadataBlock extends Vue { h2 { font-size: 1.8rem; font-weight: 500; - color: #f7ba30; } div.eventMetadataBlock { diff --git a/js/src/components/Utils/Subtitle.vue b/js/src/components/Utils/Subtitle.vue index 6f88cc423..82eeac7bf 100644 --- a/js/src/components/Utils/Subtitle.vue +++ b/js/src/components/Utils/Subtitle.vue @@ -17,11 +17,10 @@ h2 { margin: 15px 0 30px; span { - background: $secondary; display: inline; padding: 3px 8px; - color: #3a384c; - font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, serif; + font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, + serif; font-weight: 400; font-size: 32px; } diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue index c2c7af277..a9c578171 100644 --- a/js/src/views/Event/Edit.vue +++ b/js/src/views/Event/Edit.vue @@ -298,7 +298,6 @@ h2.subtitle { span { padding: 5px 7px; display: inline; - background: $secondary; } } diff --git a/js/src/views/Group/Group.vue b/js/src/views/Group/Group.vue index 8d89e2721..1d9a59cf1 100644 --- a/js/src/views/Group/Group.vue +++ b/js/src/views/Group/Group.vue @@ -730,8 +730,8 @@ div.container { .media-content { h2 { - color: #3c376e; - font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, serif; + font-family: "Liberation Sans", "Helvetica Neue", Roboto, + Helvetica, Arial, serif; font-size: 1.5rem; font-weight: 700; } diff --git a/js/src/views/User/Register.vue b/js/src/views/User/Register.vue index 07be3dcb0..fd52efc8a 100644 --- a/js/src/views/User/Register.vue +++ b/js/src/views/User/Register.vue @@ -230,10 +230,9 @@ export default class Register extends Vue { } h2.title { - color: $primary; + font-size: 2.5rem; text-decoration: underline; - text-decoration-color: $secondary; display: inline; }