diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-05 10:54:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 10:54:32 +0100 |
| commit | 05bcdf937b9976de560192a3b06c21e5b6ea7774 (patch) | |
| tree | f158fe5526fdd7a05ca888f642b1f02d79abeffb /core/css | |
| parent | ad8e9b2f5f8c524ff0e4d6c934935249f642b664 (diff) | |
| parent | 6127d19f546904e97ed67696f9bc2fdfd5c8d575 (diff) | |
| download | nextcloud-server-05bcdf937b9976de560192a3b06c21e5b6ea7774.tar.gz nextcloud-server-05bcdf937b9976de560192a3b06c21e5b6ea7774.zip | |
Merge pull request #7477 from nextcloud/date-time-picker-position-fix
Date time picker position fix & design fixes
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/header.scss | 9 | ||||
| -rw-r--r-- | core/css/styles.scss | 61 |
2 files changed, 47 insertions, 23 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 98ea71f2ed2..7021762bf7f 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -206,12 +206,15 @@ nav { margin-left: -54px; } -.header-left #navigation, -.ui-datepicker, -.ui-timepicker.ui-widget { +.header-left #navigation { position: relative; left: -100%; width: 160px; +} + +.header-left #navigation, +.ui-datepicker, +.ui-timepicker.ui-widget { background-color: $color-main-background; filter: drop-shadow(0 1px 10px $color-box-shadow); &:after { diff --git a/core/css/styles.scss b/core/css/styles.scss index c479d6df888..b782c4e558a 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1035,15 +1035,6 @@ code { background-color: inherit; } td { - > * { - border-radius: 50%; - text-align: center; - font-weight: normal; - color: $color-main-text; - padding: 6px; - line-height: 12px; - } - &.ui-datepicker-today a:not(.ui-state-hover) { background-color: nc-lighten($color-main-text, 86%); } @@ -1056,7 +1047,7 @@ code { font-weight: bold; } - &.ui-datepicker-week-end :not(.ui-state-hover), + &.ui-datepicker-week-end:not(.ui-state-disabled) :not(.ui-state-hover), .ui-priority-secondary:not(.ui-state-hover) { color: nc-lighten($color-main-text, 33%); opacity: .8; @@ -1099,26 +1090,25 @@ code { font-weight: 300; } } + /* AM/PM fix */ + table.ui-timepicker tr .ui-timepicker-hour-cell:first-child { + margin-left: 30px; + } .ui-timepicker-table { th { font-weight: normal; color: nc-lighten($color-main-text, 33%); opacity: .8; + &.periods { + padding: 0; + width: 30px; + line-height: 30px; + } } tr:hover { background-color: inherit; } td { - > * { - border-radius: 50%; - text-align: center; - font-weight: normal; - color: $color-main-text; - padding: 8px 7px; - font-size: .9em; - line-height: 12px; - } - &.ui-timepicker-hour-cell a.ui-state-active, &.ui-timepicker-minute-cell a.ui-state-active, .ui-state-hover, @@ -1139,6 +1129,37 @@ code { } } +/* ---- jQuery UI datepicker & timepicker global rules ---- */ +.ui-widget.ui-datepicker .ui-datepicker-calendar, +.ui-widget.ui-timepicker table.ui-timepicker { + tr { + display: flex; + flex-wrap: nowrap; + justify-content: space-between; + td { + display: block; + flex: 1 1; + margin: 0; + padding: 2px; + display: flex; + align-items: center; + justify-content: center; + > * { + border-radius: 50%; + text-align: center; + font-weight: normal; + color: $color-main-text; + display: block; + line-height: 18px; + width: 18px; + height: 18px; + padding: 3px; + font-size: .9em; + } + } + } +} + /* ---- DIALOGS ---- */ #oc-dialog-filepicker-content { |