From 3f3ad0eeb8e01fe725a89ad196d23f22ad33de41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 10 Jul 2018 15:20:48 +0200 Subject: [PATCH] 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- appinfo/info.xml | 5 +- css/_contactlist.scss | 190 +++------------------------------- css/_navigation.scss | 3 - js/services/search_service.js | 8 +- package.json | 8 +- 5 files changed, 25 insertions(+), 189 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index d6f50b5d..dd81995d 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,11 +11,12 @@ * 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem! * 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library. - 2.1.5 + 2.2.0 AGPL Alexander Weidinger Jan-Christoph Borchardt Hendrik Leppelsack + John Molakvoæ https://docs.nextcloud.com/server/11/user_manual/pim/contacts.html https://docs.nextcloud.com/server/11/admin_manual/configuration_server/occ_command.html?highlight=occ%20commands#dav-label @@ -29,7 +30,7 @@ https://github.com/nextcloud/contacts.git https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png - + OCA\Contacts\ContactsMenu\Providers\DetailsProvider diff --git a/css/_contactlist.scss b/css/_contactlist.scss index 42159e0a..6880da30 100644 --- a/css/_contactlist.scss +++ b/css/_contactlist.scss @@ -51,8 +51,25 @@ contactlist .tooltip { display: none; } + #app-content-wrapper { + .app-content-list { + display: block; + } + .app-content-detail { + display: none; + } + } + #app-navigation-toggle.showdetails { transform: translate(-50px, 0); + + #app-content-wrapper { + .app-content-list { + display: none; + } + .app-content-detail { + display: block; + } + } } #app-navigation-toggle-back { @@ -71,176 +88,3 @@ 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 { - border-right: 1px solid nc-darken($color-main-background, 8%); - display: flex; - flex-direction: column; - transition: transform 250ms ease-in-out; - min-width: 250px; - max-width: 350px; - flex: 2 2 300px; - - /* 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 4b95ba95..b3019f2d 100644 --- a/css/_navigation.scss +++ b/css/_navigation.scss @@ -1,6 +1,3 @@ -#app-navigation { - position: relative; -} #app-navigation > ul { height: calc(100% - 68px); diff --git a/js/services/search_service.js b/js/services/search_service.js index f12dd8a1..5d602b30 100644 --- a/js/services/search_service.js +++ b/js/services/search_service.js @@ -39,13 +39,7 @@ angular.module('contactsApp') searchTerm = ''; }; - if (!_.isUndefined(OC.Plugins)) { - OC.Plugins.register('OCA.Search', SearchProxy); - if (!_.isUndefined(OCA.Search)) { - OC.Search = new OCA.Search($('#searchbox'), $('#searchresults')); - $('#searchbox').show(); - } - } + if (!_.isUndefined($('.searchbox'))) { $('.searchbox')[0].addEventListener('keypress', function(e) { diff --git a/package.json b/package.json index 4af42659..702ccc77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "contacts", - "version": "2.1.5", + "version": "2.2.0", "description": "Place this app in **nextcloud/apps/**", "author": { "name": "Hendrik Leppelsack", @@ -34,7 +34,7 @@ "gulp-ng-annotate": "^2.0.0", "gulp-sourcemaps": "^1.6.0", "gulp-stylelint": "^5.0.0", - "karma": "^2.0.2", + "karma": "^2.0.4", "karma-chai": "^0.1.0", "karma-coverage": "^1.1.1", "karma-firefox-launcher": "^1.0.0", @@ -43,9 +43,9 @@ "karma-sinon": "^1.0.5", "merge-stream": "^1.0.1", "mocha": "^5.2.0", - "node-sass": "^4.9.0", + "node-sass": "^4.9.2", "sinon": "^1.17.5", - "stylelint": "^9.1.1", + "stylelint": "^9.3.0", "stylelint-config-recommended-scss": "^3.1.0", "stylelint-scss": "^2.4.0", "underscore": "^1.8.3"