Merge branch 'dev'

6 files changed, 156 insertions, 85 deletions

diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index e54a0eadd..f6577c645 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -354,13 +354,15 @@
 			font-size: 120%;
 		}
 			#stream.global .btn:not([data-unread="0"]) {
-				font-weight:bold;
+				background: #34495e;
+				color: #fff;
+				font-weight: bold;
 			}
 			#stream.global .btn:first-child:not([data-unread="0"]):after {
 				top: 0; right: 5px;
 				border: 0;
 				background: none;
-				color: #666;
+				color: #fff;
 				font-weight: bold;
 				box-shadow: none;
 			}
@@ -558,7 +560,7 @@
 	}
 
 /*** NOTIFICATION ***/
-.notification {
+#notification {
 	position: absolute;
 	top: 10px;
 	left: 25%; right: 25%;
@@ -570,32 +572,25 @@
 	box-shadow: 0 0 5px #666;
 	background: #1a1a1a;
 	color: #888;
+	border: 1px solid #f4f899;
 	font-weight: bold;
 	z-index: 10;
 }
-	.notification.good {
-		border:1px solid #f4f899;
-	}
-	.notification.bad {
-		border:1px solid #f4a899;
+	#notification.closed {
+		display: none;
 	}
-	.notification a.close {
+	#notification a.close {
+		position: absolute;
+		top: -10px; right: -10px;
 		display: inline-block;
 		width: 16px;
 		height: 16px;
-		float: right;
-		margin: -20px -20px 0 0;
 		padding: 5px;
 		background: #1a1a1a;
 		border-radius: 50px;
 		line-height: 16px;
-	}
-	.notification.good a.close{
 		border:1px solid #f4f899;
 	}
-	.notification.bad a.close{
-		border:1px solid #f4a899;
-	}
 
 .toggle_aside, .btn.toggle_aside {
 	display: none;
@@ -777,10 +772,25 @@ select.number option {
 		text-shadow: none;
 	}
 
-	.notification,
+	#notification,
 	.actualizeProgress {
-		left: 10px;
-		right: 10px;
+		top: 0;
+		left: 0;
+		right: 0;
+		border-radius: 0;
+		border: none;
+		border-bottom: 1px solid #f4f899;
+	}
+	#notification a.close {
+		left: 0; right: 0;
+		top: 0; bottom: 0;
+		width: auto;
+		height: auto;
+		background: transparent;
+		border: none;
+	}
+	#notification a.close .icon {
+		display: none;
 	}
 }
 
diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css
index f96f83fc8..e296f2188 100644
--- a/p/themes/Dark/global.css
+++ b/p/themes/Dark/global.css
@@ -407,6 +407,11 @@ input, select, textarea {
 				padding: 0 25px;
 				line-height: 30px;
 			}
+			.dropdown-menu > .item.share > a {
+				display: list-item;
+				list-style-position:inside;
+				list-style-type:decimal;
+			}
 			.dropdown-menu > .item:hover {
 				background: #26303F;
 				color: #888;
@@ -507,18 +512,20 @@ input, select, textarea {
 }
 
 /* Prompt (centré) */
-.prompt > h1, .prompt > p {
-	text-align:center;
-}
-.prompt > form {
-	margin:1em auto 2.5em auto;
-	width:10em;
-}
-.prompt .btn {
-	display:block;
-	margin:.5em auto;
-}
-.prompt input {
-	margin:.4em auto 1.1em auto;
-	width:99%;
+.prompt {
+	text-align: center;
 }
+	.prompt label {
+		text-align: left;
+	}
+	.prompt form {
+		margin: 1em auto 2.5em auto;
+		width: 10em;
+	}
+	.prompt input {
+		margin: .4em auto 1.1em auto;
+		width: 100%;
+	}
+	.prompt p {
+		margin: 20px 0;
+	}
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index 19f5967ea..1d551d8fb 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -350,13 +350,15 @@ body {
 			font-size: 120%;
 		}
 			#stream.global .btn:not([data-unread="0"]) {
-				font-weight:bold;
+				background: #3498db;
+				color: #fff;
+				font-weight: bold;
 			}
 			#stream.global .btn:first-child:not([data-unread="0"]):after {
 				top: 0; right: 5px;
 				border: 0;
 				background: none;
-				color: #333;
+				color: #fff;
 				font-weight: bold;
 				box-shadow: none;
 			}
@@ -561,7 +563,7 @@ body {
 	}
 
 /*** NOTIFICATION ***/
-.notification {
+#notification {
 	position: absolute;
 	top: 10px;
 	left: 25%; right: 25%;
@@ -575,28 +577,31 @@ body {
 	font-weight: bold;
 	z-index: 10;
 }
-	.notification.good {
+	#notification.closed {
+		display: none;
+	}
+	#notification.good {
 		background: #1abc9c;
 		color: #fff;
 	}
-	.notification.bad {
+	#notification.bad {
 		background: #e74c3c;
 		color: #fff;
 	}
-	.notification a.close {
+	#notification a.close {
+		position: absolute;
+		top: -6px; right: -6px;
 		display: inline-block;
 		width: 16px;
 		height: 16px;
-		float: right;
-		margin: -16px -16px 0 0;
 		padding: 5px;
 		border-radius: 3px;
 		line-height: 16px;
 	}
-		.notification.good a.close {
+		#notification.good a.close {
 			background: #1abc9c;
 		}
