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

make sure green UI elements use the same green

Browse Source
This commit is contained in:
ansuz
2017-03-30 15:50:06 +02:00
parent 18469edf18
commit 7908f3b4f0
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
customize.dist/src/less/toolbar.less
View File

@@ -23,6 +23,8 @@
} }
.cryptpad-toolbar { .cryptpad-toolbar {
@toolbar-green: #5cb85c;
box-sizing: border-box; box-sizing: border-box;
padding: 0px 6px; padding: 0px 6px;
@@ -43,8 +45,8 @@
&#shareButton { &#shareButton {
// Bootstrap 4 colors // Bootstrap 4 colors
color: #fff; color: #fff;
background: #5cb85c; background: @toolbar-green;
border-color: #5cb85c; border-color: @toolbar-green;
&:hover { &:hover {
background: #449d44; background: #449d44;
border: 1px solid #419641; border: 1px solid #419641;
@@ -144,14 +146,14 @@
&.lag3 { &.lag3 {
.bar4 { .clag(); } .bar4 { .clag(); }
span { span {
background-color: green; background-color: @toolbar-green;
border-color: green; border-color: @toolbar-green;
} }
} }
&.lag4 { &.lag4 {
span { span {
background-color: green; background-color: @toolbar-green;
border-color: green; border-color: @toolbar-green;
} }
} }
} }

8
customize.dist/toolbar.css
View File

@@ -222,12 +222,12 @@
background: transparent; background: transparent;
} }
.cryptpad-toolbar #newLag.lag3 span { .cryptpad-toolbar #newLag.lag3 span {
background-color: green; background-color: #5cb85c;
border-color: green; border-color: #5cb85c;
} }
.cryptpad-toolbar #newLag.lag4 span { .cryptpad-toolbar #newLag.lag4 span {
background-color: green; background-color: #5cb85c;
border-color: green; border-color: #5cb85c;
} }
.cryptpad-toolbar div { .cryptpad-toolbar div {
white-space: normal; white-space: normal;

2
customize.dist/translations/messages.fr.js
View File

@@ -367,7 +367,7 @@ define(function () {
'<span style="font-size:18px;"><p>', '<span style="font-size:18px;"><p>',
'Voici <strong>CryptPad</strong>, l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.', 'Voici <strong>CryptPad</strong>, l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.',
'<br>', '<br>',
'Partagez le lien vers ce pad avec des amis ou utilisez le bouton <span style="background-color:#449d44;color:#ffffff;">&nbsp;Partager&nbsp;</span> pour obtenir le <em>lien de lecture-seule</em>, qui permet la lecture mais non la modification.', 'Partagez le lien vers ce pad avec des amis ou utilisez le bouton <span style="background-color:#5cb85c;color:#ffffff;">&nbsp;Partager&nbsp;</span> pour obtenir le <em>lien de lecture-seule</em>, qui permet la lecture mais non la modification.',
'</p>', '</p>',
'<p><span style="color:#808080; font-size: 18px;">', '<p><span style="color:#808080; font-size: 18px;">',
'<em>', '<em>',

2
customize.dist/translations/messages.js
View File

@@ -375,7 +375,7 @@ define(function () {
'<span style="font-size:18px;"><p>', '<span style="font-size:18px;"><p>',
'This is&nbsp;<strong>CryptPad</strong>, the Zero Knowledge realtime collaborative editor. Everything is saved as you type.', 'This is&nbsp;<strong>CryptPad</strong>, the Zero Knowledge realtime collaborative editor. Everything is saved as you type.',
'<br>', '<br>',
'Share the link to this pad to edit with friends or use the <span style="background-color:#449d44;color:#ffffff;">&nbsp;Share&nbsp;</span> button to share a <em>read-only link</em>&nbsp;which allows viewing but not editing.', 'Share the link to this pad to edit with friends or use the <span style="background-color:#5cb85c;color:#ffffff;">&nbsp;Share&nbsp;</span> button to share a <em>read-only link</em>&nbsp;which allows viewing but not editing.',
'</p>', '</p>',
'<p><span style="color:#808080;"><em>', '<p><span style="color:#808080;"><em>',