From 98c92238c3c64d1651bccad19db0b1ba2a7a6b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 3 Oct 2018 08:39:02 +0200 Subject: Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- css/Settings/SettingsAddressbook.scss | 51 ++++++++++++++++++++++ css/Settings/SettingsAddressbookShare.scss | 68 ----------------------------- css/Settings/SettingsAddressbookSharee.scss | 68 +++++++++++++++++++++++++++++ css/Settings/SettingsAddressbookShares.scss | 63 ++++++++++++++++++++++++++ 4 files changed, 182 insertions(+), 68 deletions(-) create mode 100644 css/Settings/SettingsAddressbook.scss delete mode 100644 css/Settings/SettingsAddressbookShare.scss create mode 100644 css/Settings/SettingsAddressbookSharee.scss create mode 100644 css/Settings/SettingsAddressbookShares.scss (limited to 'css/Settings') diff --git a/css/Settings/SettingsAddressbook.scss b/css/Settings/SettingsAddressbook.scss new file mode 100644 index 00000000..b5d779c0 --- /dev/null +++ b/css/Settings/SettingsAddressbook.scss @@ -0,0 +1,51 @@ +/** + * @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; + white-space: nowrap; + text-overflow: ellipsis; + + &__name { + display: block; + flex: 0 1 auto; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + &__share, + &__menu .icon-more { + width: 44px; + height: 44px; + opacity: .5; + &:hover, + &:focus, + &:active { + opacity: .7; + } + } + &__share { + margin-left: auto; + } +} \ No newline at end of file diff --git a/css/Settings/SettingsAddressbookShare.scss b/css/Settings/SettingsAddressbookShare.scss deleted file mode 100644 index 23d78088..00000000 --- a/css/Settings/SettingsAddressbookShare.scss +++ /dev/null @@ -1,68 +0,0 @@ -/** - * @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; - align-items: center; - width: 100%; - &__identifier { - width: 100%; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - display: inline-block; - vertical-align: top; - opacity: 0.7; - } - &__utils { - padding: 0 !important; - float: right; - position: relative !important; - display: inline-flex; - align-items: center; - flex-shrink: 0; - height: 20px; - .checkbox + label { - padding: 0 !important; - } - label { - opacity: 0.7; - } - } - - .icon { - margin-right: 5px; - opacity: 0.2; - width: 16px; - height: 16px; - display: inline-block; - } - - .icon-delete { - display: inline-block; - width: 24px; - height: 20px; - opacity: 0.4; - } -} \ No newline at end of file diff --git a/css/Settings/SettingsAddressbookSharee.scss b/css/Settings/SettingsAddressbookSharee.scss new file mode 100644 index 00000000..23d78088 --- /dev/null +++ b/css/Settings/SettingsAddressbookSharee.scss @@ -0,0 +1,68 @@ +/** + * @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; + align-items: center; + width: 100%; + &__identifier { + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + display: inline-block; + vertical-align: top; + opacity: 0.7; + } + &__utils { + padding: 0 !important; + float: right; + position: relative !important; + display: inline-flex; + align-items: center; + flex-shrink: 0; + height: 20px; + .checkbox + label { + padding: 0 !important; + } + label { + opacity: 0.7; + } + } + + .icon { + margin-right: 5px; + opacity: 0.2; + width: 16px; + height: 16px; + display: inline-block; + } + + .icon-delete { + display: inline-block; + width: 24px; + height: 20px; + opacity: 0.4; + } +} \ No newline at end of file diff --git a/css/Settings/SettingsAddressbookShares.scss b/css/Settings/SettingsAddressbookShares.scss new file mode 100644 index 00000000..ae7f0e7f --- /dev/null +++ b/css/Settings/SettingsAddressbookShares.scss @@ -0,0 +1,63 @@ +/** + * @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%; + &__list { + margin-top: 8px; + margin-bottom: 12px; + display: flex; + flex-direction: column; + } + + &__shareematch--bold { + font-weight: bold; + } + + .icon-loading::after { + top: 70%; + left: 95%; + height: 14px; + width: 14px; + } + + .multiselect.multiselect-vue { + width: inherit; + .multiselect__tags:focus-within, + .multiselect__tags:hover { + border-color: var(--color-primary-element); + } + + .multiselect__content-wrapper { + display: none; + } + } + + .multiselect.showContent { + .multiselect__content-wrapper { + display: inherit; + background: #f0f0f0; + width: inherit; + } + } +} \ No newline at end of file -- cgit v1.2.3