Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add alpha option for background color #199

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add alpha option for background color #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aca185
add alpha for background color
ysirotenko Jan 21, 2021
50a97b6
fix. Convert from hex to rgba and other fixes
ysirotenko Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/css/themes.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,18 @@
// Other theme colors

&.iziToast-color-red
background rgba(255, 175, 180, 0.9)
border-color rgba(255, 175, 180, 0.9)
&.iziToast-color-orange
background rgba(255, 207, 165, 0.9)
border-color rgba(255, 207, 165, 0.9)
&.iziToast-color-yellow
background rgba(255, 249, 178, 0.9)
border-color rgba(255, 249, 178, 0.9)
&.iziToast-color-blue
background rgba(157, 222, 255, 0.9)
border-color rgba(157, 222, 255, 0.9)
&.iziToast-color-green
background rgba(166, 239, 184, 0.9)
border-color rgba(166, 239, 184, 0.9)

/*
* EXAMPLE new colors
*
&.iziToast-color-name
*/
*/
63 changes: 56 additions & 7 deletions src/js/iziToast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,28 @@
THEMES = {
info: {
color: 'blue',
icon: 'ico-info'
icon: 'ico-info',
backgroundColor: "rgba(157, 222, 255, 0.9)",
},
success: {
color: 'green',
icon: 'ico-success'
icon: 'ico-success',
backgroundColor: "rgba(166, 239, 184, 0.9)",
},
warning: {
color: 'orange',
icon: 'ico-warning'
icon: 'ico-warning',
backgroundColor: "rgba(255, 207, 165, 0.9)",
},
error: {
color: 'red',
icon: 'ico-error'
icon: 'ico-error',
backgroundColor: "rgba(255, 175, 180, 0.9)",
},
question: {
color: 'yellow',
icon: 'ico-question'
icon: 'ico-question',
backgroundColor: "rgba(255, 249, 178, 0.9)",
}
},
MOBILEWIDTH = 568,
Expand All @@ -66,6 +71,7 @@
messageSize: '',
messageLineHeight: '',
backgroundColor: '',
backgroundOpacity: '',
theme: 'light', // dark
color: '', // blue, red, green, yellow
icon: '',
Expand Down Expand Up @@ -221,6 +227,41 @@
}
};

/**
* Check is color has rgba format?
* @private
*/
var isRgba = function(color){
return color.substring(0,4) == 'rgba';
};

/**
* Check is color has rgb format
* @private
*/
var isRgb = function(color){
return color.substring(0,3) == 'rgb';
};

/**
* Check is color has HEX fromat
* @private
*/
var isHex = function(color){
return color.substring(0,1) == '#';
};

/**
* Convert HEX to RGBA
* @private
*/
var hexToRgba = function(hex, alpha){
var r = parseInt(hex.slice(1, 3), 16),
g = parseInt(hex.slice(3, 5), 16),
b = parseInt(hex.slice(5, 7), 16);
return "rgba(" + r + ", " + g + ", " + b + ", " + alpha + ")";
};


/**
* Check if is a Base64 string
Expand Down Expand Up @@ -777,7 +818,15 @@
}

if(settings.backgroundColor) {
$DOM.toast.style.background = settings.backgroundColor;
if (isHex(settings.backgroundColor) && settings.backgroundOpacity != '') {
$DOM.toast.style.background = hexToRgba(settings.backgroundColor, settings.backgroundOpacity);
} else if (isRgba(settings.backgroundColor) && settings.backgroundOpacity != '') {
$DOM.toast.style.background = settings.backgroundColor.replace(/[^,]+(?=\))/, settings.backgroundOpacity);
} else if (isRgb(settings.backgroundColor) && settings.backgroundOpacity != '') {
$DOM.toast.style.background = settings.backgroundColor.replace(/\)/, ',' + settings.backgroundOpacity + ')');
} else {
$DOM.toast.style.background = settings.backgroundColor;
}
if(settings.balloon){
$DOM.toast.style.borderColor = settings.backgroundColor;
}
Expand Down Expand Up @@ -1289,4 +1338,4 @@


return $iziToast;
});
});