diff --git a/resources/assets/stylesheets/mixins/studip.scss b/resources/assets/stylesheets/mixins/studip.scss index 1bbd7d55eea813a53139a16263a6f3afc83d2347..ec2c5922b5ff004accb385a5872cb2d6c6248d7e 100644 --- a/resources/assets/stylesheets/mixins/studip.scss +++ b/resources/assets/stylesheets/mixins/studip.scss @@ -158,7 +158,6 @@ } - padding-top: 100px; background-image: url(icon-path($icon)); background-repeat: no-repeat; background-size: 140px; @@ -169,7 +168,7 @@ } text-align: center; - height: 40vh; + height: 100%; color: $content-color; font-size: 1.6em; position: relative; diff --git a/resources/assets/stylesheets/scss/blubber.scss b/resources/assets/stylesheets/scss/blubber.scss index 76bafe4b8c0979bd73737440dc1da52b5b5dfa20..1e96554d0da39edcdeddb9cc5af4ca025e94114b 100644 --- a/resources/assets/stylesheets/scss/blubber.scss +++ b/resources/assets/stylesheets/scss/blubber.scss @@ -50,7 +50,8 @@ } .scrollable_area { - max-height: calc(100vh - 240px); + max-height: calc(100vh - 189px); + height: 100%; overflow: auto; } @@ -167,7 +168,7 @@ > :first-child { position: relative; - top: 30vh; + top: 70%; } } } diff --git a/resources/vue/components/blubber/Thread.vue b/resources/vue/components/blubber/Thread.vue index abdeed38accaba0a007d575684210b8ca81df7b4..676ff35e6b649161be1406e780bd9f5ffcd5dd4f 100644 --- a/resources/vue/components/blubber/Thread.vue +++ b/resources/vue/components/blubber/Thread.vue @@ -13,12 +13,11 @@ :followed="threadFollowed" @subscribe-thread="onSubscribeThread" /> - <div class="scrollable_area" :class="{ scrolled }" ref="scrollable"> + <div v-if="emptyBlubber" class="empty_blubber_background"> + <div>{{ $gettext('Starte die Konversation jetzt!') }}</div> + </div> + <div v-else class="scrollable_area" :class="{ scrolled }" ref="scrollable"> <div class="all_content"> - <div v-if="emptyBlubber" class="empty_blubber_background"> - <div>{{ $gettext('Starte die Konversation jetzt!') }}</div> - </div> - <ol class="comments" aria-live="polite"> <li class="more" v-if="moreCommentsUp"> <studip-asset-img file="loading-indicator.svg" width="20"></studip-asset-img>