From 6bc2492005885c3cb0d6f77d4d9dd44c21bea427 Mon Sep 17 00:00:00 2001 From: halwan-bot Date: Thu, 19 Aug 2021 19:06:04 +0300 Subject: [PATCH] Enhancements --- control/content/assets/css/bf_base.css | 2 +- control/content/assets/css/sortable.css | 9 +++++- .../controllers/content.home.controller.js | 29 +++++++++---------- control/settings/assets/css/bf_base.css | 6 ++-- .../settings/assets/css/control.settings.css | 17 ++++++++--- .../strings/assets/css/control.strings.css | 13 ++++++++- widget/assets/.images/.nomedia | 0 widget/assets/.images/README.md | 11 ------- widget/assets/css/media.css | 2 +- widget/assets/css/widget.app.css | 4 +-- .../assets/{.images => images}/empty_page.svg | 0 widget/controllers/widget.home.controller.js | 8 +++++ 12 files changed, 62 insertions(+), 39 deletions(-) delete mode 100644 widget/assets/.images/.nomedia delete mode 100755 widget/assets/.images/README.md rename widget/assets/{.images => images}/empty_page.svg (100%) diff --git a/control/content/assets/css/bf_base.css b/control/content/assets/css/bf_base.css index 619e8b7..679c2e8 100644 --- a/control/content/assets/css/bf_base.css +++ b/control/content/assets/css/bf_base.css @@ -56,7 +56,7 @@ p { display: block; } label{ - color: var(--c-info); + /* color: var(--c-info); */ font-size: .75rem; } h4, h5, h6 { diff --git a/control/content/assets/css/sortable.css b/control/content/assets/css/sortable.css index 4503fa9..663b677 100644 --- a/control/content/assets/css/sortable.css +++ b/control/content/assets/css/sortable.css @@ -103,7 +103,8 @@ html[buildfire] .d-item .btn-edit-icon:hover::after{ } .carousel-items.draggable-list-view .d-item .media-holder { - background: transparent !important; + background: #eef0f0 !important; + width: 100%; } .draggable-list-view .d-item .media-holder { @@ -132,4 +133,10 @@ html[buildfire] .d-item .btn-edit-icon:hover::after{ .d-item .copy a.text-primary { flex-grow: 1 !important; +} + +.draggable-list-view.carousel-items .d-item span.title { + width: 50%; + flex-grow: 1; + margin-left: 10px; } \ No newline at end of file diff --git a/control/content/controllers/content.home.controller.js b/control/content/controllers/content.home.controller.js index 1529f78..219562e 100644 --- a/control/content/controllers/content.home.controller.js +++ b/control/content/controllers/content.home.controller.js @@ -596,8 +596,18 @@ } var item = ContentHome.items[index]; if ("undefined" !== typeof item) { - Modals.removePopupModal({ title: '', event: $event }).then(function (result) { - if (result) { + buildfire.dialog.confirm( + { + title: "Delete Item", + message: 'Are you sure you want to delete this item?', + isMessageHTML: true, + confirmButton: { + type: "danger", + text: "Delete" + } + }, + (err, isConfirmed) => { + if (isConfirmed) { if (item.data.searchEngineId) { SearchEngineService.delete(item.data.searchEngineId); } @@ -607,20 +617,9 @@ }, function (err) { console.error('Error while deleting an item-----', err); }); + } } - else { - console.info('Unable to load data.'); - } - }, function (cancelData) { - //do something on cancel - }); - /*$timeout(function () { - var top = $($event.currentTarget).offset().top; - if (top > 100) - top -= 100; - $('.modal-dialog.modal-sm').offset({top: top, left: 0}); - }, 500);*/ - + ); } }; diff --git a/control/settings/assets/css/bf_base.css b/control/settings/assets/css/bf_base.css index c9a3918..3dce185 100644 --- a/control/settings/assets/css/bf_base.css +++ b/control/settings/assets/css/bf_base.css @@ -56,7 +56,7 @@ p { display: block; } label{ - color: var(--c-info); + /* color: var(--c-info); */ font-size: .75rem; } h4, h5, h6 { @@ -740,7 +740,7 @@ color: var(--c-info); box-shadow: 0 0 5px rgb(0 0 0 / 30%); content: ""; height: 24px; - left: -4px; + left: 0; margin-top: -9px; position: absolute; top: -4px; @@ -760,7 +760,7 @@ color: var(--c-info); .button-switch > input[type="checkbox"]:checked + label::after { background: inherit; - left: 25px; + left: 23px; } .button-switch.switch-sm > label::before { diff --git a/control/settings/assets/css/control.settings.css b/control/settings/assets/css/control.settings.css index 5a75a33..b466952 100644 --- a/control/settings/assets/css/control.settings.css +++ b/control/settings/assets/css/control.settings.css @@ -127,6 +127,7 @@ .setting-toggle p.setting-label { width: 250px; margin: 0; + color: #5f5f5f } .setting-toggle button { padding: 10px; @@ -203,6 +204,7 @@ } .customTooltipBox .customTooltipText { visibility: hidden; + font-size: 11px; width: 300px; background-color: #414547; color: #fff; @@ -228,6 +230,17 @@ border-style: solid; border-color: #414547 transparent transparent transparent; } + + .customTooltipBox .customTooltipText { + max-width: 220px; + padding: 8px 12px; + color: #fff; + text-align: center; + text-decoration: none; + background-color: #32373a; + border-radius: 4px; + } + .info-row { margin-bottom: 10px; } @@ -261,8 +274,4 @@ .input-group-addon:hover { background-color: #3c3c3c !important; - } - - .setting-label { - color: var(--c-info); } \ No newline at end of file diff --git a/control/strings/assets/css/control.strings.css b/control/strings/assets/css/control.strings.css index 63a2473..aae8afb 100644 --- a/control/strings/assets/css/control.strings.css +++ b/control/strings/assets/css/control.strings.css @@ -19,7 +19,8 @@ .customTooltipBox .customTooltipText { visibility: hidden; - width: 200px; + font-size: 11px; + width: 300px; background-color: #414547; color: #fff; text-align: center; @@ -104,6 +105,16 @@ opacity: 0.9; } + .customTooltipBox .customTooltipText { + max-width: 220px; + padding: 8px 12px; + color: #fff; + text-align: center; + text-decoration: none; + background-color: #32373a; + border-radius: 4px; + } + .subTitle { margin-bottom: 25px; font-style: italic; diff --git a/widget/assets/.images/.nomedia b/widget/assets/.images/.nomedia deleted file mode 100644 index e69de29..0000000 diff --git a/widget/assets/.images/README.md b/widget/assets/.images/README.md deleted file mode 100755 index c86c990..0000000 --- a/widget/assets/.images/README.md +++ /dev/null @@ -1,11 +0,0 @@ - -#### the .images (folder) -This folder contains images which will be used on the widget section like -placeholder images. - -* .nomedia : This file prevents images from showing up in your Android -phone's image gallery. - - - - diff --git a/widget/assets/css/media.css b/widget/assets/css/media.css index 2cbf829..7643381 100644 --- a/widget/assets/css/media.css +++ b/widget/assets/css/media.css @@ -3,7 +3,7 @@ html{ font-size: 16px !important; } -.slide { +.slide.safe-area { padding-top: env(safe-area-inset-top) !important; } diff --git a/widget/assets/css/widget.app.css b/widget/assets/css/widget.app.css index 203a047..0e01d4c 100644 --- a/widget/assets/css/widget.app.css +++ b/widget/assets/css/widget.app.css @@ -942,7 +942,7 @@ input[type=range]::-ms-track { } .bitmap { - background-image: url('../.images/empty_page.svg'); + background-image: url('../images/empty_page.svg'); background-repeat: no-repeat; background-attachment: absolute; background-position: center; @@ -989,7 +989,7 @@ input[type=range]::-ms-track { } #emptyContainer { - background-image: url(../.images/empty_page.svg); + background-image: url('../images/empty_page.svg'); background-repeat: no-repeat; background-position: center; height: 80vh; diff --git a/widget/assets/.images/empty_page.svg b/widget/assets/images/empty_page.svg similarity index 100% rename from widget/assets/.images/empty_page.svg rename to widget/assets/images/empty_page.svg diff --git a/widget/controllers/widget.home.controller.js b/widget/controllers/widget.home.controller.js index 6ac0387..f7da0e6 100644 --- a/widget/controllers/widget.home.controller.js +++ b/widget/controllers/widget.home.controller.js @@ -9,6 +9,14 @@ WidgetHome.deepLink = false; $rootScope.loadingData = true; + const isLauncher = window.location.href.includes('launcherPlugin'); + const slideElement = document.querySelector(".slide"); + if (isLauncher) { + slideElement.classList.add("safe-area"); + } else { + slideElement.classList.remove("safe-area"); + } + var _infoData = { data: { content: {