self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-02 22:49:09 +02:00
Code Issues Releases Activity

Revert "Applied prettier to code base"

Browse Source 
This reverts commit c4f19465a6.
This commit is contained in:
Laurent Cozic
2018-03-09 20:59:12 +00:00
parent 5e8b09f5af
commit 55c5ddedf4
203 changed files with 7883 additions and 13355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ReactNativeClient/lib/components/global-style.js
View File

@@ -1,4 +1,4 @@
const Setting = require("lib/models/Setting.js");
const Setting = require('lib/models/Setting.js');
const globalStyle = {
fontSize: 16,
@@ -12,7 +12,7 @@ const globalStyle = {
colorFaded: "#777777", // For less important text
fontSizeSmaller: 14,
dividerColor: "#dddddd",
selectedColor: "#e5e5e5",
selectedColor: '#e5e5e5',
disabledOpacity: 0.2,
raisedBackgroundColor: "#0080EF",
@@ -22,19 +22,19 @@ const globalStyle = {
warningBackgroundColor: "#FFD08D",
// For WebView - must correspond to the properties above
htmlFontSize: "16px",
htmlColor: "black", // Note: CSS in WebView component only supports named colors or rgb() notation
htmlBackgroundColor: "white",
htmlDividerColor: "Gainsboro",
htmlLinkColor: "blue",
htmlLineHeight: "20px",
htmlFontSize: '16px',
htmlColor: 'black', // Note: CSS in WebView component only supports named colors or rgb() notation
htmlBackgroundColor: 'white',
htmlDividerColor: 'Gainsboro',
htmlLinkColor: 'blue',
htmlLineHeight: '20px',
};
globalStyle.marginRight = globalStyle.margin;
globalStyle.marginLeft = globalStyle.margin;
globalStyle.marginTop = globalStyle.margin;
globalStyle.marginBottom = globalStyle.margin;
globalStyle.htmlMarginLeft = (globalStyle.marginLeft / 10 * 0.6).toFixed(2) + "em";
globalStyle.htmlMarginLeft = ((globalStyle.marginLeft / 10) * 0.6).toFixed(2) + 'em';
globalStyle.icon = {
color: globalStyle.color,
@@ -54,22 +54,22 @@ function themeStyle(theme) {
let output = Object.assign({}, globalStyle);
if (theme == Setting.THEME_LIGHT) return output;
output.backgroundColor = "#1D2024";
output.color = "#dddddd";
output.colorFaded = "#777777";
output.dividerColor = "#555555";
output.selectedColor = "#333333";
output.backgroundColor = '#1D2024';
output.color = '#dddddd';
output.colorFaded = '#777777';
output.dividerColor = '#555555';
output.selectedColor = '#333333';
output.raisedBackgroundColor = "#0F2051";
output.raisedColor = "#788BC3";
output.raisedHighlightedColor = "#ffffff";
output.htmlColor = "rgb(220,220,220)";
output.htmlBackgroundColor = "rgb(29,32,36)";
output.htmlLinkColor = "rgb(166,166,255)";
output.htmlColor = 'rgb(220,220,220)';
output.htmlBackgroundColor = 'rgb(29,32,36)';
output.htmlLinkColor = 'rgb(166,166,255)';
themeCache_[theme] = output;
return themeCache_[theme];
}
module.exports = { globalStyle, themeStyle };
module.exports = { globalStyle, themeStyle };