Fix button style conflict wiht bootstrap

pull/1/head
yflory 4 years ago
parent ab726811f9
commit 59f369659a

@ -119,6 +119,8 @@
} }
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
color: @alertify-btn-fg;
border: 1px solid @alertify-btn-fg;
background-color: lighten(@alertify-fore, 35%); background-color: lighten(@alertify-fore, 35%);
} }
@ -145,7 +147,7 @@
} }
} }
&.danger-alt, &.btn-danger-alt { &.danger-alt, &.btn-danger-alt, &.btn-danger-outline {
border-color: @colortheme_alertify-red; border-color: @colortheme_alertify-red;
color: @colortheme_alertify-red; color: @colortheme_alertify-red;
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
@ -163,7 +165,7 @@
} }
} }
&.primary, &.btn-primary { &.primary, &.btn-primary, &.btn-success {
background-color: @colortheme_alertify-primary; background-color: @colortheme_alertify-primary;
color: @colortheme_alertify-primary-text; color: @colortheme_alertify-primary-text;
border-color: @colortheme_alertify-primary-border; border-color: @colortheme_alertify-primary-border;

@ -101,13 +101,13 @@ define([
var url = APP.origin + '/profile/#' + hash; var url = APP.origin + '/profile/#' + hash;
$('<button>', { $('<button>', {
'class': 'btn btn-success '+VIEW_PROFILE_BUTTON, 'class': 'btn btn-primary '+VIEW_PROFILE_BUTTON,
}).text(Messages.profile_viewMyProfile).click(function () { }).text(Messages.profile_viewMyProfile).click(function () {
window.open(url, '_blank'); window.open(url, '_blank');
}).appendTo($container); }).appendTo($container);
$('<button>', { $('<button>', {
'class': 'btn btn-success '+VIEW_PROFILE_BUTTON, 'class': 'btn btn-primary '+VIEW_PROFILE_BUTTON,
}).append(h('i.fa.fa-shhare-alt')) }).append(h('i.fa.fa-shhare-alt'))
.append(h('span', Messages.shareButton)) .append(h('span', Messages.shareButton))
.click(function () { .click(function () {

Loading…
Cancel
Save