-		.notification.bad a.close {
+		#notification.bad a.close {
 			background: #e74c3c;
 		}
 
@@ -785,10 +790,25 @@ select.number option {
 		text-shadow: none;
 	}
 
-	.notification,
+	#notification,
 	.actualizeProgress {
-		left: 10px;
-		right: 10px;
+		top: 0;
+		left: 0;
+		right: 0;
+		border-radius: 0;
+	}
+	#notification a.close,
+	#notification.good a.close,
+	#notification.bad a.close {
+		left: 0; right: 0;
+		top: 0; bottom: 0;
+		width: auto;
+		height: auto;
+		background: transparent;
+		border: none;
+	}
+	#notification a.close .icon {
+		display: none;
 	}
 }
 
diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css
index e3baa26ab..4044dd781 100644
--- a/p/themes/Flat/global.css
+++ b/p/themes/Flat/global.css
@@ -403,6 +403,11 @@ input, select, textarea {
 				padding: 0 25px;
 				line-height: 30px;
 			}
+			.dropdown-menu > .item.share > a {
+				display: list-item;
+				list-style-position:inside;
+				list-style-type:decimal;
+			}
 			.dropdown-menu > .item:hover > a {
 				background: #2980b9;
 				color: #fff;
@@ -510,18 +515,20 @@ input, select, textarea {
 }
 
 /* Prompt (centré) */
-.prompt > h1, .prompt > p {
-	text-align:center;
-}
-.prompt > form {
-	margin:1em auto 2.5em auto;
-	width:10em;
-}
-.prompt .btn {
-	display:block;
-	margin:.5em auto;
-}
-.prompt input {
-	margin:.4em auto 1.1em auto;
-	width:99%;
+.prompt {
+	text-align: center;
 }
+	.prompt label {
+		text-align: left;
+	}
+	.prompt form {
+		margin: 1em auto 2.5em auto;
+		width: 10em;
+	}
+	.prompt input {
+		margin: .4em auto 1.1em auto;
+		width: 100%;
+	}
+	.prompt p {
+		margin: 20px 0;
+	}
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index 85a23140c..86bd508df 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -364,15 +364,19 @@
 			font-size: 120%;
 		}
 			#stream.global .btn:not([data-unread="0"]) {
-				font-weight:bold;
+				background: #0084CC;
+				color: #fff;
+				font-weight: bold;
+				text-shadow: none;
 			}
 			#stream.global .btn:first-child:not([data-unread="0"]):after {
 				top: 0; right: 5px;
 				border: 0;
 				background: none;
-				color: #666;
+				color: #fff;
 				font-weight: bold;
 				box-shadow: none;
+				text-shadow: none;
 			}
 		#stream.global .box-category .feeds {
 			display: block;
@@ -569,7 +573,7 @@
 	}
 
 /*** NOTIFICATION ***/
-.notification {
+#notification {
 	position: absolute;
 	top: 10px;
 	left: 25%; right: 25%;
@@ -584,18 +588,21 @@
 	font-weight: bold;
 	z-index: 10;
 }
-	.notification.good {
+	#notification.closed {
+		display: none;
+	}
+	#notification.good {
 		background: #f4f899;
 	}
-	.notification.bad {
+	#notification.bad {
 		background: #f4a899;
 	}
-	.notification a.close {
+	#notification a.close {
+		position: absolute;
+		top: -10px; right: -10px;
 		display: inline-block;
 		width: 16px;
 		height: 16px;
-		float: right;
-		margin: -20px -20px 0 0;
 		padding: 5px;
 		background: #fff;
 		border-radius: 50px;
@@ -783,10 +790,23 @@ select.number option {
 		text-shadow: none;
 	}
 
-	.notification,
+	#notification,
 	.actualizeProgress {
-		left: 10px;
-		right: 10px;
+		top: 0;
+		left: 0;
+		right: 0;
+		border-radius: 0;
+	}
+	#notification a.close {
+		left: 0; right: 0;
+		top: 0; bottom: 0;
+		width: auto;
+		height: auto;
+		background: transparent;
+		border: none;
+	}
+	#notification a.close .icon {
+		display: none;
 	}
 }
 
diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css
index 58a3a52b1..5792c9e4d 100644
--- a/p/themes/Origine/global.css
+++ b/p/themes/Origine/global.css
@@ -419,6 +419,11 @@ input, select, textarea {
 				padding: 0 25px;
 				line-height: 30px;
 			}
+			.dropdown-menu > .item.share > a {
+				display: list-item;
+				list-style-position:inside;
+				list-style-type:decimal;
+			}
 			.dropdown-menu > .item:hover {
 				background: #0062BE;
 				color: #fff;
@@ -523,18 +528,20 @@ input, select, textarea {
 }
 
 /* Prompt (centré) */
-.prompt > h1, .prompt > p {
-	text-align:center;
-}
-.prompt > form {
-	margin:1em auto 2.5em auto;
-	width:10em;
-}
-.prompt .btn {
-	display:block;
-	margin:.5em auto;
-}
-.prompt input {
-	margin:.4em auto 1.1em auto;
-	width:99%;
+.prompt {
+	text-align: center;
 }
+	.prompt label {
+		text-align: left;
+	}
+	.prompt form {
+		margin: 1em auto 2.5em auto;
+		width: 10em;
+	}
+	.prompt input {
+		margin: .4em auto 1.1em auto;
+		width: 100%;
+	}
+	.prompt p {
+		margin: 20px 0;
+	}