Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

3 files changed, 83 insertions, 7 deletions

diff --git a/themes/courgette/css/.DS_Store b/themes/courgette/css/.DS_Store
deleted file mode 100644
index c788a093..00000000
--- a/themes/courgette/css/.DS_Store
+++ /dev/null
diff --git a/themes/courgette/css/font.css b/themes/courgette/css/font.css
index 7c16cce4..849ff85b 100755
--- a/themes/courgette/css/font.css
+++ b/themes/courgette/css/font.css
@@ -7,4 +7,16 @@
        url('../font/fontello.svg?97381924#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
-}
\ No newline at end of file
+}
+
+@font-face {
+  font-family: 'icomoon';
+  src:url('../font/icomoon.eot?-72nnzw');
+  src:url('../font/icomoon.eot?#iefix-72nnzw') format('embedded-opentype'),
+    url('../font/icomoon.woff?-72nnzw') format('woff'),
+    url('../font/comoon.ttf?-72nnzw') format('truetype'),
+    url('../font/icomoon.svg?-72nnzw#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
diff --git a/themes/courgette/css/style.css b/themes/courgette/css/style.css
index 2ba16b71..edd09c78 100755
--- a/themes/courgette/css/style.css
+++ b/themes/courgette/css/style.css
@@ -157,6 +157,8 @@ h1 a {
   transition-delay:1.55ms;
 }
 
+#article_toolbar li:nth-child(2) { display: none; }
+
 #menu:before {
   content: "\e801";
   display: block;
@@ -299,7 +301,7 @@ ul li {
   color:#000;
 }
 
-.tools a:before { display: block; font-family: 'fontello'; }
+.tools a:before { display: block; font-family: 'icomoon'; }
 
 
 .fav-off:before, .fav:before { content: '\e805'; } /* '' */
@@ -308,13 +310,13 @@ ul li {
   background: #FFF;
   color:#000;
 }
-.link:before { content: '\e800'; } /* '' */
-.delete:before { content: '\e803'; } /* '' */
-.reading-time:before { content: '\e802'; } /* '' */
+.link:before { content: '\e801'; } /* '' */
+.delete:before { content: '\e80c'; } /* '' */
+.reading-time:before { content: '\e803'; } /* '' */
 
 #article_toolbar a:before {
   display: block;
-  font-family: 'fontello'; 
+  font-family: 'icomoon'; 
 }
 
 #article_toolbar a {
@@ -343,7 +345,8 @@ ul li {
 .email:before { content: '\e80a'; } /* '' */
 .icon-check:before { content: '\e804'; } /* '' */
 .back:before { content: '\e806'; } /* '' */
-.bad-display:before { content: '\e808'; } /* '' */
+.flattr:before { content: '\e800'; } /* '' */
+.bad-display:before { content: '\e600'; } /* '' */
 .twitter:before { content: '\e807'; } /* '' */
 
 #article_toolbar .flattrli {
@@ -618,3 +621,64 @@ form button:hover, form button:focus, form input[type="submit"]:hover, form inpu
     position:static;
   }
 }
+
+
+.w600p {
+  width: 70%;
+  margin: auto;
+}
+
+.tagForm {
+  margin: 1em 0;
+}
+
+.tagForm p {
+  font-style: italic;
+  margin: 0;
+  font-size: 0.8em;
+  color: #999;
+}
+
+.tagForm label {
+  width: auto;
+  margin-right: 1em;
+}
+
+.back:before {
+  font-family: "icomoon";
+}
+
+.back.link {
+  color: #000;
+  text-decoration: none;
+}
+
+.back.link:before {
+  margin-right: 0.5em;
+}
+
+.tag-list a {
+  color: #000;
+  text-decoration: none;
+}
+
+.tag-list li {
+  display: inline-block;
+  margin-right: 1em;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+.tag {
+  background: #000;
+  color: #FFF;
+  padding: 0.5em 1em;
+  text-decoration: none;
+}
+
+.tag:hover, .tag:focus {
+  background: #FFF;
+  color: #000;
+}
\ No newline at end of file