diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2017-01-13 16:03:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-13 16:03:17 +0100 |
commit | 127024d89d0fadc9f1e717e6062fb9ba29b19ddc (patch) | |
tree | 6657b951895df4d418187558930b37209e810d85 /core | |
parent | 0f792fedefb0b31367e59b1d5abe1db20371d04f (diff) | |
parent | bab09dc5d4f76ad1db4f70aeda03e91fe07c0b49 (diff) | |
download | nextcloud-server-127024d89d0fadc9f1e717e6062fb9ba29b19ddc.tar.gz nextcloud-server-127024d89d0fadc9f1e717e6062fb9ba29b19ddc.zip |
Merge pull request #3048 from nextcloud/share-scss-optimisation
Share scss optimisation
Diffstat (limited to 'core')
-rw-r--r-- | core/css/share.scss | 113 |
1 files changed, 45 insertions, 68 deletions
diff --git a/core/css/share.scss b/core/css/share.scss index a72437c4aeb..7ce365a1454 100644 --- a/core/css/share.scss +++ b/core/css/share.scss @@ -1,28 +1,12 @@ -/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net - This file is licensed under the Affero General Public License version 3 or later. - See the COPYING-README file. */ - -#dropdown { - background: #eee; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - box-shadow: 0 2px 3px rgba(50, 50, 50, 0.4); - display: block; - margin-right: 0; - position: absolute; - right: 0; - width: 420px; - z-index: 500; - padding: 16px; -} - -@media only screen and (min-width: 768px) and (max-width: 990px) { - #dropdown { - /* this limits the dropdown to float below the sidebar for mid narrow screens */ - left: 20px; - } -} - +/** + * @copyright Copyright (c) 2011, Jan-Christoph Borchardt <hey@jancborchardt.net> + * @copyright Copyright (c) 2017, John Molakvoæ (skjnldsv@protonmail.com) + * + * @license GNU AGPL version 3 or any later version + * + */ + +/* SHARE TAB STYLING -------------------------------------------------------- */ .shareTabView { .unshare.icon-loading-small { margin-top: 1px; @@ -47,6 +31,30 @@ width: 32px; height: 32px; } + label { + font-weight: 400; + white-space: nowrap; + } + input[type='checkbox'] { + margin: 0 3px 0 8px; + vertical-align: middle; + } + input[type='submit'] { + margin-left: 7px; + } + form { + font-size: 100%; + margin-left: 0; + margin-right: 0; + } + .error { + color: #e9322d; + border-color: #e9322d; + box-shadow: 0 0 6px #f8b9b7; + } + .mailView .icon-mail { + opacity: 0.5; + } } .share-autocomplete-item { @@ -86,7 +94,8 @@ white-space: nowrap; display: inline-block; } - .unshare img, .showCruds img { + .unshare img, + .showCruds img { vertical-align: text-bottom; /* properly align icons */ } @@ -108,17 +117,6 @@ } } -.shareTabView { - label { - font-weight: 400; - white-space: nowrap; - } - input[type='checkbox'] { - margin: 0 3px 0 8px; - vertical-align: middle; - } -} - a { &.showCruds { display: inline; @@ -129,45 +127,28 @@ a { opacity: .5; padding: 10px; } + &.showCruds:hover, + &.unshare:hover { + opacity: 1; + } } #link { border-top: 1px solid #ddd; padding-top: 8px; -} - -.shareTabView { - input[type='submit'] { - margin-left: 7px; + #showPassword img { + padding-left: 5px; + width: 12px; } - form { - font-size: 100%; - margin-left: 0; - margin-right: 0; - } - .error { - color: #e9322d; - border-color: #e9322d; - box-shadow: 0 0 6px #f8b9b7; - } -} - -#link #showPassword img { - padding-left: 5px; - width: 12px; } -.reshare, #link label, #expiration label { +.reshare, +#link label, +#expiration label { display: inline-block; padding: 6px 4px; } -a { - &.showCruds:hover, &.unshare:hover { - opacity: 1; - } -} - #defaultExpireMessage, .reshare { /* fix shared by text going out of box */ white-space: normal; @@ -193,7 +174,3 @@ a { padding-top: 12px; color: #999; } - -.shareTabView .mailView .icon-mail { - opacity: 0.5; -} |