diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-02-26 18:55:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 18:55:08 +0100 |
| commit | abb0a08ed5a7a272c4e064bf110d6aa8485bfe69 (patch) | |
| tree | 6dfd53898c99aa66c39f54bae7900819695fd91c /core | |
| parent | 8867629cf1b195b6c0e4616d8943f4fd31c42b7b (diff) | |
| parent | 955e136fd9de07138a0b83a62466db86af2f48ea (diff) | |
| download | nextcloud-server-abb0a08ed5a7a272c4e064bf110d6aa8485bfe69.tar.gz nextcloud-server-abb0a08ed5a7a272c4e064bf110d6aa8485bfe69.zip | |
Merge pull request #7933 from nextcloud/update-notification-vuejs
Migrate Update notifications to Vue.js
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 15 | ||||
| -rw-r--r-- | core/css/inputs.scss | 75 |
2 files changed, 75 insertions, 15 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index a92db4ed4ab..becbf63cd6d 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -681,21 +681,6 @@ kbd { } } -/* DROPDOWN ----------------------------------------------------------------- */ -.dropdown { - background: nc-darken($color-main-background, 8%); - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - box-shadow: 0 1px 1px $color-box-shadow; - display: block; - margin-right: 0; - position: absolute; - right: 0; - width: 420px; - z-index: 500; - padding: 16px; -} - /* TABS --------------------------------------------------------------------- */ .tabHeaders { display: inline-block; diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 00e0e47f9a8..c0576f01b09 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -483,6 +483,81 @@ input { } } +/* Vue v-select */ +.v-select { + margin: 3px 3px 3px 0; + display: inline-block; + .dropdown-toggle { + display: flex !important; + flex-wrap: wrap; + .selected-tag { + line-height: 20px; + padding-left: 5px; + background-image: none; + background-color: $color-main-background; + color: nc-lighten($color-main-text, 33%); + border: 1px solid nc-darken($color-main-background, 14%); + display: inline-flex; + align-items: center; + .close { + margin-left: 3px; + } + } + } + .dropdown-menu { + padding: 0; + li { + padding: 5px; + position: relative; + display: list-item; + background-color: transparent; + cursor: pointer; + color: nc-lighten($color-main-text, 33%); + a { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + height: 25px; + padding: 3px 7px 4px 2px; + margin: 0; + cursor: pointer; + min-height: 1em; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + display: inline-flex; + align-items: center; + background-color: transparent !important; + color: inherit !important; + &::before { + content: ' '; + background-image: url('../img/actions/checkmark.svg?v=1'); + background-repeat: no-repeat; + background-position: center; + min-width: 16px; + min-height: 16px; + display: block; + opacity: 0.5; + margin-right: 5px; + visibility: hidden; + } + } + &.highlight { + color: $color-main-text; + } + &.active > a { + background-color: nc-darken($color-main-background, 3%); + color: $color-main-text; + &::before { + visibility: visible; + } + } + } + } +} + /* Progressbar */ progress { display: block; |