diff --git a/README.md b/README.md index 60e8a2b..abe1fad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [![WikiPadia](http://res.cloudinary.com/rowanhogan/image/upload/c_scale,w_240/v1442544833/logo_sadlam.png)](http://wikipadia.xyz) +# [![WikiPadia](https://res.cloudinary.com/rowanhogan/image/upload/c_scale,w_400/v1442937094/logo-01_indiff.png)](http://wikipadia.xyz) _WikiPadia_ is a beautiful, customisable Wikipedia reader. It was specifically built for leisurely, late-night reading on an iPad. diff --git a/app/images/app-icons/apple-touch-icon-114x114.png b/app/images/app-icons/apple-touch-icon-114x114.png index 78b0647..65d8f9d 100644 Binary files a/app/images/app-icons/apple-touch-icon-114x114.png and b/app/images/app-icons/apple-touch-icon-114x114.png differ diff --git a/app/images/app-icons/apple-touch-icon-120x120.png b/app/images/app-icons/apple-touch-icon-120x120.png index 7fef3c7..c729784 100644 Binary files a/app/images/app-icons/apple-touch-icon-120x120.png and b/app/images/app-icons/apple-touch-icon-120x120.png differ diff --git a/app/images/app-icons/apple-touch-icon-144x144.png b/app/images/app-icons/apple-touch-icon-144x144.png index 61a0a74..2a7e7a0 100644 Binary files a/app/images/app-icons/apple-touch-icon-144x144.png and b/app/images/app-icons/apple-touch-icon-144x144.png differ diff --git a/app/images/app-icons/apple-touch-icon-152x152.png b/app/images/app-icons/apple-touch-icon-152x152.png index ac0b48f..d873a55 100644 Binary files a/app/images/app-icons/apple-touch-icon-152x152.png and b/app/images/app-icons/apple-touch-icon-152x152.png differ diff --git a/app/images/app-icons/apple-touch-icon-180x180.png b/app/images/app-icons/apple-touch-icon-180x180.png index ac024f2..8f2b14f 100644 Binary files a/app/images/app-icons/apple-touch-icon-180x180.png and b/app/images/app-icons/apple-touch-icon-180x180.png differ diff --git a/app/images/app-icons/apple-touch-icon-57x57.png b/app/images/app-icons/apple-touch-icon-57x57.png index ddf15ef..695563f 100644 Binary files a/app/images/app-icons/apple-touch-icon-57x57.png and b/app/images/app-icons/apple-touch-icon-57x57.png differ diff --git a/app/images/app-icons/apple-touch-icon-60x60.png b/app/images/app-icons/apple-touch-icon-60x60.png index 50b7b9d..4fed6ec 100644 Binary files a/app/images/app-icons/apple-touch-icon-60x60.png and b/app/images/app-icons/apple-touch-icon-60x60.png differ diff --git a/app/images/app-icons/apple-touch-icon-72x72.png b/app/images/app-icons/apple-touch-icon-72x72.png index b7c40e4..e20c11a 100644 Binary files a/app/images/app-icons/apple-touch-icon-72x72.png and b/app/images/app-icons/apple-touch-icon-72x72.png differ diff --git a/app/images/app-icons/apple-touch-icon-76x76.png b/app/images/app-icons/apple-touch-icon-76x76.png index ec08787..74dde78 100644 Binary files a/app/images/app-icons/apple-touch-icon-76x76.png and b/app/images/app-icons/apple-touch-icon-76x76.png differ diff --git a/app/images/favicon.ico b/app/images/favicon.ico index 845fa4e..d8f4ea0 100644 Binary files a/app/images/favicon.ico and b/app/images/favicon.ico differ diff --git a/app/images/logo.svg b/app/images/logo.svg deleted file mode 100644 index f69f2d2..0000000 --- a/app/images/logo.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/index.html b/app/index.html index b67d6c9..8d54db0 100644 --- a/app/index.html +++ b/app/index.html @@ -56,7 +56,7 @@

Options

-

WikiPadia

+

WikiPadia

diff --git a/app/scripts/app.js b/app/scripts/app.js index 79839e2..5ccd9ca 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -1,6 +1,5 @@ -var $ = require('jquery'); -var bigSlide = require('../../node_modules/bigslide/dist/bigSlide.js'); +var attachFastClick = require('fastclick'); var handleNewPage = require('./components/handleNewPage'); var handleTheme = require('./components/handleTheme'); var eventHandlers = require('./components/eventHandlers') @@ -11,7 +10,9 @@ if (window.location.hostname.split('.').length > 2) { var lang = 'en'; } -$(function() { +(function() { + attachFastClick(document.body); + var htmlEl = document.body.parentElement; if (window.location.search.length) { @@ -29,12 +30,8 @@ $(function() { if (localStorage.getItem('customStyles')) { var styles = localStorage.getItem('customStyles'); - document.getElementById('custom-styles').innerHTML(styles); + document.getElementById('custom-styles').innerHTML = styles; document.getElementById('custom-styles-input').value = styles; } - $('.menu-link').bigSlide({ - side: 'right', - menuWidth: '22em' - }); -}); +})(); diff --git a/app/scripts/components/eventHandlers.js b/app/scripts/components/eventHandlers.js index 5bd6a91..5a5fcc5 100644 --- a/app/scripts/components/eventHandlers.js +++ b/app/scripts/components/eventHandlers.js @@ -21,3 +21,12 @@ $(document).on('change', '#theme-changer', function(e) { var theme = $(this).val(); handleTheme(theme); }); + +$(document).on('click', '#menu-toggle', function(e) { + e.preventDefault(); + + $(this).toggleClass('active'); + $('body').toggleClass('sidebar-active'); +}); + + diff --git a/app/styles/_app.scss b/app/styles/_app.scss index a40530f..5d51bec 100644 --- a/app/styles/_app.scss +++ b/app/styles/_app.scss @@ -1,4 +1,3 @@ - .logo { margin: .5em 0 .75em; line-height: 1em; @@ -17,7 +16,6 @@ color: #222; font-style: normal; } - } input, textarea, button, select { @@ -130,6 +128,14 @@ textarea { z-index: 100; max-width: 100%; overflow: auto; + display: none; + position: fixed; + top: 0; + right: 0; + bottom: 0; + width: $sidebar-width; + max-width: 100%; + transform: translateX($sidebar-width); h3 { margin-top: 0; @@ -162,6 +168,24 @@ textarea { input, button, select { border: 0; } + + @media screen { + display: block; + } +} + +#menu, .push { + transition: transform 300ms ease; +} + +.sidebar-active { + #menu { + transform: translateX(0); + } + + .push { + transform: translateX(-#{$sidebar-width}); + } } .search-form { diff --git a/app/styles/style.scss b/app/styles/style.scss index 0f25822..9c4fd15 100644 --- a/app/styles/style.scss +++ b/app/styles/style.scss @@ -2,6 +2,8 @@ $serif-stack: "Cardo", "Crimson Text", "PT Serif", "Lora", serif; $sans-stack: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; +$sidebar-width: 18em; + @import "default"; @import "content"; @import "app"; diff --git a/package.json b/package.json index 28a8ce4..d0f7689 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "vinyl-source-stream": "^1.1.0" }, "dependencies": { - "bigslide": "^0.9.1", "fastclick": "^1.0.6", "jquery": "^2.1.4" }