diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | css/_contactlist.scss | 171 | ||||
| -rw-r--r-- | css/_navigation.scss | 4 | ||||
| -rw-r--r-- | templates/newContactButton.html | 2 |
5 files changed, 184 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ffd24614..c8d5a7a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ sudo: false dist: trusty language: php php: - - 5.6 - 7.0 - 7.1 + - 7.2 env: global: - CORE_BRANCH=master @@ -22,8 +22,14 @@ matrix: include: - php: 7.0 env: DB=pgsql CORE_BRANCH=stable12 + - php: 7.1 + env: DB=pgsql CORE_BRANCH=stable12 - php: 7.0 - env: DB=pgsql CORE_BRANCH=stable11 + env: DB=pgsql CORE_BRANCH=stable13 + - php: 7.1 + env: DB=pgsql CORE_BRANCH=stable13 + - php: 7.2 + env: DB=pgsql CORE_BRANCH=stable13 fast_finish: true before_install: diff --git a/appinfo/info.xml b/appinfo/info.xml index 660283a7..90974dda 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -29,7 +29,7 @@ <repository type="git">https://github.com/nextcloud/contacts.git</repository> <screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot> <dependencies> - <nextcloud min-version="11" max-version="13" /> + <nextcloud min-version="12" max-version="14" /> </dependencies> <contactsmenu> <provider>OCA\Contacts\ContactsMenu\Providers\DetailsProvider</provider> diff --git a/css/_contactlist.scss b/css/_contactlist.scss index b2e1369b..e5abcfb2 100644 --- a/css/_contactlist.scss +++ b/css/_contactlist.scss @@ -71,3 +71,174 @@ contactlist .tooltip { /* end of media query */ } + +/* STABLE12 FIXES. TO BE DROPPED FOR MIN VERSION 13 */ +#app-content-wrapper { + display: flex; + position: relative; + align-items: start; + height: 100%; + width: 100%; + .app-content-list, + .app-content-detail { + min-height: 100%; + max-height: 100%; + overflow-x: hidden; + overflow-y: auto; + } +} + +.app-content-list { + width: 300px; + border-right: 1px solid nc-darken($color-main-background, 8%); + display: flex; + flex-direction: column; + transition: transform 250ms ease-in-out; + + /* Default item */ + .app-content-list-item { + position: relative; + height: 68px; + border-top: 1px solid nc-darken($color-main-background, 8%); + cursor: pointer; + padding: 10px 7px; + display: flex; + flex-wrap: wrap; + align-items: center; + flex: 0 0 auto; + + /* Icon fixes */ + &, + > .app-content-list-item-menu { + > [class^='icon-'], + > [class*=' icon-'] { + order: 4; + width: 24px; + height: 24px; + margin: -10px; + padding: 22px; + opacity: .3; + cursor: pointer; + &:hover, &:focus { + opacity: .7; + } + &[class^='icon-star'], + &[class*=' icon-star'] { + opacity: .7; + &:hover, &:focus { + opacity: 1; + } + } + &.icon-starred { + opacity: 1; + } + } + } + + &:hover, &:focus, + &.active { + background-color: nc-darken($color-main-background, 6%); + } + + .app-content-list-item-checkbox.checkbox + label, + .app-content-list-item-star { + position: absolute; + height: 40px; + width: 40px; + display: flex; + z-index: 50; + + .app-content-list-item-icon { + opacity: .7; + } + } + + .app-content-list-item-checkbox.checkbox + label { + top: 14px; + left: 7px; + &::before { + margin: 0; + } + /* Hide the star, priority to the checkbox */ + ~ .app-content-list-item-star { + display: none; + } + } + + .app-content-list-item-star { + top: 10px; + left: 32px; + background-size: 16px; + height: 20px; + width: 20px; + margin: 0; + padding: 0; + } + + .app-content-list-item-icon { + position: absolute; + display: inline-block; + height: 40px; + width: 40px; + line-height: 40px; + border-radius: 50%; + vertical-align: middle; + margin-right: 10px; + color: #fff; + text-align: center; + font-size: 1.5em; + text-transform: capitalize; + object-fit: cover; + user-select: none; + cursor: pointer; + } + + .app-content-list-item-line-one, + .app-content-list-item-line-two { + display: block; + padding-left: 50px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + order: 1; + flex: 1 1 0; + padding-right: 10px; + cursor: pointer; + } + + .app-content-list-item-line-two { + opacity: .5; + order: 3; + flex: 1 0 calc(100% - 24px); + } + + .app-content-list-item-details { + order: 2; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 100px; + opacity: .5; + font-size: 80%; + user-select: none; + } + + .app-content-list-item-menu { + order: 4; + position: relative; + .popovermenu { + margin: 0; + right: -5px; + } + } + } +} + +/* App content */ +.app-content-detail { + /* grow full width */ + flex-grow: 1; + + #app-navigation-toggle-back { + display: none; + } +} diff --git a/css/_navigation.scss b/css/_navigation.scss index 79e3a733..6d820449 100644 --- a/css/_navigation.scss +++ b/css/_navigation.scss @@ -11,6 +11,8 @@ margin: 14px auto; /* to have the same height than a contact */ width: calc(100% - 20px) !important; text-align: left; - padding-left: 34px; background-position: 10px center; + padding: 10px; + padding-left: 34px; + display: block; } diff --git a/templates/newContactButton.html b/templates/newContactButton.html index 26e52f45..9ec3dbae 100644 --- a/templates/newContactButton.html +++ b/templates/newContactButton.html @@ -1,2 +1,2 @@ -<button ng-show="!ctrl.loading && !ctrl.invalid" class="icon-add app-content-list-button" id="new-contact-button" +<button ng-show="!ctrl.loading && !ctrl.invalid" class="icon-add" id="new-contact-button" type="button" name="button" ng-click="ctrl.createContact()">{{ctrl.t.addContact}}</button> |