diff --git a/Gemfile.lock b/Gemfile.lock index b558d3dd..b33b539a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM aws-sdk-v1 (1.66.0) json (~> 1.4) nokogiri (>= 1.4.4) - babel-source (5.8.24) + babel-source (5.8.26) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) @@ -123,7 +123,7 @@ GEM hashie (3.4.2) i18n (0.7.0) ice_nine (0.11.1) - jbuilder (2.3.1) + jbuilder (2.3.2) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (4.0.5) @@ -150,14 +150,14 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - migration_data (0.0.4) + migration_data (0.1.0) rails (>= 4.0.0.rc1) mime-types (2.6.2) mimemagic (0.3.0) mini_portile (0.6.2) - minitest (5.8.0) + minitest (5.8.1) multi_json (1.11.2) - newrelic_rpm (3.13.0.299) + newrelic_rpm (3.13.2.302) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) oauth (0.4.7) @@ -181,15 +181,15 @@ GEM ast (>= 1.1, < 3.0) pg (0.18.3) possessive (1.0.1) - postmark (1.6.0) + postmark (1.7.0) json rake - postmark-rails (0.11.0) + postmark-rails (0.12.0) actionmailer (>= 3.0.0) - postmark (~> 1.6.0) + postmark (~> 1.7.0) private_attr (1.1.0) procto (0.0.2) - pry (0.10.1) + pry (0.10.2) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -247,15 +247,15 @@ GEM rainbow (2.0.0) raindrops (0.15.0) rake (10.4.2) - react-rails (1.3.0) + react-rails (1.3.1) babel-transpiler (>= 0.7.0) coffee-script-source (~> 1.8) connection_pool execjs rails (>= 3.2) tilt - redcarpet (3.3.2) - reek (3.4.0) + redcarpet (3.3.3) + reek (3.5.0) parser (~> 2.2.2.5) private_attr (~> 1.1) rainbow (~> 2.0) @@ -305,8 +305,8 @@ GEM thin (~> 1.5.0) slop (3.6.0) spring (1.4.0) - sprockets (3.3.4) - rack (~> 1.0) + sprockets (3.3.5) + rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss index 40f543bd..abe2b961 100644 --- a/app/assets/stylesheets/footer.scss +++ b/app/assets/stylesheets/footer.scss @@ -45,6 +45,13 @@ min-width: auto; width: 100%; } + + /* Styles for the ImageHex logo in the footer */ + img { + opacity: 0.7; + height: 45px; + pointer-events: none; + } } /* First column in the footer for the description, copyright, etc. */ diff --git a/app/assets/stylesheets/frontpage.scss b/app/assets/stylesheets/frontpage.scss index 5e051148..80a5c67a 100644 --- a/app/assets/stylesheets/frontpage.scss +++ b/app/assets/stylesheets/frontpage.scss @@ -23,6 +23,16 @@ flex-flow: row wrap; } +#frontpage-logo { + width: 100%; + + img { + margin: auto; + height: 75px; + pointer-events: none; + } +} + .subscription-image { width: auto; display: inline-block; diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index 31d1a440..388ad7ee 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -41,6 +41,16 @@ top: 16px; left: 20px; } + + #header-browse { + position: absolute; + left: 390px; + top: 0; + + @media all and (max-device-width: $mobile-width) { + display: none; + } + } } .imagehex-header-logo { @@ -48,14 +58,20 @@ height: 40px; position: absolute; top: 0; - background: url("/logo/imagehex-grayscale-blackbg-with-no-text.svg") 50% 50% / 85% 85% no-repeat; + background: url("/logo/imagehex-white.svg") 50% 50% / 75% 75% no-repeat; + opacity: 0.75; + transition: 200ms opacity; + + &:hover { + opacity: 1; + } @media all and (max-device-width: $mobile-width) { width: 50px; height: 50px; top: -12px; left: 0; - background: url("/logo/imagehex-grayscale-blackbg-with-no-text.svg") 0% 0% / 85% 85% no-repeat; + background: url("/logo/imagehex-white.svg") 0% 0% / 75% 75% no-repeat; } } diff --git a/app/assets/stylesheets/rules.scss b/app/assets/stylesheets/rules.scss index 0115b69a..9a05e54a 100644 --- a/app/assets/stylesheets/rules.scss +++ b/app/assets/stylesheets/rules.scss @@ -1,22 +1,28 @@ -#rules{ +@import "scss-variables"; + +#rules { padding-top: 2.5%; padding-right: 15%; padding-left: 15%; padding-bottom: 2.5%; - h1{ + + h1 { font-weight: normal; font-size: 4.0rem; padding-bottom: 0.75rem; } - h2{ + + h2 { font-weight: normal; font-size: 2.0rem; } - h3{ + + h3 { font-weight: normal; font-size: 1.5rem; } - li{ + + li { padding-left: 20px; } } diff --git a/app/assets/stylesheets/signin.scss b/app/assets/stylesheets/signin.scss index 699dbe05..1faef6cb 100644 --- a/app/assets/stylesheets/signin.scss +++ b/app/assets/stylesheets/signin.scss @@ -16,7 +16,7 @@ margin: 30px auto; img { - width: 200px; + width: 300px; pointer-events: none; margin: auto; } diff --git a/app/controllers/frontpage_controller.rb b/app/controllers/frontpage_controller.rb index 994c8fc6..95c25b44 100644 --- a/app/controllers/frontpage_controller.rb +++ b/app/controllers/frontpage_controller.rb @@ -12,6 +12,10 @@ def index @images = current_user.image_feed.paginate(page: page, per_page: per_page) render "index_with_user" else + @images = Image + .paginate(page: page, per_page: per_page) + .order('created_at DESC') + .for_content(content_pref) render "index" end end diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 702c4742..a62bf707 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,7 +1,7 @@
- +

