Merge branch 'master' of github.com:laurent22/joplin

ElectronClient/app/app.js

@@ -704,6 +704,16 @@ class Application extends BaseApplication {
 							name: 'commandStartExternalEditing',
 						});
 					},
+				}, {
+					label: _('Tags'),
+					screens: ['Main'],
+					accelerator: 'CommandOrControl+Alt+T',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'setTags',
+						});
+					},
 				}, {
 					type: 'separator',
 					screens: ['Main'],

ElectronClient/app/gui/SideBar.jsx

@@ -103,7 +103,7 @@ class SideBarComponent extends React.Component {
 		};
 	}
 
-	style() {
+	style(depth) {
 		const theme = themeStyle(this.props.theme);
 
 		const itemHeight = 25;
@@ -118,6 +118,8 @@ class SideBarComponent extends React.Component {
 				// paddingLeft: 14,
 				display: "flex",
 				alignItems: "stretch",
+				// Allow 3 levels of color depth
+				backgroundColor: theme.depthColor.replace('OPACITY', Math.min(depth * 0.1, 0.3)),
 			},
 			listItem: {
 				fontFamily: theme.fontFamily,
@@ -417,7 +419,7 @@ class SideBarComponent extends React.Component {
 
 		const itemTitle = Folder.displayTitle(folder);
 
-		let containerStyle = Object.assign({}, this.style().listItemContainer);
+		let containerStyle = Object.assign({}, this.style(depth).listItemContainer);
 		if (selected) containerStyle = Object.assign(containerStyle, this.style().listItemSelected);
 
 		let expandLinkStyle = Object.assign({}, this.style().listItemExpandIcon);

ElectronClient/app/theme.js

@@ -82,6 +82,7 @@ const lightStyle = {
 	urlColor: '#155BDA',
 
 	backgroundColor2: "#162B3D",
+	depthColor: 'rgb(100, 182, 253, OPACITY)',
 	color2: "#f5f5f5",
 	selectedColor2: "#0269C2",
 	colorError2: "#ff6c6c",
@@ -119,8 +120,9 @@ const darkStyle = {
 	urlColor: '#4E87EE',
 
 	backgroundColor2: "#181A1D",
+	depthColor: 'rgb(200, 200, 200, OPACITY)',
 	color2: "#ffffff",
-	selectedColor2: "#333333",
+	selectedColor2: "#013F74",
 	colorError2: "#ff6c6c",
 
 	raisedBackgroundColor: "#474747",