From e09d7fb103b586d5e775d6f0559888865517182c Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 14 Nov 2014 16:10:06 +0100
Subject: [PATCH] new dark theme 'nightsky'

---
 CHANGELOG                               |   1 +
 src/main/app/js/controllers.js          |   2 +-
 src/main/app/sass/app.scss              |   1 +
 src/main/app/sass/themes/_nightsky.scss | 109 ++++++++++++++++++++++++
 src/main/app/templates/_tags.html       |   4 +-
 src/main/app/templates/_toolbar.html    |   4 +-
 6 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 src/main/app/sass/themes/_nightsky.scss

diff --git a/CHANGELOG b/CHANGELOG
index 17a62e19..f9226cd0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 2.1.0
   - ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title, content, author or url.
   - ability to use !keyword or -keyword to exclude a keyword from a search query
   - facebook feeds now show user favicon instead of facebook favicon
+  - new dark theme 'nightsky'
 v 2.0.3
   - internet explorer ajax cache workaround
   - categories are now deletable again
diff --git a/src/main/app/js/controllers.js b/src/main/app/js/controllers.js
index 9eb1747d..aa360db3 100644
--- a/src/main/app/js/controllers.js
+++ b/src/main/app/js/controllers.js
@@ -1371,7 +1371,7 @@ module.controller('SettingsCtrl', ['$scope', '$location', 'SettingsService', 'An
 
 			$scope.langs = LangService.langs;
 
-			$scope.themes = ['default', 'bootstrap', 'dark', 'ebraminio', 'MRACHINI', 'svetla', 'third'];
+			$scope.themes = ['default', 'bootstrap', 'dark', 'ebraminio', 'MRACHINI', 'nightsky', 'svetla', 'third'];
 
 			$scope.settingsService = SettingsService;
 			$scope.$watch('settingsService.settings', function(value) {
diff --git a/src/main/app/sass/app.scss b/src/main/app/sass/app.scss
index aaa20831..bd30232f 100644
--- a/src/main/app/sass/app.scss
+++ b/src/main/app/sass/app.scss
@@ -17,6 +17,7 @@
 @import "themes/bootstrap";
 @import "themes/ebraminio";
 @import "themes/MRACHINI";
+@import "themes/nightsky";
 @import "themes/svetla";
 @import "themes/dark";
 @import "themes/third";
diff --git a/src/main/app/sass/themes/_nightsky.scss b/src/main/app/sass/themes/_nightsky.scss
new file mode 100644
index 00000000..0a46a34e
--- /dev/null
+++ b/src/main/app/sass/themes/_nightsky.scss
@@ -0,0 +1,109 @@
+#theme-nightsky {
+	a {
+	    color: #2A9FD6;
+	}
+	
+	.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
+	    color: #FFF;
+	    background-color: #2A9FD6;
+	}
+
+	body, .toolbar {
+	    color: #C6C6C6;
+	    background-color: #2F2F2F;
+	}
+	
+	.btn-default {
+		color: #C6C6C6;
+		background-color: #424242;
+		border-color: #424242;
+	}
+	
+	.btn-default:hover, .btn-default:focus, .btn-default.focus, .btn-default:active,
+		.btn-default.active, .open>.dropdown-toggle.btn-default {
+		background-color: #282828;
+		border-color: #232323;
+	}
+	
+	.css-treeview li .tree-item:hover {
+		background-color: #282828;
+	}
+	
+	.css-treeview .unread-counter {
+	    color: #C8C8C8;
+	}
+	
+	.css-treeview a {
+	    color: #C6C6C6;
+	}
+	
+	.css-treeview .selected {
+	    color: #C00;
+	}
+	
+	.entrylist-header {
+	    border-bottom: 1px solid #282828;
+	}
+	
+	#feed-accordion .entry {
+	    border-bottom: 1px solid #282828;
+	}
+	
+	#feed-accordion .entry-body .entry-title {
+	    font-weight: normal;
+	}
+	
+	#feed-accordion .unread .entry-heading .entry-name {
+	    font-weight: normal;
+	}
+	
+	#feed-accordion .unread .entry-heading {
+	    background-color: #444;
+	}
+	
+	#feed-accordion .entry-heading {
+	    background-color: #2F2F2F;
+	}
+	
+	#feed-accordion .unread .entry-heading:hover {
+		background-color: #2F2F2F;
+	}
+	
+	#feed-accordion .current.closed .entry-heading {
+	    background-color: #151515;
+	}
+	
+	#feed-accordion .entry-heading-link {
+	    color: #C6C6C6;
+	}
+	
+	#feed-accordion .entry-external-link {
+	    color: #C6C6C6;
+	}
+	
+	#feed-accordion .icon-star-empty {
+	    color: #C6C6C6;
+	}
+	
+	#feed-accordion .entry-heading .feed-name {
+	    color: #939393;
+	}
+	
+	#feed-accordion .entry-body-content {
+	    color: #C6C6C6;
+	}
+	
+	#feed-accordion .entry-buttons {
+	    background-color: #494949;
+	    border-top: 1px solid #282828;
+	}
+	
+	#feed-accordion .share-buttons a {
+	    color: #C6C6C6;
+	}
+	
+	#feed-accordion a.mark-up-to {
+	    color: #C6C6C6;
+	}
+}
+
diff --git a/src/main/app/templates/_tags.html b/src/main/app/templates/_tags.html
index 2c59e872..dd1d20e4 100644
--- a/src/main/app/templates/_tags.html
+++ b/src/main/app/templates/_tags.html
@@ -1,8 +1,8 @@
 <span>
-	<a ng-click="edit_mode=!edit_mode" class="nolink pointer">
+	<span ng-click="edit_mode=!edit_mode" class="nolink pointer">
 		<i class="icon-tags"></i>
 		{{ 'global.tags' | translate }}
-	</a>
+	</span>
 	<span ng-if="!edit_mode">
 		<span class="label label-info" ng-repeat="tag in entry.tags">{{tag}}</span>
 	</span>
diff --git a/src/main/app/templates/_toolbar.html b/src/main/app/templates/_toolbar.html
index e6ce7707..d59c3d8f 100644
--- a/src/main/app/templates/_toolbar.html
+++ b/src/main/app/templates/_toolbar.html
@@ -124,9 +124,9 @@
 					</form>
 				</div>
 				<div class="btn-group donate">
-					<a class="btn btn-success" type="button" ng-click="toHelp()" title="{{ 'toolbar.about' | translate }} / {{ 'toolbar.donate' | translate }}">
+					<button class="btn btn-success" type="button" ng-click="toHelp()" title="{{ 'toolbar.about' | translate }} / {{ 'toolbar.donate' | translate }}">
 						<i class="icon-info-sign"></i>
-					</a>
+					</button>
 				</div>
 
 			</div>