<%= t(".email_confirmation") %>

@@ -21,4 +21,4 @@
<%= render "devise/shared/links" %> -
\ No newline at end of file +
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index b7f17c29..0ee9ed35 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -3,7 +3,7 @@
- +

<%= t(".forgot_your_password?") %>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 36fbf618..8e964326 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -3,7 +3,7 @@
@@ -35,4 +35,4 @@
<%= render "devise/shared/links" %> -
\ No newline at end of file +
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index bf48aefb..8353b3d6 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -3,7 +3,7 @@
@@ -33,4 +33,4 @@
<%= render "devise/shared/links" %> -
\ No newline at end of file +
diff --git a/app/views/frontpage/index.html.erb b/app/views/frontpage/index.html.erb index 7dc83557..d630a20c 100644 --- a/app/views/frontpage/index.html.erb +++ b/app/views/frontpage/index.html.erb @@ -1,7 +1,9 @@ <%# This space intentionally left blank. No title needed for the home page. %>
-

ImageHex

- - Images + + + <%= render 'images/show_stub' %>
diff --git a/app/views/frontpage/index_with_user.html.erb b/app/views/frontpage/index_with_user.html.erb index bdf9959e..0997d541 100644 --- a/app/views/frontpage/index_with_user.html.erb +++ b/app/views/frontpage/index_with_user.html.erb @@ -1,9 +1,8 @@ <%# This space intentionally left blank. No title needed for the home page. %>
-

ImageHex

- - Images -
+ Create a new collection
diff --git a/app/views/images/index.html.erb b/app/views/images/index.html.erb index f95bce25..314e28c4 100644 --- a/app/views/images/index.html.erb +++ b/app/views/images/index.html.erb @@ -1,4 +1,3 @@
-

All images

<%= render 'show_stub' %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 49bf1c05..4224f103 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -3,7 +3,7 @@ <%# ImageHex description text %>
-

