summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-03-07 12:33:11 +0100
committerGitHub <noreply@github.com>2018-03-07 12:33:11 +0100
commitd1aa96fef91a1e5352f987d16be773cac69135a8 (patch)
tree74071bb13f1a77d14ce5dd37ee979fb1f2913fc8 /apps
parent076b49b9fe54060bf08b6ef55bfea34fc7279fd6 (diff)
parentd9bd6f325392316f6b2d83d0b712d473d8510fda (diff)
downloadnextcloud-server-d1aa96fef91a1e5352f987d16be773cac69135a8.tar.gz
nextcloud-server-d1aa96fef91a1e5352f987d16be773cac69135a8.zip
Merge pull request #8373 from nextcloud/right-header-stdrd
New standard for top right header
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/css/public.scss9
-rw-r--r--apps/files_sharing/lib/Template/LinkMenuAction.php8
2 files changed, 6 insertions, 11 deletions
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 1e9dec87fad..e040d449129 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -88,15 +88,6 @@ thead {
opacity: .5;
}
-#directLink-container {
- flex-wrap: wrap;
-}
-
-#directLink {
- margin-left: 30px;
- flex-basis: 100%;
-}
-
/* header buttons */
#details {
display: inline-flex;
diff --git a/apps/files_sharing/lib/Template/LinkMenuAction.php b/apps/files_sharing/lib/Template/LinkMenuAction.php
index 2fdf83e7026..519bc553228 100644
--- a/apps/files_sharing/lib/Template/LinkMenuAction.php
+++ b/apps/files_sharing/lib/Template/LinkMenuAction.php
@@ -47,8 +47,12 @@ class LinkMenuAction extends SimpleMenuAction {
'<a id="directLink-container">' .
'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
- '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
'</a>' .
+ '</li>' .
+ '<li>' .
+ '<span class="menuitem">' .
+ '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
+ '</span>' .
'</li>';
}
-} \ No newline at end of file
+}