From 7908f3b4f02c69fa6c343ddc09b83de00472b4d4 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 30 Mar 2017 15:50:06 +0200 Subject: [PATCH] make sure green UI elements use the same green --- customize.dist/src/less/toolbar.less | 14 ++++++++------ customize.dist/toolbar.css | 8 ++++---- customize.dist/translations/messages.fr.js | 2 +- customize.dist/translations/messages.js | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index 1d3835041..9b93a0da6 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -23,6 +23,8 @@ } .cryptpad-toolbar { + @toolbar-green: #5cb85c; + box-sizing: border-box; padding: 0px 6px; @@ -43,8 +45,8 @@ &#shareButton { // Bootstrap 4 colors color: #fff; - background: #5cb85c; - border-color: #5cb85c; + background: @toolbar-green; + border-color: @toolbar-green; &:hover { background: #449d44; border: 1px solid #419641; @@ -144,14 +146,14 @@ &.lag3 { .bar4 { .clag(); } span { - background-color: green; - border-color: green; + background-color: @toolbar-green; + border-color: @toolbar-green; } } &.lag4 { span { - background-color: green; - border-color: green; + background-color: @toolbar-green; + border-color: @toolbar-green; } } } diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css index 2b3b2deb7..bbcffbf2f 100644 --- a/customize.dist/toolbar.css +++ b/customize.dist/toolbar.css @@ -222,12 +222,12 @@ background: transparent; } .cryptpad-toolbar #newLag.lag3 span { - background-color: green; - border-color: green; + background-color: #5cb85c; + border-color: #5cb85c; } .cryptpad-toolbar #newLag.lag4 span { - background-color: green; - border-color: green; + background-color: #5cb85c; + border-color: #5cb85c; } .cryptpad-toolbar div { white-space: normal; diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index b84451f86..f03468b8d 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -367,7 +367,7 @@ define(function () { '

', 'Voici CryptPad, l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.', '
', - 'Partagez le lien vers ce pad avec des amis ou utilisez le bouton  Partager  pour obtenir le lien de lecture-seule, qui permet la lecture mais non la modification.', + 'Partagez le lien vers ce pad avec des amis ou utilisez le bouton  Partager  pour obtenir le lien de lecture-seule, qui permet la lecture mais non la modification.', '

', '

', '', diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 91e4d2616..85319eff9 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -375,7 +375,7 @@ define(function () { '

', 'This is CryptPad, the Zero Knowledge realtime collaborative editor. Everything is saved as you type.', '
', - 'Share the link to this pad to edit with friends or use the  Share  button to share a read-only link which allows viewing but not editing.', + 'Share the link to this pad to edit with friends or use the  Share  button to share a read-only link which allows viewing but not editing.', '

', '

',