Merge branch 'dev' into beta

2 files changed, 111 insertions, 17 deletions

diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index 593f21d30..85a23140c 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -32,7 +32,6 @@
 			}
 		.header > .item.search input {
 			width: 230px;
-			transition: width 200ms linear;
 		}
 			.header .item.search input:focus {
 				width: 330px;
@@ -210,7 +209,7 @@
 	border-top: 1px solid #aaa;
 	border-bottom: 1px solid #aaa;
 }
-	.day:first-child {
+	#new-article + .day {
 		border-top: none;
 	}
 	.day .name {
@@ -230,6 +229,25 @@
 		text-align: right;
 	}
 
+#new-article {
+	display: none;
+	min-height: 40px;
+	background: #0084CC;
+	text-align: center;
+}
+	#new-article:hover {
+		background: #0066CC;
+	}
+	#new-article > a {
+		display: block;
+		line-height: 40px;
+		color: #fff;
+		font-weight: bold;
+	}
+		#new-article > a:hover {
+			text-decoration: none;
+		}
+
 .flux {
 	border-left: 3px solid #aaa;
 	background: #fafafa;
@@ -250,6 +268,10 @@
 		background: #fff;
 	}
 
+	.horizontal-list > .item:not(.title):not(.website) > a {
+		display: block;
+	}
+
 	.flux_header {
 		background: inherit;
 		height: 25px;
@@ -278,11 +300,6 @@
 		.flux .item.title {
 			background: inherit;
 		}
-		.flux:hover .item.title {
-			border-right: 2px solid rgba(127, 127, 127, 0.1);
-			padding-right: 1em;
-			position: absolute;
-		}
 			.flux .item.title a {
 				color: #000;
 				outline: none;
@@ -292,7 +309,7 @@
 				font-weight: bold;
 			}
 		.flux .item.date {
-			width: 200px;
+			width: 145px;
 			padding:0 5px 0 0;
 			text-align: right;
 			font-size: 10px;
@@ -657,6 +674,14 @@ select.number option {
 	text-align:right;
 }
 
+@media(min-width: 841px) {
+	.flux:not(.current):hover .item.title {
+		max-width: calc(100% - 580px);
+		padding-right: 1.5em;
+		position: absolute;
+	}
+}
+
 @media(max-width: 840px) {
 	.header,
 	.aside .btn-important,
@@ -677,11 +702,6 @@ select.number option {
 		display: block;
 	}
 
-	.content {
-		font-size: 120%;
-		padding: 0;
-	}
-
 	.pagination {
 		margin: 0 0 40px;
 	}
@@ -826,9 +846,9 @@ select.number option {
 	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
 }
 
-.header > .item.search input {
+input.extend {
 	-moz-transition: width 200ms linear;
-	 -webkit-transition: width 200ms linear;
+	-webkit-transition: width 200ms linear;
 	-o-transition: width 200ms linear;
 	-ms-transition: width 200ms linear;
 }
@@ -836,7 +856,7 @@ select.number option {
 @media(max-width: 840px) {
 	.aside {
 		-moz-transition: width 200ms linear;
-		 -webkit-transition: width 200ms linear;
+		-webkit-transition: width 200ms linear;
 		-o-transition: width 200ms linear;
 		-ms-transition: width 200ms linear;
 	}
@@ -878,3 +898,44 @@ select.number option {
 		text-decoration: underline;
 	}
 }
+
+.stat {
+	border:1px solid #aaa;
+	border-radius:10px;
+	box-shadow:2px 2px 5px #aaa;
+	margin:10px 0;
+	padding:0 5px;
+}
+.stat > h2 {
+	border-bottom:1px solid #aaa;
+	margin:0 -5px;
+	padding-left:5px;
+}
+.stat > div {
+	margin:5px 0;
+}
+.stat > table {
+	border-collapse:collapse;
+	margin:5px 0;
+	width:100%;
+}
+.stat > table > thead > tr {
+	border-bottom:2px solid #aaa;
+}
+.stat > table > tbody > tr {
+	border-bottom:1px solid #aaa;
+}
+.stat > table > tbody > tr:last-child {
+	border-bottom:0;
+}
+.stat > table th, .stat > table td {
+	border-left:2px solid #aaa;
+	padding:5px;
+}
+.stat > table th:first-child, .stat > table td:first-child {
+	border-left:0;
+}
+.stat > table td.numeric{
+	margin:5px 0;
+	text-align:center;
+}
\ No newline at end of file
diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css
index 23e190330..58a3a52b1 100644
--- a/p/themes/Origine/global.css
+++ b/p/themes/Origine/global.css
@@ -86,6 +86,13 @@ label {
 	line-height: 25px;
 	cursor: pointer;
 }
+input {
+	width: 180px;
+}
+textarea {
+	width: 360px;
+	height: 100px;
+}
 input, select, textarea {
 	display: inline-block;
 	max-width: 100%;
@@ -116,6 +123,10 @@ input, select, textarea {
 		border-color: red;
 		box-shadow: 0 0 2px 1px red;
 	}
+	input:focus.extend {
+		width: 300px;
+		transition: width 200ms linear;
+	}
 
 .form-group {
 	margin: 0;
@@ -179,8 +190,13 @@ input, select, textarea {
 	}
 	.stick .btn + .btn,
 	.stick .btn + input,
+	.stick .btn + .dropdown > .btn,
 	.stick input + .btn,
-	.stick input + input {
+	.stick input + input,
+	.stick input + .dropdown > .btn,
+	.stick .dropdown + .btn,
+	.stick .dropdown + input,
+	.stick .dropdown + .dropdown > .btn {
 		border-left: none;
 	}
 	.stick input + .btn {
@@ -505,3 +521,20 @@ input, select, textarea {
 	vertical-align: middle;
 	line-height: 16px;
 }
+
+/* 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%;
+}