From be111f1fb65056f88c952b2648b2c40c9aaccc4e Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 29 Nov 2024 11:03:01 +0000
Subject: [PATCH] Button Position im Wiki falsch
Closes #4894
Merge request studip/studip!3667
---
resources/assets/stylesheets/scss/article.scss | 2 +-
resources/assets/stylesheets/scss/buttons.scss | 7 +++----
resources/assets/stylesheets/scss/wiki.scss | 4 ++++
resources/vue/components/WikiEditor.vue | 8 ++++----
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/resources/assets/stylesheets/scss/article.scss b/resources/assets/stylesheets/scss/article.scss
index d11d36932c7..e674e41745f 100644
--- a/resources/assets/stylesheets/scss/article.scss
+++ b/resources/assets/stylesheets/scss/article.scss
@@ -119,7 +119,7 @@ article.studip {
}
> footer {
- text-align: right;
+ text-align: left;
border-top: 1px solid var(--color--content-box-border);
padding: $article-padding;
margin: $article-padding (-$article-padding) (-$article-padding) (-$article-padding);
diff --git a/resources/assets/stylesheets/scss/buttons.scss b/resources/assets/stylesheets/scss/buttons.scss
index f6158bcf778..f1ef48307cb 100644
--- a/resources/assets/stylesheets/scss/buttons.scss
+++ b/resources/assets/stylesheets/scss/buttons.scss
@@ -115,14 +115,13 @@ $button-icons: (
display: inline-flex;
gap: 5px;
list-style: none;
- margin: 0 0.8em 0 0;
- padding: 0;
+ margin: 0 0.8em;
+ padding: 5px 0;
vertical-align: middle;
button,
.button {
- margin-left: 0;
- margin-right: 0;
+ margin: 0;
}
}
diff --git a/resources/assets/stylesheets/scss/wiki.scss b/resources/assets/stylesheets/scss/wiki.scss
index 5f9f441ec58..63792498413 100644
--- a/resources/assets/stylesheets/scss/wiki.scss
+++ b/resources/assets/stylesheets/scss/wiki.scss
@@ -200,3 +200,7 @@ article.studip.wiki {
padding-left: calc(var(--avatar-small) + 1ex);
}
}
+
+ p.last-save-date {
+ text-indent: 1ex;
+ }
\ No newline at end of file
diff --git a/resources/vue/components/WikiEditor.vue b/resources/vue/components/WikiEditor.vue
index 3b15bb03a7a..3fad25b017b 100644
--- a/resources/vue/components/WikiEditor.vue
+++ b/resources/vue/components/WikiEditor.vue
@@ -24,14 +24,14 @@
<input type="checkbox" v-model="autosave">
{{ $gettext('Automatisches Speichern aktivieren.') }}
</label>
- <div>
+ <p class="last-save-date">
{{ $gettext('Zuletzt gespeichert') }}:
<studip-date-time :timestamp="Math.floor(lastSaveDate / 1000)"
:relative="true"
></studip-date-time>
- </div>
+ </p>
- <div data-dialog-button="">
+ <footer data-dialog-button="">
<button class="button"
:title="isChanged ? $gettext('Den aktuellen Stand speichern.') : $gettext('Der aktuelle Stand wurde bereits gespeichert.')"
@click="toggleSecurityHandler(false)"
@@ -48,7 +48,7 @@
>
{{ $gettextInterpolate($gettext('Schreibmodus an %{name} übergeben'), { name: user.fullname }, true) }}
</button>
- </div>
+ </footer>
</form>
<div v-if="!isEditing">
--
GitLab