From 614556fb08fa97be1ee289ed41845b86c258bbbe Mon Sep 17 00:00:00 2001 From: fnuesse Date: Wed, 2 Jan 2019 12:25:33 +0100 Subject: [PATCH 1/2] updated icon-picker style Signed-off-by: fnuesse --- js/app/directives/iconpicker.js | 1 + sass/app.scss | 1 + sass/credentials.scss | 27 +------ sass/partials/icon-picker.scss | 94 +++++++++++++++++++++++ templates/views/partials/icon-picker.html | 11 ++- 5 files changed, 105 insertions(+), 29 deletions(-) create mode 100644 sass/partials/icon-picker.scss diff --git a/js/app/directives/iconpicker.js b/js/app/directives/iconpicker.js index 0c885845..706b18ea 100644 --- a/js/app/directives/iconpicker.js +++ b/js/app/directives/iconpicker.js @@ -136,6 +136,7 @@ $('#iconPicker').dialog({ width: 800, height: 380, + dialogClass: 'iconpicker-dialog', close: function() { $(this).dialog('destroy'); } diff --git a/sass/app.scss b/sass/app.scss index f064c217..3c1b511c 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -26,6 +26,7 @@ @import 'partials/popovermenu'; @import 'partials/tabs'; @import 'partials/pwgen'; +@import 'partials/icon-picker'; @import 'vaults'; @import 'credentials'; @import 'menu'; diff --git a/sass/credentials.scss b/sass/credentials.scss index d5816e72..868589fd 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -674,29 +674,4 @@ color: rgb(0, 102, 255); } } -} - -#iconPicker { - .iconList { - float: left; - width: 60%; - max-height: 310px; - overflow: auto; - .icon{ - img{ - cursor: pointer; - } - padding: 10px; - cursor: pointer; - float: left; - } - } - .iconModifier { - margin-left: 10px; - float: right; - width: calc(40% - 10px); - } - .iconSearch { - width: 100%; - } -} +} \ No newline at end of file diff --git a/sass/partials/icon-picker.scss b/sass/partials/icon-picker.scss new file mode 100644 index 00000000..8ed9ac9b --- /dev/null +++ b/sass/partials/icon-picker.scss @@ -0,0 +1,94 @@ +/** + * Nextcloud - passman + * + * @copyright Copyright (c) 2016, Felix Nüsse (felix.nuesse@t-online.de) + * @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 . + * + */ + +.iconpicker-dialog{ + border-radius: var(--border-radius-large); + box-shadow: 0 0 30px var(--color-box-shadow); + .ui-dialog{ + border-radius: var(--border-radius-large); + box-shadow: 0 0 30px var(--color-box-shadow); + } + .ui-widget-header { + background: none; + } + + .ui-icon-closethick { + background-position: inherit; + } + + .ui-button .ui-icon { + background-image: var(--icon-close-000); + } + + .ui-button-icon {border: none !important;} + .ui-icon {border: none !important;} + .ui-icon-closethick {border: none !important;} + .ui-corner-all {border: none !important;} + .ui-state-default {background: white !important;} + .ui-button {background: white !important;} + +} + +#iconPicker { + .iconList { + float: left; + width: 60%; + max-height: 310px; + overflow: auto; + .icon{ + img{ + cursor: pointer; + } + padding: 10px; + cursor: pointer; + float: left; + } + } + .iconModifier { + margin-left: 10px; + float: right; + width: calc(40% - 10px); + } + .iconSearch { + width: 100%; + } + + .arrow { + cursor: pointer; + padding-left: 10px; + width: 10px; + float: left; + } + + .collapsible { + cursor: pointer; + padding-left: 10px; + text-align: left; + font-size: 15px; + } + .content { + display: none; + } + .content_show { + display: block; + } + +} diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html index 00ff7031..73d5f965 100644 --- a/templates/views/partials/icon-picker.html +++ b/templates/views/partials/icon-picker.html @@ -2,9 +2,14 @@