diff --git a/css/entypo.woff b/css/entypo.woff new file mode 100644 index 0000000..e744a79 Binary files /dev/null and b/css/entypo.woff differ diff --git a/css/screen.css b/css/screen.css index ccdfe2d..a678b33 100644 --- a/css/screen.css +++ b/css/screen.css @@ -1,3 +1,8 @@ +@font-face { + font-family: Entypo; + src: url(entypo.woff); +} + html, body { margin: 0; padding: 0; @@ -38,6 +43,10 @@ a { font-size: 1em; } +.icon { + font-family: "Entypo"; +} + header .button, footer .button, .button.small { width: auto; display: inline-block; @@ -178,13 +187,13 @@ canvas { .yellow #list li { border-bottom: 1px solid #f39c12; } #list li:after { - content: "›"; + content: ""; position: absolute; right: 10px; top: 0.1em; font-weight: 100; font-size: 3em; - font-family: "Open Sans"; + font-family: "Entypo"; } .red #list li:after { color: #c0392b; } @@ -219,19 +228,10 @@ canvas { height: 2.5em; } -.button.icon { - line-height: 0.52; - font-size: 2em; +.icon { + line-height: 0.4; + font-size: 3em; vertical-align: bottom; - padding-top: 0.35em; -} - -.button.icon2 { - line-height: 1.05; -} - -.button.icon.previous, .button.icon.next { - padding-top: 0.5em; } #full h1 { @@ -335,16 +335,22 @@ canvas { } #settings .version { - font-style: italic; + padding-top: 1em; + text-align: center; +} + +#settings .icons { + text-align: center; } #settings .font-size { text-align: right; } -#settings .font-size span { +#settings .font-size > span { float: left; - line-height: 2.4; + padding: 10px 0; + vertical-align: middle; } #settings .button.small { diff --git a/index.html b/index.html index 5b48500..6993bd5 100644 --- a/index.html +++ b/index.html @@ -21,31 +21,32 @@
- ☰ +
@@ -80,9 +81,9 @@
- ☰ - ○ - ☆ + + 📥 + ☆
@@ -97,8 +98,8 @@
diff --git a/js/App.js b/js/App.js index cf7b444..a7ce912 100644 --- a/js/App.js +++ b/js/App.js @@ -130,7 +130,7 @@ App.prototype.setColor = function(color) { App.prototype.reload = function() { this.unread_articles = []; - $("#all-read").innerHTML = "●"; + $("#all-read").innerHTML = "📥"; this.ttrss.getUnreadFeeds(this.gotUnreadFeeds.bind(this)); }; @@ -201,6 +201,12 @@ App.prototype.updateList = function() { } }, this); + if(unread > 0) { + $("#all-read").innerHTML = "📥"; + } else { + $("#all-read").innerHTML = "📤"; + } + this.updatePieChart(); }; @@ -265,15 +271,15 @@ App.prototype.showFull = function(article, slide_back) { $(page_id + " .article").innerHTML = article.content; if(article.set_unread) { - $("#setunread").innerHTML = "●"; + $("#setunread").innerHTML = "📤"; } else { - $("#setunread").innerHTML = "○"; + $("#setunread").innerHTML = "📥"; } if(article.marked) { - $("#setstarred").innerHTML = "★"; + $("#setstarred").innerHTML = "★"; } else { - $("#setstarred").innerHTML = "☆"; + $("#setstarred").innerHTML = "☆"; } }; @@ -321,12 +327,12 @@ App.prototype.setCurrentUnread = function() { this.updateList(); this.ttrss.setArticleUnread(article.id); - $("#setunread").innerHTML = "●"; + $("#setunread").innerHTML = "📤"; }; App.prototype.toggleAllRead = function() { - if($("#all-read").innerHTML == "●") { // set all read + if($("#all-read").innerHTML == "📥") { // set all read var ids = []; for (var i = 0; i < this.unread_articles.length; i++) { @@ -335,7 +341,7 @@ App.prototype.toggleAllRead = function() { article.set_unread = false; ids.push(article.id); } - $("#all-read").innerHTML = "○"; + $("#all-read").innerHTML = "📤"; this.updateList(); @@ -350,7 +356,7 @@ App.prototype.toggleAllRead = function() { article.set_unread = false; ids.push(article.id); } - $("#all-read").innerHTML = "●"; + $("#all-read").innerHTML = "📥"; this.updateList(); this.ttrss.setArticleUnread(ids.join(",")); @@ -366,13 +372,13 @@ App.prototype.toggleStarred = function() { article.marked = true; this.updateList(); this.ttrss.setArticleStarred(article.id); - $("#setstarred").innerHTML = "★"; + $("#setstarred").innerHTML = "★"; } else { article.marked = false; this.updateList(); this.ttrss.setArticleUnStarred(article.id); - $("#setstarred").innerHTML = "☆"; + $("#setstarred").innerHTML = "☆"; } }; diff --git a/manifest.webapp b/manifest.webapp index d5817d3..2149404 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -19,5 +19,5 @@ } }, "installs_allowed_from": ["*"], - "version": "0.2.2" + "version": "0.3.0" } \ No newline at end of file