<%= t(".imagehex") %> + <%= t(">

<%= t(".imagehex_description") %>

<%= t(".imagehex_copyright") %>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 6f5b00cd..365353f5 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -6,6 +6,10 @@ <% end %>
+ +
+ <%= link_to t(".browse"), images_path %> +
<%# Search icon that opens a mobile-specific, fullscreen search dialog. %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0ba5d082..09c612f8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,11 +24,17 @@ <%# Favicon %> - + <%# 16px and 32px .ico favicons %> + <%# SVG favicon %> + + + <%# Safari pinned tab icon %> + + <%# 16px and 32px favicons, just in case someone is using some absurdly old browser. %> diff --git a/app/views/static_stuff/about.html.erb b/app/views/static_stuff/about.html.erb index 087db02a..89bdcb4b 100644 --- a/app/views/static_stuff/about.html.erb +++ b/app/views/static_stuff/about.html.erb @@ -4,7 +4,7 @@
@@ -19,4 +19,4 @@

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Donec ullamcorper nulla non metus auctor fringilla. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas faucibus mollis interdum.

-
\ No newline at end of file + diff --git a/config/locales/en/frontpage.en.yml b/config/locales/en/frontpage.en.yml new file mode 100644 index 00000000..e1c27778 --- /dev/null +++ b/config/locales/en/frontpage.en.yml @@ -0,0 +1,8 @@ +# Frontpage strings. + +en: + frontpage: + index: + imagehex: "ImageHex" + index_with_user: + imagehex: "ImageHex" diff --git a/config/locales/en/layouts.en.yml b/config/locales/en/layouts.en.yml index 3de84254..86f4984c 100644 --- a/config/locales/en/layouts.en.yml +++ b/config/locales/en/layouts.en.yml @@ -10,6 +10,7 @@ en: home: "Home" search: "Search" search_suggestions_note: "Search for the tag you're looking for, suggestions will show up here." + browse: "Browse" sign_in: "Sign in" create_an_account: "Create an account" upload: "Upload" @@ -20,7 +21,7 @@ en: footer: imagehex: "ImageHex" imagehex_description: "ImageHex is a place to search, share, and commission images and other artwork. We endeavour to be the best directory of images on the internet." - imagehex_copyright: "© 2015 #noided Media" + imagehex_copyright: "© 2015 Noided Media" company: "Company" about: "About" people: "People" @@ -30,4 +31,4 @@ en: help: "Help" press: "Press" status: "Status" - api: "API" \ No newline at end of file + api: "API" diff --git a/config/locales/nv/frontpage.nv.yml b/config/locales/nv/frontpage.nv.yml new file mode 100644 index 00000000..6c4b1dd0 --- /dev/null +++ b/config/locales/nv/frontpage.nv.yml @@ -0,0 +1,8 @@ +# Frontpage strings. + +nv: + frontpage: + index: + imagehex: "ImageHex" + index_with_user: + imagehex: "ImageHex" diff --git a/public/404.html b/public/404.html index d81353b5..b451d6f8 100644 --- a/public/404.html +++ b/public/404.html @@ -69,7 +69,7 @@ } .imagehex-logo { - background: url("logo/imagehex-color-with-no-text.svg") 0 / 100px no-repeat; + background: url("logo/imagehex-color.svg") 0 / 100px no-repeat; width: 100px; height: 100px; margin: auto; diff --git a/public/favicon-120-mobile.png b/public/favicon-120-mobile.png index aeb6644a..18cfb578 100644 Binary files a/public/favicon-120-mobile.png and b/public/favicon-120-mobile.png differ diff --git a/public/favicon-152.png b/public/favicon-152.png index 1d81c4d6..32eb24aa 100644 Binary files a/public/favicon-152.png and b/public/favicon-152.png differ diff --git a/public/favicon-16.png b/public/favicon-16.png old mode 100755 new mode 100644 index 82ed239e..fde3af4c Binary files a/public/favicon-16.png and b/public/favicon-16.png differ diff --git a/public/favicon-32.png b/public/favicon-32.png old mode 100755 new mode 100644 index 80e80c9f..0b70ac1b Binary files a/public/favicon-32.png and b/public/favicon-32.png differ diff --git a/public/favicon-64.png b/public/favicon-64.png index bad5ad05..897289b9 100644 Binary files a/public/favicon-64.png and b/public/favicon-64.png differ diff --git a/public/favicon-grayscale.svg b/public/favicon-grayscale.svg new file mode 100644 index 00000000..5574c686 --- /dev/null +++ b/public/favicon-grayscale.svg @@ -0,0 +1,6 @@ + + + diff --git a/public/favicon.ico b/public/favicon.ico index 3bf91faa..92c81185 100755 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 00000000..23c45024 --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/public/logo/imagehex-black-text.svg b/public/logo/imagehex-black-text.svg new file mode 100644 index 00000000..2b6b09ac --- /dev/null +++ b/public/logo/imagehex-black-text.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/public/logo/imagehex-black.svg b/public/logo/imagehex-black.svg new file mode 100644 index 00000000..b43ce81a --- /dev/null +++ b/public/logo/imagehex-black.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/public/logo/imagehex-color-black-text.svg b/public/logo/imagehex-color-black-text.svg new file mode 100644 index 00000000..55933197 --- /dev/null +++ b/public/logo/imagehex-color-black-text.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/public/logo/imagehex-color-white-text.svg b/public/logo/imagehex-color-white-text.svg new file mode 100644 index 00000000..913c4810 --- /dev/null +++ b/public/logo/imagehex-color-white-text.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/public/logo/imagehex-color-with-black-text.svg b/public/logo/imagehex-color-with-black-text.svg deleted file mode 100644 index a0b553c7..00000000 --- a/public/logo/imagehex-color-with-black-text.svg +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/logo/imagehex-color-with-no-text.svg b/public/logo/imagehex-color-with-no-text.svg deleted file mode 100644 index ed8a877f..00000000 --- a/public/logo/imagehex-color-with-no-text.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/logo/imagehex-color-with-white-text.svg b/public/logo/imagehex-color-with-white-text.svg deleted file mode 100644 index 438c2c78..00000000 --- a/public/logo/imagehex-color-with-white-text.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/logo/imagehex-color.svg b/public/logo/imagehex-color.svg new file mode 100644 index 00000000..23c45024 --- /dev/null +++ b/public/logo/imagehex-color.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/public/logo/imagehex-favicon-120-mobile.svg b/public/logo/imagehex-favicon-120-mobile.svg new file mode 100644 index 00000000..cff71c04 --- /dev/null +++ b/public/logo/imagehex-favicon-120-mobile.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/public/logo/imagehex-grayscale-blackbg-with-no-text.svg b/public/logo/imagehex-grayscale-blackbg-with-no-text.svg deleted file mode 100644 index 1f1453ac..00000000 --- a/public/logo/imagehex-grayscale-blackbg-with-no-text.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/public/logo/imagehex-grayscale-blackbg-with-white-text.svg b/public/logo/imagehex-grayscale-blackbg-with-white-text.svg deleted file mode 100644 index 70b57005..00000000 --- a/public/logo/imagehex-grayscale-blackbg-with-white-text.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/logo/imagehex-grayscale-whitebg-with-black-text.svg b/public/logo/imagehex-grayscale-whitebg-with-black-text.svg deleted file mode 100644 index 059f246b..00000000 --- a/public/logo/imagehex-grayscale-whitebg-with-black-text.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/logo/imagehex-grayscale-whitebg-with-no-text.svg b/public/logo/imagehex-grayscale-whitebg-with-no-text.svg deleted file mode 100644 index 97218cf8..00000000 --- a/public/logo/imagehex-grayscale-whitebg-with-no-text.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/public/logo/imagehex-white-text.svg b/public/logo/imagehex-white-text.svg new file mode 100644 index 00000000..212a8055 --- /dev/null +++ b/public/logo/imagehex-white-text.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/public/logo/imagehex-white.svg b/public/logo/imagehex-white.svg new file mode 100644 index 00000000..2cc184a5 --- /dev/null +++ b/public/logo/imagehex-white.svg @@ -0,0 +1,9 @@ + + + + + +