summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-07-31 16:37:21 +0200
committerGitHub <noreply@github.com>2018-07-31 16:37:21 +0200
commit3e0668e348a3935b76c915b8aa1e523caf8da921 (patch)
treebbec60e6b490add7ec4c8356cd2e31f55d572ed7
parentbf522bc4b97ec0cae0d5095c749185e758434e3d (diff)
parentcfcb90214fdd020ad2852de107c77cb3d740b6fd (diff)
downloadnextcloud-server-3e0668e348a3935b76c915b8aa1e523caf8da921.tar.gz
nextcloud-server-3e0668e348a3935b76c915b8aa1e523caf8da921.zip
Merge pull request #10469 from nextcloud/bugfix/10420/tags-management
Revert to regular buttons in system tags management
-rw-r--r--apps/systemtags/css/settings.css16
-rw-r--r--apps/systemtags/templates/admin.php6
2 files changed, 10 insertions, 12 deletions
diff --git a/apps/systemtags/css/settings.css b/apps/systemtags/css/settings.css
index 5313247227c..02713e35219 100644
--- a/apps/systemtags/css/settings.css
+++ b/apps/systemtags/css/settings.css
@@ -1,17 +1,15 @@
.systemtag-input {
display: flex;
- max-width: 500px;
+ flex-wrap: wrap;
}
#systemtags .select2-container {
width: 100%;
- max-width: 500px;
+ max-width: 400px;
}
-#systemtag_name {
- flex-grow: 1;
+#systemtags .select2-container .select2-choice {
+ height: auto;
}
-
-#systemtag_delete,
-#systemtag_reset,
-#systemtag_submit {
- padding: 8px;
+#systemtag_name {
+ width: 100%;
+ max-width: 400px;
} \ No newline at end of file
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index fa1b07cb187..842648b5aad 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -49,9 +49,9 @@ style('systemtags', 'settings');
<option value="0"><?php p($l->t('Invisible')); ?></option>
</select>
- <a id="systemtag_delete" class="hidden icon-delete"><span class="hidden-visually"><?php p($l->t('Delete')); ?></span></a>
- <a id="systemtag_reset" class="icon-close"><span class="hidden-visually"><?php p($l->t('Reset')); ?></span></a>
- <a id="systemtag_submit" class="icon-confirm"><span class="hidden-visually"><?php p($l->t('Create')); ?></span></a>
+ <a id="systemtag_delete" class="hidden button"><span><?php p($l->t('Delete')); ?></span></a>
+ <a id="systemtag_reset" class="button"><span><?php p($l->t('Reset')); ?></span></a>
+ <a id="systemtag_submit" class="button"><span><?php p($l->t('Create')); ?></span></a>
</div>
</form>