diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-06 12:45:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 12:45:06 +0100 |
| commit | 0abb9755b2df8a6a64c9a22d9a234ec73d34bc9c (patch) | |
| tree | 43da2018b6673baa967f4f2264bb548b66d35d7f /core/css | |
| parent | a6666e397da7e7d1813ab10fa4fb003435cc2a23 (diff) | |
| parent | 3e538443c526aa7768dbc230526aec3b4a9d2cc8 (diff) | |
| download | nextcloud-server-0abb9755b2df8a6a64c9a22d9a234ec73d34bc9c.tar.gz nextcloud-server-0abb9755b2df8a6a64c9a22d9a234ec73d34bc9c.zip | |
Merge pull request #7054 from nextcloud/timepicker-design
Improve timepicker design, align to datepicker
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/header.scss | 5 | ||||
| -rw-r--r-- | core/css/styles.scss | 69 |
2 files changed, 72 insertions, 2 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 530e78186a8..364347fde81 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -206,7 +206,8 @@ nav { } #navigation, -.ui-datepicker { +.ui-datepicker, +.ui-timepicker.ui-widget { position: relative; left: -100%; width: 160px; @@ -223,7 +224,7 @@ nav { position: absolute; pointer-events: none; border-color: rgba(0, 0, 0, 0); - border-bottom-color: rgba(255, 255, 255, .97); + border-bottom-color: $color-main-background; border-width: 9px; margin-left: -9px; } diff --git a/core/css/styles.scss b/core/css/styles.scss index d88a00a82f5..e5e0145cddb 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1070,6 +1070,75 @@ code { background: $color-main-background; } + +/* ---- jQuery UI timepicker ---- */ +.ui-widget.ui-timepicker { + margin-top: 10px !important; + width: auto !important; + border-radius: $border-radius; + + .ui-widget-content { + border: none !important; + } + + .ui-state-default, + .ui-widget-content .ui-state-default, + .ui-widget-header .ui-state-default { + border: 1px solid transparent; + background: inherit; + } + .ui-widget-header { + padding: 7px; + font-size: 13px; + border: none; + background-color: $color-main-background; + color: $color-main-text; + + .ui-timepicker-title { + line-height: 1; + font-weight: 300; + } + } + .ui-timepicker-table { + th { + font-weight: normal; + color: nc-lighten($color-main-text, 33%); + opacity: .8; + } + 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, + .ui-state-focus { + background-color: $color-primary; + color: $color-primary-text; + font-weight: bold; + } + + &.ui-timepicker-minutes:not(.ui-state-hover) { + color: nc-lighten($color-main-text, 33%); + } + + &.ui-timepicker-hours { + border-right: 1px solid $color-border; + } + } + } +} + /* ---- DIALOGS ---- */ #oc-dialog-filepicker-content { |