summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-07 17:14:05 -0500
committerGitHub <noreply@github.com>2017-04-07 17:14:05 -0500
commitca9d25169dcdd2923a356e2a797d8704506a3787 (patch)
tree5d94aed1a5f79a5b0abe33d8732fc60e0a4054b3 /core/css
parent9adfa60eb38f6c39ae075e1fa68037375c8789de (diff)
parentbf30090be5e3d339c9188d81a900ed2fe4bd6318 (diff)
downloadnextcloud-server-ca9d25169dcdd2923a356e2a797d8704506a3787.tar.gz
nextcloud-server-ca9d25169dcdd2923a356e2a797d8704506a3787.zip
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
Unified sharing options
Diffstat (limited to 'core/css')
-rw-r--r--core/css/apps.scss4
-rw-r--r--core/css/share.scss14
2 files changed, 16 insertions, 2 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 0c31e5bae44..da1c5162051 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -477,7 +477,7 @@ kbd {
border-radius: 0;
text-align: left;
padding-left: 42px;
- font-weight: normal;
+ font-weight: 300;
&:hover,
&:focus {
background-color: $color-main-background;
@@ -667,7 +667,7 @@ kbd {
width: auto;
height: auto;
margin: 0;
- font-weight: inherit;
+ font-weight: 300;
box-shadow: none;
/* prevent .action class to break the design */
&.action {
diff --git a/core/css/share.scss b/core/css/share.scss
index 0e6eb3ccf8b..de545955aa9 100644
--- a/core/css/share.scss
+++ b/core/css/share.scss
@@ -106,6 +106,7 @@
.shareOption {
white-space: nowrap;
display: inline-block;
+ opacity: 1 !important;
}
.unshare img,
.showCruds img {
@@ -184,3 +185,16 @@ a {
padding-top: 12px;
color: rgba($color-main-text, .4);
}
+
+.popovermenu .datepicker {
+ margin-left: 35px;
+}
+
+.popovermenu .passwordField {
+ margin-left: 35px;
+ width: inherit !important;
+}
+
+.ui-datepicker {
+ z-index: 1111 !important;
+}