From 2995782079b6de6b49b19151d8a95d918fd12e1d Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 23 Jan 2018 17:02:32 +0100 Subject: [PATCH] Different colors for ok and cancel in alertify --- customize.dist/src/less2/include/alertify.less | 8 ++++++++ customize.dist/src/less2/include/colortheme.less | 2 ++ www/common/common-interface.js | 4 ++-- www/common/common-ui-elements.js | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index 6ec3c615b..194b780d1 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -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 { background-color: @alertify-btn-bg-hover; } diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index afa40cfd4..c8848d02b 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -28,6 +28,8 @@ @colortheme_alertify-red: #E55236; @colortheme_alertify-green: #77C825; +@colortheme_alertify-primary: #fff; +@colortheme_alertify-primary-text: #000; @colortheme_notification-log: rgba(0, 0, 0, 0.8); @colortheme_notification-warn: rgba(205, 37, 50, 0.8); diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 2e067613a..c256d2656 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -112,7 +112,7 @@ define([ }; 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) { @@ -324,7 +324,7 @@ define([ var navs = []; opt.buttons.forEach(function (b) { 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 () { b.onClick(); close($(this).parents('.alertify').first()); diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 0100be3f8..e43a66176 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -302,6 +302,7 @@ define([ onClick: function () {}, keys: [27] }, { + className: 'primary', name: Messages.share_linkCopy, onClick: function () { saveValue(); @@ -311,6 +312,7 @@ define([ }, keys: [13] }, { + className: 'primary', name: Messages.share_linkOpen, onClick: function () { saveValue(); @@ -340,6 +342,7 @@ define([ onClick: function () {}, keys: [27] }, { + className: 'primary', name: Messages.share_linkCopy, onClick: function () { var v = getEmbedValue(); @@ -396,6 +399,7 @@ define([ onClick: function () {}, keys: [27] }, { + className: 'primary', name: Messages.share_linkCopy, onClick: function () { var v = getLinkValue(); @@ -421,6 +425,7 @@ define([ onClick: function () {}, keys: [27] }, { + className: 'primary', name: Messages.share_mediatagCopy, onClick: function () { var v = common.getMediatagFromHref(url);