Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-06-27 20:59:17 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-06-29 15:12:05 +0300
commitff2c819ed3df2daa7c1cc8827e34b738188ff108 (patch)
treeb79cd03d612095eb8f33499bd068c7137d414740 /settings
parenta788f4911491cf58dfcde94b9491c79d844347be (diff)
Move social buttons to the personal settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.scss6
-rw-r--r--settings/templates/settings/admin/server.development.notice.php3
-rw-r--r--settings/templates/settings/personal/development.notice.php (renamed from settings/templates/settings.development.notice.php)2
3 files changed, 5 insertions, 6 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index cfca22d5bbb..a573f94d491 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -96,14 +96,14 @@ input {
#personal-settings-avatar-container {
display: inline-grid;
grid-template-columns: 1fr;
- grid-template-rows: 2fr 1fr 1fr;
+ grid-template-rows: 2fr 1fr;
vertical-align: top;
}
.profile-settings-container {
display: inline-grid;
grid-template-columns: 1fr;
- grid-template-rows: 1fr 1fr 1fr 1fr;
+ grid-template-rows: 1fr 2fr;
}
.personal-show-container {
@@ -216,7 +216,7 @@ input {
.personal-settings-container {
display: inline-grid;
grid-template-columns: 1fr 1fr;
- grid-template-rows: 1fr 1fr 1fr 1fr;
+ grid-template-rows: 1fr 1fr 1fr;
&:after {
clear: both;
}
diff --git a/settings/templates/settings/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php
deleted file mode 100644
index 42599c54459..00000000000
--- a/settings/templates/settings/admin/server.development.notice.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="section">
- <p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
-</div>
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings/personal/development.notice.php
index 855c4dc26c7..41f70c0a822 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings/personal/development.notice.php
@@ -1,3 +1,4 @@
+<div class="followupsection">
<p>
<?php print_unescaped(str_replace(
[
@@ -62,3 +63,4 @@
{newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
)); ?>
</p>
+</div> \ No newline at end of file