From 42ac987d961441c0413c47d384373476cc8cc833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 24 Oct 2018 10:50:27 +0200 Subject: Fix enable ab toggle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- css/ImportScreen.scss | 40 +++++++++++++++++++++++++++++++++++ css/Settings/SettingsAddressbook.scss | 3 +++ css/contacts.scss | 6 ++++-- css/importScreen.scss | 40 ----------------------------------- 4 files changed, 47 insertions(+), 42 deletions(-) create mode 100644 css/ImportScreen.scss delete mode 100644 css/importScreen.scss (limited to 'css') diff --git a/css/ImportScreen.scss b/css/ImportScreen.scss new file mode 100644 index 00000000..3d815389 --- /dev/null +++ b/css/ImportScreen.scss @@ -0,0 +1,40 @@ +/** + * @copyright Copyright (c) 2018 Team Popcorn + * + * 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 . + * + */ + +.import-screen { + &__header { + padding-top: 20px; + } + &__progress { + width: 50%; + min-width: 300px; + margin: auto; + } + &__tracker { + display: flex; + justify-content: space-between; + width: 50%; + min-width: 300px; + margin: auto; + padding-top: 10px; + } +} diff --git a/css/Settings/SettingsAddressbook.scss b/css/Settings/SettingsAddressbook.scss index b5d779c0..61796c76 100644 --- a/css/Settings/SettingsAddressbook.scss +++ b/css/Settings/SettingsAddressbook.scss @@ -48,4 +48,7 @@ &__share { margin-left: auto; } + &--disabled &__name { + opacity: .5; + } } \ No newline at end of file diff --git a/css/contacts.scss b/css/contacts.scss index e963e361..a54e58f8 100644 --- a/css/contacts.scss +++ b/css/contacts.scss @@ -37,7 +37,7 @@ $grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2}; } } - +// components @import 'SettingsSection'; @import 'Settings/SettingsAddressbook'; @import 'Settings/SettingsAddressbookShares'; @@ -47,6 +47,8 @@ $grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2}; @import 'ContentListItem'; @import 'Properties/Properties'; @import 'Properties/PropertyTitle'; -@import 'importScreen'; +@import 'ImportScreen'; + +// various @import 'animations'; @import 'icons'; diff --git a/css/importScreen.scss b/css/importScreen.scss deleted file mode 100644 index 3d815389..00000000 --- a/css/importScreen.scss +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @copyright Copyright (c) 2018 Team Popcorn - * - * 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 . - * - */ - -.import-screen { - &__header { - padding-top: 20px; - } - &__progress { - width: 50%; - min-width: 300px; - margin: auto; - } - &__tracker { - display: flex; - justify-content: space-between; - width: 50%; - min-width: 300px; - margin: auto; - padding-top: 10px; - } -} -- cgit v1.2.3