Skip to content

Commit 255d956

Browse files
committed
styling for redirect warning toast.
Changing some styling for all toasts as requested changes should apply to all toasts.
1 parent 395fcf1 commit 255d956

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

frontend/express/public/javascripts/countly/vue/components/helpers.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -859,8 +859,8 @@
859859
'<img :src="image" class="alert-image bu-mr-4 bu-my-2 bu-ml-2">\n' +
860860
'<slot><span class="alert-text" style="margin-block:auto" v-html="innerText">{{text}}</span></slot>\n' +
861861
'</div>\n' +
862-
'<div v-if="closable" style="margin-block:auto">\n' +
863-
'<div v-if="size==\'full\'" @click="closeModal" class="bu-mr-2 bu-ml-5" >\n' +
862+
'<div v-if="closable" class="bu-mt-2" >\n' +
863+
'<div v-if="size==\'full\'" @click="closeModal" class="bu-mr-2 bu-ml-2" >\n' +
864864
'<slot name="close"><i class="el-icon-close"></i></slot>\n' +
865865
'</div>\n' +
866866
'<div v-else @click="closeModal" class="bu-mr-2 bu-ml-6">\n' +

frontend/express/public/stylesheets/styles/blocks/_notification-toasts.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
&__item {
88
margin-top: 12px;
99
min-width: 288px;
10-
max-width: 400px;
10+
max-width: 288px;
1111
}
1212
}

plugins/data_migration/frontend/public/javascripts/countly.views.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
//switching apps. show message if redirect url is set
403403
app.addAppSwitchCallback(function(appId) {
404404
if (appId && countlyGlobal.apps[appId] && countlyGlobal.apps[appId].redirect_url && countlyGlobal.apps[appId].redirect_url !== "") {
405-
var mm = "<h4 class='bu-pt-3 bu-pb-1'>" + jQuery.i18n.map["data-migration.app-redirected"].replace('{app_name}', countlyGlobal.apps[appId].name) + "</h4><p bu-pt-1>" + jQuery.i18n.map["data-migration.app-redirected-explanation"] + " <b>" + countlyGlobal.apps[appId].redirect_url + "</b><p><a href='#/manage/apps' style='color:rgb(1, 102, 214);'>" + jQuery.i18n.map["data-migration.app-redirected-remove"] + "</a>";
405+
var mm = "<h4 class='bu-pt-3 bu-pb-1' style='overflow-wrap: break-word;'>" + jQuery.i18n.map["data-migration.app-redirected"].replace('{app_name}', countlyGlobal.apps[appId].name) + "</h4><p bu-pt-1>" + jQuery.i18n.map["data-migration.app-redirected-explanation"] + " <b><span style='overflow-wrap: break-word;'>" + countlyGlobal.apps[appId].redirect_url + "<span></b><p><a href='#/manage/apps' style='color:rgb(1, 102, 214); cursor:pointer;'>" + jQuery.i18n.map["data-migration.app-redirected-remove"] + "</a>";
406406
var msg = {
407407
title: jQuery.i18n.map["data-migration.app-redirected"].replace('{app_name}', countlyGlobal.apps[appId].name),
408408
message: mm,

plugins/data_migration/frontend/public/localization/data_migration.properties

+1
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,6 @@ systemlogs.action.import_finished_response_failed = Import successful. Failed to
165165
systemlogs.action.app_redirected = App redirected
166166
#for app redirect settings
167167
management-applications.redirect_url= Redirect URL
168+
management-applications.redirect_url.help = Incoming data for this app is redirected to given address. Disable to stop data redirection.
168169
management-applications.table.redirect_not_set = None
169170
management-applications.table.remove_redirect = Remove redirect

0 commit comments

Comments
 (0)