web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Different colors for ok and cancel in alertify

Browse Source
This commit is contained in:
yflory 2018-01-23 17:02:32 +01:00
parent 8d87a66284
commit 2995782079
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
customize.dist/src/less2/include/alertify.less
View File

@ -268,6 +268,14 @@
} }
} }
&.primary {
background-color: @colortheme_alertify-primary;
color: @colortheme_alertify-primary-text;
&:hover, &:active {
background-color: darken(@colortheme_alertify-primary, 10%);
}
}
&:hover, &:active { &:hover, &:active {
background-color: @alertify-btn-bg-hover; background-color: @alertify-btn-bg-hover;
} }

2
customize.dist/src/less2/include/colortheme.less
View File

@ -28,6 +28,8 @@
@colortheme_alertify-red: #E55236; @colortheme_alertify-red: #E55236;
@colortheme_alertify-green: #77C825; @colortheme_alertify-green: #77C825;
@colortheme_alertify-primary: #fff;
@colortheme_alertify-primary-text: #000;
@colortheme_notification-log: rgba(0, 0, 0, 0.8); @colortheme_notification-log: rgba(0, 0, 0, 0.8);
@colortheme_notification-warn: rgba(205, 37, 50, 0.8); @colortheme_notification-warn: rgba(205, 37, 50, 0.8);

4
www/common/common-interface.js
View File

@ -112,7 +112,7 @@ define([
}; };
dialog.okButton = function (content) { dialog.okButton = function (content) {
return h('button.ok', { tabindex: '2', }, content || Messages.okButton); return h('button.ok.primary', { tabindex: '2', }, content || Messages.okButton);
}; };
dialog.cancelButton = function (content) { dialog.cancelButton = function (content) {
@ -324,7 +324,7 @@ define([
var navs = []; var navs = [];
opt.buttons.forEach(function (b) { opt.buttons.forEach(function (b) {
if (!b.name || !b.onClick) { return; } if (!b.name || !b.onClick) { return; }
var button = h('button', { tabindex: '1' }, b.name); var button = h('button', { tabindex: '1', 'class': b.className || '' }, b.name);
$(button).click(function () { $(button).click(function () {
b.onClick(); b.onClick();
close($(this).parents('.alertify').first()); close($(this).parents('.alertify').first());

5
www/common/common-ui-elements.js
View File

@ -302,6 +302,7 @@ define([
onClick: function () {}, onClick: function () {},
keys: [27] keys: [27]
}, { }, {
className: 'primary',
name: Messages.share_linkCopy, name: Messages.share_linkCopy,
onClick: function () { onClick: function () {
saveValue(); saveValue();
@ -311,6 +312,7 @@ define([
}, },
keys: [13] keys: [13]
}, { }, {
className: 'primary',
name: Messages.share_linkOpen, name: Messages.share_linkOpen,
onClick: function () { onClick: function () {
saveValue(); saveValue();
@ -340,6 +342,7 @@ define([
onClick: function () {}, onClick: function () {},
keys: [27] keys: [27]
}, { }, {
className: 'primary',
name: Messages.share_linkCopy, name: Messages.share_linkCopy,
onClick: function () { onClick: function () {
var v = getEmbedValue(); var v = getEmbedValue();
@ -396,6 +399,7 @@ define([
onClick: function () {}, onClick: function () {},
keys: [27] keys: [27]
}, { }, {
className: 'primary',
name: Messages.share_linkCopy, name: Messages.share_linkCopy,
onClick: function () { onClick: function () {
var v = getLinkValue(); var v = getLinkValue();
@ -421,6 +425,7 @@ define([
onClick: function () {}, onClick: function () {},
keys: [27] keys: [27]
}, { }, {
className: 'primary',
name: Messages.share_mediatagCopy, name: Messages.share_mediatagCopy,
onClick: function () { onClick: function () {
var v = common.getMediatagFromHref(url); var v = common.getMediatagFromHref(url);