From df22403f833cdd194cf23907103bcc653ec5f175 Mon Sep 17 00:00:00 2001 From: Jessica Date: Mon, 20 Aug 2018 18:10:07 +0200 Subject: updated scss files to include copyright and only linked in oen file --- css/contacts.scss | 3 ++ css/settings-section.scss | 5 --- css/settings/settings-addressbook-sharee.scss | 23 ++++++++++++ css/settings/settings-addressbook-shares.scss | 54 ++++++++++++--------------- css/settings/settings-addressbook.scss | 28 ++++++++++++-- 5 files changed, 74 insertions(+), 39 deletions(-) (limited to 'css') diff --git a/css/contacts.scss b/css/contacts.scss index 16911655..0638da7f 100644 --- a/css/contacts.scss +++ b/css/contacts.scss @@ -1,2 +1,5 @@ @import 'settings-section'; +@import 'settings/settings-addressbook'; +@import 'settings/settings-addressbook-shares'; +@import 'settings/settings-addressbook-sharee'; @import 'details'; diff --git a/css/settings-section.scss b/css/settings-section.scss index a2696d3a..c0786008 100644 --- a/css/settings-section.scss +++ b/css/settings-section.scss @@ -21,11 +21,6 @@ * */ - -@import 'settings/settings-addressbook'; -@import 'settings/settings-addressbook-shares'; -@import 'settings/settings-addressbook-sharee'; - // contacts settings section #app-settings-content { .settings-section { diff --git a/css/settings/settings-addressbook-sharee.scss b/css/settings/settings-addressbook-sharee.scss index 9ea3bd0b..d11a5b6a 100644 --- a/css/settings/settings-addressbook-sharee.scss +++ b/css/settings/settings-addressbook-sharee.scss @@ -1,3 +1,26 @@ +/** + * @copyright Copyright (c) 2018 John Molakvoæ + * + * @author John Molakvoæ + * author Team Popcorn + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + .addressbook__sharee { padding: 0 5px; display: inline-flex; diff --git a/css/settings/settings-addressbook-shares.scss b/css/settings/settings-addressbook-shares.scss index c8ea519e..365b5b0f 100644 --- a/css/settings/settings-addressbook-shares.scss +++ b/css/settings/settings-addressbook-shares.scss @@ -1,34 +1,28 @@ +/** + * @copyright Copyright (c) 2018 John Molakvoæ + * + * @author John Molakvoæ + * author Team Popcorn + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + .addressbook-shares { width: 100%; - .dropdown-menu { - border: 1px solid #d1d1d1; - border-radius: 0 0 3px 3px; - max-height: 200px; - margin-top: -2px; - overflow-y: auto; - display: flex; - flex-wrap: wrap; - background-color: #fff; - position: relative; - width: 100%; - z-index: 500; - top: -2px; - left: 0px; - li { - width: 100%; - padding: 8px 9px 9px; - cursor: pointer; - } - li.active { - background: #f0f0f0; - } - } - &__input { - width: 100% !important; - margin-right: 0; - padding-right: 30px; - text-overflow: ellipsis; - } &__list { margin-top: 8px; margin-bottom: 12px; @@ -36,7 +30,7 @@ flex-direction: column; } - .multiselect-vue { + .multiselect.multiselect-vue { width: inherit; .multiselect__tags:focus-within, diff --git a/css/settings/settings-addressbook.scss b/css/settings/settings-addressbook.scss index bda520fa..6a72f935 100644 --- a/css/settings/settings-addressbook.scss +++ b/css/settings/settings-addressbook.scss @@ -1,4 +1,26 @@ -// BLOCK +/** + * @copyright Copyright (c) 2018 John Molakvoæ + * + * @author John Molakvoæ + * author Team Popcorn + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + .addressbook { display: flex; align-items: center; @@ -26,6 +48,4 @@ &__share { margin-left: auto; } -} - -// MODIFIER \ No newline at end of file +} \ No newline at end of file -- cgit v1.2.3 From d5cf32a3f4b302f467b017ffbd6bd0bd867cb030 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 21 Aug 2018 15:44:11 +0200 Subject: fixed issue with filter() --- css/contacts.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'css') diff --git a/css/contacts.scss b/css/contacts.scss index 1e955951..26f348dc 100644 --- a/css/contacts.scss +++ b/css/contacts.scss @@ -14,8 +14,6 @@ $grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2}; } } - -@import 'settings'; @import 'settings-section'; @import 'settings/settings-addressbook'; @import 'settings/settings-addressbook-shares'; -- cgit v1.2.3 From 5bcd23e005eeb010da25ea8b45900ba5e206b4f0 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 21 Aug 2018 17:48:23 +0200 Subject: added styling so multiselect content only shows when input with length more than 0 is given --- css/settings/settings-addressbook-shares.scss | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'css') diff --git a/css/settings/settings-addressbook-shares.scss b/css/settings/settings-addressbook-shares.scss index 365b5b0f..917a87a4 100644 --- a/css/settings/settings-addressbook-shares.scss +++ b/css/settings/settings-addressbook-shares.scss @@ -29,7 +29,9 @@ display: flex; flex-direction: column; } - + &__shareematch--bold { + font-weight: bold; + } .multiselect.multiselect-vue { width: inherit; @@ -39,12 +41,14 @@ } .multiselect__content-wrapper { + display: none; + } + } + .multiselect.showContent { + .multiselect__content-wrapper { + display: inherit; background: #f0f0f0; width: inherit; } - - &__shareematch--bold { - font-weight: bold; - } } } \ No newline at end of file -- cgit v1.2.3