infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix button style conflict wiht bootstrap

pull/1/head
yflory 2020-12-09 15:11:42 +01:00
parent ab726811f9
commit 59f369659a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/src/less2/include/forms.less
View File

@ -119,6 +119,8 @@
}
&:hover, &:active, &:focus {
color: @alertify-btn-fg;
border: 1px solid @alertify-btn-fg;
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;
color: @colortheme_alertify-red;
&:hover, &:active, &:focus {
@ -163,7 +165,7 @@
}
}
&.primary, &.btn-primary {
&.primary, &.btn-primary, &.btn-success {
background-color: @colortheme_alertify-primary;
color: @colortheme_alertify-primary-text;
border-color: @colortheme_alertify-primary-border;

4
www/profile/inner.js
View File

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