Merge branch 'dev' into beta

Conflicts:
	app/i18n/en.php
	app/i18n/fr.php

6 files changed, 127 insertions, 46 deletions

diff --git a/p/themes/Screwdriver/icons/favicon-16-32-48-64.ico b/p/themes/Screwdriver/icons/favicon-16-32-48-64.ico
new file mode 100644
index 000000000..7c5eb5517
--- /dev/null
+++ b/p/themes/Screwdriver/icons/favicon-16-32-48-64.ico
diff --git a/p/themes/Screwdriver/icons/favicon-256.png b/p/themes/Screwdriver/icons/favicon-256.png
new file mode 100644
index 000000000..235b18c97
--- /dev/null
+++ b/p/themes/Screwdriver/icons/favicon-256.png
diff --git a/p/themes/Screwdriver/icons/favicon.svg b/p/themes/Screwdriver/icons/favicon.svg
new file mode 100644
index 000000000..895a727bb
--- /dev/null
+++ b/p/themes/Screwdriver/icons/favicon.svg
@@ -0,0 +1,34 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linearGradient4149">
+<stop stop-color="#d18114" offset="0"/>
+<stop stop-color="#ed9514" offset="1"/>
+</linearGradient>
+<linearGradient id="linearGradient4155" y2="28.285" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="144.51" y1="28.285" x1="64.102"/>
+<linearGradient id="linearGradient4159" y2="-11.652" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="126.84" y1="69.532" x1="64.102"/>
+</defs>
+<g fill="#FFF" transform="matrix(1.7556028,0,0,1.7556028,2.4536682,156.92143)">
+<g transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g transform="translate(-4.1395349,-75.482558)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</g>
+<g fill="url(#linearGradient4155)" transform="matrix(1.7160619,0,0,1.7160619,5.3998589,23.251436)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g fill="#222" transform="matrix(1.7556028,0,0,1.7556028,-3.4937681,21.015289)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</svg>
diff --git a/p/themes/Screwdriver/icons/icon.svg b/p/themes/Screwdriver/icons/icon.svg
new file mode 100644
index 000000000..268814463
--- /dev/null
+++ b/p/themes/Screwdriver/icons/icon.svg
@@ -0,0 +1,34 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linearGradient4149">
+<stop stop-color="#d18114" offset="0"/>
+<stop stop-color="#ed9514" offset="1"/>
+</linearGradient>
+<linearGradient id="linearGradient4155" y2="28.285" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="144.51" y1="28.285" x1="64.102"/>
+<linearGradient id="linearGradient4159" y2="-11.652" xlink:href="#linearGradient4149" gradientUnits="userSpaceOnUse" x2="126.84" y1="69.532" x1="64.102"/>
+</defs>
+<g fill="#FFF" transform="matrix(0.40427237,0,0,0.40427237,0.65228897,36.70875)">
+<g transform="matrix(0.9774773,0,0,0.9774773,0.92631875,-74.208835)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g transform="translate(-4.1395349,-75.482558)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</g>
+<g fill="url(#linearGradient4155)" transform="matrix(0.39516706,0,0,0.39516706,1.3307246,5.9278164)">
+<path d="m64.102-11.469,0,14.25c36.018,0.0418,65.198,29.235,65.218,65.259h15.189c-0.46275-43.994-36.228-79.509-80.332-79.509-0.02635,0-0.05196-0.000025-0.0783,0z"/>
+<path d="m64.102,14.799,0,14.876c21.188,0.12639,38.346,17.217,38.639,38.365h15.581c-0.21-29.445-24.175-53.241-53.669-53.241-0.18468,0-0.36384-0.0019-0.54807,0z"/>
+</g>
+<g fill="#222" transform="matrix(0.40427237,0,0,0.40427237,-0.71726009,5.4128854)">
+<path d="M61.077,4.2013c-32.069,3.4709-57.062,30.537-57.188,63.5h11.906c-0.001-0.13569,0-0.27032,0-0.40625,0-26.472,19.725-48.306,45.281-51.656v-11.437z"/>
+<path d="m61.077,25.42c-20.105,3.4776-35.409,20.946-35.469,42.031h11.125c0.11711-14.724,10.509-27.002,24.344-30.062v-11.969z"/>
+<path d="m68.171,50.108c-9.502,0-17.188,7.6855-17.188,17.188,0,9.502,7.6855,17.219,17.188,17.219,9.502,0,17.219-7.7167,17.219-17.219,0-9.502-7.7167-17.188-17.219-17.188z"/>
+<path d="m98.14,74.17c-2.9607,13.954-15.281,24.445-30.094,24.562v11.656c0.12455,0.001,0.2502,0,0.375,0,21.41,0,39.173-15.697,42.344-36.219h-12.625z"/>
+<path d="m119.58,74.17c-3.3587,25.459-25.062,45.157-51.406,45.281v12.656c33.284-0.0636,60.6-25.457,63.719-57.938h-12.312z"/>
+</g>
+</svg>
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index b6c2e670e..8dbd2ec34 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -52,7 +52,7 @@ input, select, textarea {
 	color: #222;
 	line-height: 25px;
 	vertical-align: middle;
-	box-shadow: 0 2px 2px #eee inset, 0 1px #fff;
+	box-shadow: 0 1px 2px #ccc inset, 0 1px #fff;
 }
 option {
 	padding: 0 .5em;
@@ -121,30 +121,14 @@ form th {
 }
 
 /*=== Buttons */
-form#add_rss .stick input, .dropdown-menu select{
-    background:#393939;
-    box-shadow: 0 2px  2px #171717 inset,0 1px rgba(255,255,255,0.08);
-    border-left:solid 1px #171717;
-    border-top:solid 1px #171717;
-    border-bottom:solid 1px #171717;
-    border-right:none;
+
+.dropdown-menu .input select, .dropdown-menu .input input {
+    background:#444;
     color:#fff;
+    box-shadow:0 2px 2px #222 inset, 0px 1px rgba(255, 255, 255, 0.08);
+    border:solid 1px #171717;
 }
-form#add_rss .stick .btn{
-    background:linear-gradient(180deg, #222 0%, #171717 100%) #171717;
-    background: -webkit-linear-gradient(top, #222 0%, #171717 100%);
-    box-shadow:0 1px rgba(255,255,255,0.08), 0px 1px rgba(255, 255, 255, 0.08) inset;
-    border-right:solid 1px #171717;
-    border-top:solid 1px #171717;
-    border-bottom:solid 1px #171717;
-    border-left:none;
-}
-form#add_rss .stick .btn.dropdown-toggle{
-    border-right:solid 1px #171717;
-    border-top:solid 1px #171717;
-    border-bottom:solid 1px #171717;
-    border-left:solid 1px #171717;
-}
+
 .stick {
 	vertical-align: middle;
 	font-size: 0;
@@ -206,14 +190,13 @@ a.btn {
 	background: linear-gradient(180deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
 	background: -webkit-linear-gradient(top, #EDE7DE 0%, #FFF 100%);
 }
-#loginButton.btn{
-	border:none;
-	box-shadow: 0px 1px rgba(255, 255, 255, 0.08) inset,0 -1px #171717,0px 1px rgba(255, 255, 255, 0.08);
-}
+
 .nav_menu .btn.active, .nav_menu .btn:active, .nav_menu .dropdown-target:target ~ .btn.dropdown-toggle{
-	box-shadow: 0px 2px #E2972A;
-	border-radius: 0;
-	background:transparent;
+	box-shadow: 0 1px #fff;
+	border-radius: 4px;
+	background: linear-gradient(180deg, #EDE7DE 0%, #F6F6F6 100%) #EDE7DE;
+	background: -webkit-linear-gradient(top, #EDE7DE 0%, #F6F6F6 100%);
+	border: solid 1px #ccc;
 }
 .nav_menu .btn {
 	border: 0;
@@ -500,7 +483,8 @@ a.btn {
 /*=== Boxes */
 .box {
 	background: #EDE7DE;
-	border-radius: 4px 4px 0 0;
+	border-radius: 4px;
+	box-shadow: 0 1px #fff;
 }
 .box .box-title {
 	margin: 0;
@@ -575,6 +559,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	text-decoration: none;
 	color: #fff;
+	font-size: 0.92em;
 }
 .tree-folder-items > .item.active > a {
 }
@@ -593,7 +578,8 @@ a.btn {
 	text-align: center;
 }
 .header > .item.title .logo {
-	display: none;
+	height: 60px;
+	width: 60px;
 }
 .header > .item.title{
 	width: 250px;
@@ -603,9 +589,9 @@ a.btn {
 }
 .header > .item.title h1 a {
 	text-decoration: none;
-	font-size: 38px;
-	color:#ccc;
-	text-shadow: 0 1px #fff, 0 -1px rgba(162, 162, 162, 1);
+	font-size: 28px;
+	color:#222;
+	text-shadow: 0 1px #fff;
 }
 .header > .item.search input {
 	width: 230px;
@@ -681,11 +667,8 @@ a.btn {
 /*=== Prompt (centered) */
 .prompt {
 	text-align: center;
-	color: #FFF;
-	background: #222;
 	padding: 14px 0px;
-	box-shadow: 0px -1px #FFF, 0px 1px #FFF, 0px 2px 2px #171717 inset, 0px -2px 2px #171717 inset;
-	text-shadow: 0 -1px #171717, 0 1px rgba(255,255,255,0.08);
+	text-shadow: 0 1px rgba(255,255,255,0.08);
 }
 .prompt label {
 	text-align: left;
@@ -702,9 +685,9 @@ a.btn {
 	margin: 20px 0;
 }
 .prompt input#username,.prompt input#passwordPlain{
-	border:none;
-	box-shadow: 0px 1px rgba(255, 255, 255, 0.08) inset,0 -1px #171717,0px 1px rgba(255, 255, 255, 0.08);
-	background:#EDE7DE;
+	border:solid 1px #ccc;
+	box-shadow: 0 4px -4px #ccc inset,0px 1px rgba(255, 255, 255, 0.08);
+	background:#fff;
 }
 .prompt input#username:focus,.prompt input#passwordPlain:focus{
 	border: solid 1px #E7AB34;
@@ -734,7 +717,11 @@ a.btn {
 	padding: 0 10px;
 	font-style:italic;
 	line-height: 3em;
-	background: #fff;
+	box-shadow: 0 1px #BDB7AE inset, 0 -1px rgba(255,255,255,0.28) inset;
+	background: linear-gradient(0deg, #EDE7DE 0%, #C2BCB3 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #C2BCB3 0%, #FFF 100%);
+	color: #666;
+	text-shadow: 0 1px rgba(255,255,255,0.28);
 	text-align: center;
 }
 #new-article + .day {
@@ -748,10 +735,26 @@ a.btn {
 .nav_menu {
 	background: #EDE7DE;
 	border-bottom: 1px solid #ccc;
-	box-shadow:0 -1px #fff inset;
+	box-shadow:0 -1px rgba(255, 255, 255, 0.28) inset;
 	text-align: center;
 	padding: 5px 0;
 }
+#panel >.nav_menu{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+}
+#panel > .nav_menu > #nav_menu_read_all{
+	background: linear-gradient(0deg, #EDE7DE 0%, #FFF 100%) #EDE7DE;
+    background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #FFF 100%);
+	border-radius: 4px;
+	border: 1px solid #CCC;
+	box-shadow: 0px 1px #FFF;
+}
+#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
+	border-radius: 0 4px 4px 0;
+	border:none;
+	border-left: solid 1px #ccc;
+}
 
 /*=== Feed articles */
 .flux_content {
@@ -810,6 +813,7 @@ opacity: 1;
 	border-top: 1px solid #ddd;
 	font-size: 0.8rem;
 	cursor: pointer;
+	box-shadow: 0 -1px rgba(255,255,255,0.28) inset;
 }
 .flux_header .title {
 	font-size: 0.9rem;
@@ -917,6 +921,7 @@ opacity: 1;
 	text-shadow: 0 -1px 0 #aaa;
 	color: #666;
 	background: #EDE7DE;
+	box-shadow: 0 1px rgba(255,255,255,0.28)inset;
 }
 #bigMarkAsRead:hover {
 	color: #000;
@@ -956,9 +961,8 @@ opacity: 1;
 /*=== GLOBAL VIEW */
 /*================*/
 #stream.global {
-	background: #222;
 	padding: 24px 0;
-	box-shadow: 0 1px #fff, 0 -2px 2px #171717 inset, 0 2px 2px #171717 inset;
+	box-shadow: 0px 8px 8px #C2BCB3 inset;
 }
 
 .box.category .box-title {
@@ -1004,6 +1008,7 @@ opacity: 1;
 #panel {
 	box-shadow: 0px 0px 4px #000;
 	border-radius: 8px;
+	background:#EDE7DE;
 }
 /*=== DIVERS */
 /*===========*/
@@ -1084,6 +1089,14 @@ opacity: 1;
 	color: #eee;
 }
 
+#slider.active {
+    box-shadow: -4px 0 4px rgba(15, 15, 15, 0.55);
+    background: #F8F8F8;
+}
+#close-slider.active {
+    background: rgba(15, 15, 15, 0.35);
+}
+
 /*=== MOBILE */
 /*===========*/
 @media screen and (max-width: 840px) {
diff --git a/p/themes/Screwdriver/thumbs/original.png b/p/themes/Screwdriver/thumbs/original.png
new file mode 100644
index 000000000..ba9bacf90
--- /dev/null
+++ b/p/themes/Screwdriver/thumbs/original.png