Merge pull request #242 from connorshea/develop

Develop
noidedmedia · Oct 1, 2015 · 664a183 · 664a183
2 parents 2444869 + a408bb3
commit 664a183
Show file tree

Hide file tree

Showing 45 changed files with 249 additions and 617 deletions.
diff --git 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
@@ -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
@@ -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
@@ -41,21 +41,37 @@
     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 {
   width: 40px;
   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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <div id="sign-in-container">
 
   <div class="sign-in-header">
-    <img src="/logo/imagehex-color-with-black-text.svg">
+    <img src="/logo/imagehex-color-black-text.svg">
     <h4><%= t(".email_confirmation") %></h4>
   </div>
 
@@ -21,4 +21,4 @@
 
 <div id="sign-in-extras-container">
   <%= render "devise/shared/links" %>
-</div>
+</div>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -3,7 +3,7 @@
 <div id="sign-in-container">
 
   <div class="sign-in-header">
-    <img src="/logo/imagehex-color-with-black-text.svg">
+    <img src="/logo/imagehex-color-black-text.svg">
     <h4><%= t(".forgot_your_password?") %></h4>
   </div>
 

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -3,7 +3,7 @@
 <div id="sign-in-container">
 
   <div class="sign-in-header">
-    <img src="/logo/imagehex-color-with-black-text.svg">
+    <img src="/logo/imagehex-color-black-text.svg">
     <h4><%= t(".let's_get_started") %></h4>
   </div>
 
@@ -35,4 +35,4 @@
 
 <div id="sign-in-extras-container">
   <%= render "devise/shared/links" %>
-</div>
+</div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -3,7 +3,7 @@
 <div id="sign-in-container">
 
   <div class="sign-in-header">
-    <img src="/logo/imagehex-color-with-black-text.svg">
+    <img src="/logo/imagehex-color-black-text.svg">
     <h4><%= t(".welcome_back") %></h4>
   </div>
 
@@ -33,4 +33,4 @@
 
 <div id="sign-in-extras-container">
   <%= render "devise/shared/links" %>
-</div>
+</div>
diff --git 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. %>
 
 <div id="home-container">
-  <h2>ImageHex</h2>
-
-  <a href="/images">Images</a>
+  <div id="frontpage-logo">
+    <img src="/logo/imagehex-color-black-text.svg" alt="<%= t(".imagehex") %>">
+  </div>
+
+  <%= render 'images/show_stub' %>
 </div>
diff --git 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. %>
 <div id="home-container">
-  <h2>ImageHex</h2>
-
-  <a href="/images">Images</a>
-  <br>
+  <div id="frontpage-logo">
+    <img src="/logo/imagehex-color-black-text.svg" alt="<%= t(".imagehex") %>">
+  </div>
   <a href="/collections/new">Create a new collection</a>
 
   <div id="frontage-subscription-container">

diff --git a/app/views/images/index.html.erb b/app/views/images/index.html.erb
@@ -1,4 +1,3 @@
 <div id="image-list-container">
-  <h2>All images</h2>
   <%= render 'show_stub' %>
 </div>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -3,7 +3,7 @@
 
   <%# ImageHex description text %>
     <div class="footer-description-column">
-      <p class="footer-description-title"><%= t(".imagehex") %>
+      <img src="/logo/imagehex-white-text.svg" alt="<%= t(".imagehex") %>">
       <p class="footer-description-body"><%= t(".imagehex_description") %>
       <p class="footer-description-copyright"><%= t(".imagehex_copyright") %>
     </div>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -6,6 +6,10 @@
         <div class="imagehex-header-logo"></div>
       <% end %>
     </div>
+
+    <div class="header-item" id="header-browse">
+      <%= link_to t(".browse"), images_path %>
+    </div>
   </div>
 
   <%# 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
@@ -24,11 +24,17 @@
   </script>
 
   <%# Favicon %>
-  
+
   <%# 16px and 32px .ico favicons %>
   <link rel="shortcut icon" href="/favicon.ico" />
   <link rel="icon" sizes="16x16 32x32" href="/favicon.ico">
 
+  <%# SVG favicon %>
+  <link rel="icon" type="image/svg+xml" href="/favicon.svg">
+
+  <%# Safari pinned tab icon %>
+  <link rel="mask-icon" href="/favicon-grayscale.svg" color="#333333">
+
   <%# 16px and 32px favicons, just in case someone is using some absurdly old browser. %>
   <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16.png"/>
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32.png"/>

diff --git a/app/views/static_stuff/about.html.erb b/app/views/static_stuff/about.html.erb
@@ -4,7 +4,7 @@
 
   <div class="company-page-main-column">
     <div id="about-page-logo">
-      <img src="logo/imagehex-color-with-black-text.svg">
+      <img src="logo/imagehex-color-black-text.svg">
     </div>
 
     <div id="about-page-description">
@@ -19,4 +19,4 @@
       <p>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.
     </div>
   </div>
-</div>
+</div>
diff --git a/config/locales/en/frontpage.en.yml 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
@@ -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"
+      api: "API"
diff --git a/config/locales/nv/frontpage.nv.yml b/config/locales/nv/frontpage.nv.yml
@@ -0,0 +1,8 @@
+# Frontpage strings.
+
+nv:
+  frontpage:
+    index:
+      imagehex: "ImageHex"
+    index_with_user:
+      imagehex: "ImageHex"