From b0c4f03a813dca50106f15d91b011fe117378fce Mon Sep 17 00:00:00 2001 From: connorshea Date: Sun, 27 Sep 2015 12:50:48 -0600 Subject: [PATCH 1/6] Bundle update --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b558d3dd..a4c6b9ed 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) @@ -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.1.300) 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,7 +247,7 @@ 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 @@ -255,7 +255,7 @@ GEM rails (>= 3.2) tilt redcarpet (3.3.2) - reek (3.4.0) + reek (3.4.1) 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) From 7d18dc7222636dcbc0a8b14bad85914af0df4291 Mon Sep 17 00:00:00 2001 From: connorshea Date: Sun, 27 Sep 2015 13:56:39 -0600 Subject: [PATCH 2/6] Why --- app/assets/stylesheets/rules.scss | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/rules.scss b/app/assets/stylesheets/rules.scss index 0115b69a..979b2e15 100644 --- a/app/assets/stylesheets/rules.scss +++ b/app/assets/stylesheets/rules.scss @@ -1,22 +1,26 @@ -#rules{ +#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; } } From 717e7a1152554f4f5f1296d9b01f603510905c0d Mon Sep 17 00:00:00 2001 From: connorshea Date: Wed, 30 Sep 2015 16:23:10 -0600 Subject: [PATCH 3/6] Update gems --- Gemfile.lock | 8 ++++---- app/assets/stylesheets/rules.scss | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a4c6b9ed..b33b539a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -157,7 +157,7 @@ GEM mini_portile (0.6.2) minitest (5.8.1) multi_json (1.11.2) - newrelic_rpm (3.13.1.300) + newrelic_rpm (3.13.2.302) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) oauth (0.4.7) @@ -254,8 +254,8 @@ GEM execjs rails (>= 3.2) tilt - redcarpet (3.3.2) - reek (3.4.1) + redcarpet (3.3.3) + reek (3.5.0) parser (~> 2.2.2.5) private_attr (~> 1.1) rainbow (~> 2.0) diff --git a/app/assets/stylesheets/rules.scss b/app/assets/stylesheets/rules.scss index 979b2e15..9a05e54a 100644 --- a/app/assets/stylesheets/rules.scss +++ b/app/assets/stylesheets/rules.scss @@ -1,3 +1,5 @@ +@import "scss-variables"; + #rules { padding-top: 2.5%; padding-right: 15%; From 2673f089e0c75ac813cf7f191b3144f432c2b8d1 Mon Sep 17 00:00:00 2001 From: connorshea Date: Wed, 30 Sep 2015 17:34:42 -0600 Subject: [PATCH 4/6] Update all uses of the logo Including the favicon, sign in/sign up pages, the about page, header, and footer --- app/assets/stylesheets/footer.scss | 7 + app/assets/stylesheets/header.scss | 10 +- app/assets/stylesheets/signin.scss | 2 +- app/views/devise/confirmations/new.html.erb | 4 +- app/views/devise/passwords/new.html.erb | 2 +- app/views/devise/registrations/new.html.erb | 4 +- app/views/devise/sessions/new.html.erb | 4 +- app/views/layouts/_footer.html.erb | 2 +- app/views/layouts/application.html.erb | 8 +- app/views/static_stuff/about.html.erb | 4 +- public/404.html | 2 +- public/favicon-120-mobile.png | Bin 1679 -> 1291 bytes public/favicon-152.png | Bin 2827 -> 1746 bytes public/favicon-16.png | Bin 439 -> 310 bytes public/favicon-32.png | Bin 671 -> 515 bytes public/favicon-64.png | Bin 1249 -> 829 bytes public/favicon-grayscale.svg | 6 + public/favicon.ico | Bin 5430 -> 1150 bytes public/favicon.svg | 11 ++ public/logo/imagehex-black-text.svg | 17 +++ public/logo/imagehex-black.svg | 9 ++ public/logo/imagehex-color-black-text.svg | 20 +++ public/logo/imagehex-color-white-text.svg | 20 +++ .../logo/imagehex-color-with-black-text.svg | 128 ------------------ public/logo/imagehex-color-with-no-text.svg | 37 ----- .../logo/imagehex-color-with-white-text.svg | 122 ----------------- public/logo/imagehex-color.svg | 11 ++ public/logo/imagehex-favicon-120-mobile.svg | 12 ++ ...magehex-grayscale-blackbg-with-no-text.svg | 17 --- ...ehex-grayscale-blackbg-with-white-text.svg | 122 ----------------- ...ehex-grayscale-whitebg-with-black-text.svg | 122 ----------------- ...magehex-grayscale-whitebg-with-no-text.svg | 25 ---- public/logo/imagehex-white-text.svg | 20 +++ public/logo/imagehex-white.svg | 9 ++ 34 files changed, 169 insertions(+), 588 deletions(-) mode change 100755 => 100644 public/favicon-16.png mode change 100755 => 100644 public/favicon-32.png create mode 100644 public/favicon-grayscale.svg create mode 100644 public/favicon.svg create mode 100644 public/logo/imagehex-black-text.svg create mode 100644 public/logo/imagehex-black.svg create mode 100644 public/logo/imagehex-color-black-text.svg create mode 100644 public/logo/imagehex-color-white-text.svg delete mode 100644 public/logo/imagehex-color-with-black-text.svg delete mode 100644 public/logo/imagehex-color-with-no-text.svg delete mode 100644 public/logo/imagehex-color-with-white-text.svg create mode 100644 public/logo/imagehex-color.svg create mode 100644 public/logo/imagehex-favicon-120-mobile.svg delete mode 100644 public/logo/imagehex-grayscale-blackbg-with-no-text.svg delete mode 100644 public/logo/imagehex-grayscale-blackbg-with-white-text.svg delete mode 100644 public/logo/imagehex-grayscale-whitebg-with-black-text.svg delete mode 100644 public/logo/imagehex-grayscale-whitebg-with-no-text.svg create mode 100644 public/logo/imagehex-white-text.svg create mode 100644 public/logo/imagehex-white.svg 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/header.scss b/app/assets/stylesheets/header.scss index 31d1a440..c3e55c9d 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -48,14 +48,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/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/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 @@
@@ -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 @@
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/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 %> 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/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 aeb6644a8f3c6005bd3641fe67fa10bba046f714..18cfb5786f3e6f30e5b97a7c30b9b1eb169b352f 100644 GIT binary patch delta 1235 zcmeC@?dF=`QO~m0)5S5Q;?|p6cfErXW!MYuo||N5rZN3g$;802LM^R{H9HGa1iEjv zYHG2FS?KT5TvPp@VQJnjkArNjT~}LOg+g-7_X_R}c*m>_8B!u!s)VQIWw}N$?Rw=E zDRIZjZAxa$iq(65y-cf^@@~Zsj=uL+0zkh4y$tp%(968_AkTvQ?4T^oe=9Wn)}vd? zPtN?Go4WCXoaC)Jp_irx%3X^x)w#yI?(1IvZ5I{&7GAw^?MS$sUec@Dzy2?7ez?;8 zaw1dm$%#(x^XgXr@PA~t_>)SWonDL5-FZ*V>ztpn##-**xj=k+UA6lApU>mC_D6mC zv^v-CUR6j<&xH&1s)eo3*R0-nyu5PyFL}4>cWZQ7TH?QM6^%K*Gv;=mFQaex$Jy`W zHchk1H-EoYtL)O^l!ExT)%x)OJ&${&nh0`H#no-}c6AHa?znYr}=c z*7N;pdFS;{t^9b+>-f2i)IcZoK2<O>ckd6)yOyh_Zc;1!XtC^S zG}q>&y9aZ3+?f@FjOE{6m}O)^OGLsBX1>tr}`Gb4^ceZ%O5o*$JHY_TN0RQ~Hap`qp_DXRdD1 ze6Qd!oAqSM&F@y1YK;@O8y>U}^D>sqv`*XgWJliWw6*JegaQM8URbf`AXiCFf%=~KykuP9H1uS$rR{c~yz>xdF&E)jYecu>>z|+;wWt~$(698KeSlR#p delta 1626 zcmaKseLT|%9LG&#Qc^T7F?ZQ1(VU0U79;1Gbr(Wv=iDYH5+-KLPY+J>Fb@+aya-o` zjWIJMtvqy;*)CQxE-l8^%Go%Nox4B!=U%V-{PB6cKYx5*-+w-@PqucRPQDkQY2)p7 zJTPTUUd~U{kNBd0L2<4OPv;PX!a}3aeA@~d+iB;0+ONjoD}rsRJCMAMAB`g){I&n$ zyn!yw&?#k$HR{^-p{g&ReIKZO(9B<&$0qoA-C{3S$eFreTdmlawVmFa^|bFQ@PnO{ zm5(ITBm6U?laq0-N?iz8O=lR;a@k_D16~m}du5k2$axH0(L=9H>uGw6W=G<= zB9PIEDCn^rA?0M>Mm!F<^Vm>AF|In?;XVDjMZz{61P;|Y?~+oWEX zdaRwu1Yv|1s~F7nDUKjAsR0dFyy(g+#jW0dKNZ(Bz8aoxqB-_y)~VFIid1Z&S3;#=d91 zbJfvKm4T~3Mpe7gHKWos)i?cf{0xlhrx{~baOj+)|C6@1Hc>=4zba9A?P1V&aL0<1 zMMwI6Nptq~{W!47J8wFjv6DU>avK3mqA1!5xj|-MnDnK1jXNp<&KUM&bpK%M(0(|~ zvXhdGR|q{b&hE9|9o9b7oR%1q_0GXAir1%WtWuhcFZu~A1Q~Mi)?`Y&X&fiIISA46 zAaPDEqmn(X4ylvJ^6xJ9h}L`_!{c0sdrA)I%Tx%jM*I^y;j=hv1KTY*^&1D&XJ6W^ z4qEyGt4Dc}*ks_56`_!-vOu#)F3HNns}r+OEQa4@TY1O|qR(>o{KJT)2ybZaTH%d$ z*dz70LOND;x}p<2-#*#gQ%k213kQw%vc)6p58{bJ+6d48r`ve*(rw}~SSd`RQ4$*5 zGqZA+uge5$^zFzt`P!m>D|NM&gsh!G*BM6nyG;VTp({17>sJ>?yimI^zR0wVKAIbz z`+)1+FSeUm5?3}q)th&+;%sZU#Zi@InhU(gJJJ;<@wz5U#RArSZOn|fS#yJ=uy~dV zYHwOS9Z#p#B^~?b6WR9-ulsUBZ#{>TYvnVwSoYRA;WrNm1_eVaV&8KJFVrmy9{Hg6 z0|Jqtozq)JMlLK?Z$8bCGD;$?N%VrL-s>T`MI(|OgR9HGaHdAL+s~#%jmuuiUOX@e zdR&K>3qHxF<5J%8Ko&P&?%~R_PdE#A<8alT*`k!3dA*Xwg?L5}V~>=Tw-m^pJ+*so zP0N8Gx$^MC45VADfR-IsP}CoD0Rr^PScurdO096r#sOS;d24IPGlTm~IN`dXL@y#i zBWYkH_VO9oZGVl}oL>1NXXm`ovX{Z%S%m3BZ5ui|EoVmtg+4Ou5GTY> zGv|uw+WCodYRb@o(f7-TT|QYuod(pTbGUG07g23BGLV>SoSXG?jl<0v0CO)YPU4i0iRPj<2Or$&+T}xohQ#Mh}*vIC;Mk(%}S*X*YCc~uZbK+QpW4g z-C+COus(_C1|9V?X2D8~_nwZTdZ(cmElWnJKPzyZ?({&LOi$Fqv{W=F-=DO8!TspT zi#sf!K)x3Wtr~`QB;4zz*q?;KmKNo~ zP4H<9v*w&cjBqkB#Iks;PvH{9pHs~F@ZwNYgE^CUy5H#TCAk~^PohhGT6qt~ob;`M z=!Ff{HSg89rh06uW6ehGW|18DR_Iq91ZXs(a)Ah%ze*?%*B@X}q diff --git a/public/favicon-152.png b/public/favicon-152.png index 1d81c4d6223153ce8be3aaa84e83a02a7cd2c0a9..32eb24aa3b9fada06a3e00ebce85aca3b814de08 100644 GIT binary patch literal 1746 zcmb7Fdo&w{8jsOjC3a;yRjC?M6K#Z*36+UeLu)E)QO%<&A`g$KLyc)Q?V>j9mfl1n z>XB8eT7)JM(J5-HXc9?!JyKB`YlAz2mEL-_+&JgnKkm7I?faeY_515P=l6Z*D?Wie zYG<>@1^@uqMI6IKn=^mgt%2s~_=~HXIYF|+aM>{#wCvo(EGpnIC4)?LjYvq#R9Q*BqL9bZuGze-8ET>E-pv`0Xhx=qZJa15Gv!GdRkgXRJLV@LDf zj(i=kNpk;r+2Y7kd<*wt-dt(VM30N(-_PN`pKQd*7N(>q9&Br*Q>z%n z4^Z8#vf|vtYh|(Svs7!{sTS$QHJ$UNB^?Ka#J2IknER3BHR>OK$@MC4NTwp29HXpI z4ry*=gk?<@tZu|QTyr7&Xme9&2q##5NT7$Pq-=YaiwP>9s*LFyS`(;`P=b@~yF3@p zQzKYW0rWi4!bd$^0_M5fXm*yafFi8Ei)nM{Rci2MmhH~uA!XPjV6RezFSC$2%b(CW zUMPKW@rd*x2QDqrx#E~v!lF?xlA7jO3gN*?TVi8o6B zL0?Jy3k4UNVY`0+(RWP#%`>$qMTJk~g`sg@J8Pgd@Cs=gfbH^snm@@qRMX^wXD;D+(6^5AUGAzoI+EXW8e_j*v)u@`l|7Q@5ldSqw3Fw)d&0% zbb|70p~5!DeN0#sM?f!!Mzz!%C{ApLVfVDbs0fLJsWYMHY>|5ibE{8FETsI9qkPc5 z79*SAm>JSOTbPRMsb;==mf_F(*T-{b1nD6~t<}k>!erY+r@hyjkxKb3Z1Z`)<;{F- z8?d*%l9h69gh*@%_XwOF$Rn?7-Zzg`v)t0|4+Q1#1% zvJS@j%7(mH8do$TyOao5(F#dhYJBb(+y_PwUN?>V?k)I=hKSPa5%xqVU3fs6;YHU8pn+vB&QlnXltiT)y9afjJj2DoE-iv_`4m^IUQ?>&RA{wo7gmbvN<}#d5K{xkwkgmwC24u`4w>(&L^7hjlT=* zFj2T<#PMpoULyn}5oSV9&o)gv-c@1S8*oYK)*f2dOEUitDsr=^@H+qA9Y5k;D1r*k zsOaMP&l*B*E@yWmp5&CztyJ1gW&-mvQ;;0{E!_Y|zVod@>NC4uF`=sb@THmy*^m!Z zVBrw$ohx@;9k&5sS#0C~nm@yT5$P0tzhZhqGB|_0qHVV^qnWd2h|8tDm;NMgE^^wlT{q98mL&APRmHK^j$IiS#&*09QUnGd?X@k1;Z7Lb1@%MeiCzBIyTOn*FDOA>-p+djr!D7jlw#I ztz9?IYUQ;^snxFYj6o~IwS^?unu!1`CcIGK+PsNqVx?4EsZK8~SUax2$Hq7L`%Q)F z6}I094$ybOMo*$qldZG-fa!^-&X)|C2sB_0lIeZ`>ebxinr;A LFf67el*IZsq=7Gl delta 2783 zcma)+c{tST8^&iwjWL!e#=dXKHj=HT(Nwl+$`Zqv@C|XYA4!AJcQi*5PNXcUY!S_n zC0QclXhhazhDa2VP-6?(&UF6&UDxmZ>vLW2eLwH>T-W>D{h~>zR9g^PW_J?jOc|bg zFlsM9Bh}_L;?rgdboo0~4G7sL-X0A}B|1x#ooomWf0vXp-1!_?KkG5n6jI~4q73W^ zIK+^3Vq8k=OJ>RkTn02K)iYK4dZyyol;#ELw&mCdgG|{u^mG3<Sluo`v3N z%=DV(>u@TSpkk{p1R~-vTg!vs&pu`2&2Mwk;FgDoqlFjB7flK~{Z1Jhy|9>beC}|3 zkl0%&&`rCXb3r${o-|<~tZ>M(U^nX!*%9{oaG8;)gK4(^AxabH9V>xE&Jy~lMz3M5fp6!Hxne>@&rCiI3f~oS~M#e zcab4Ap0^IoTA*_8!{MGC*1&M`c9%0v2faVIhG14=A__%$?m0-&#O=ehfJg#kHu#ZBDI>qkv1LPmXgTyfe= zn8T9)FGt>=0;S*!l>IrOQP)w1>wL@6;nAB$9UL(gO|~plr2jtl&osU)8?;zV`KWwX`d!G#enCQywYhSU1#wMV0gu zYx*vQMqbPx^sY3wdhr$RD23PN+NmmbY;EtqvdL)D6l~58KELGH?gt&ZSP_ygN9G_c z;;0*J2eq|<36ux@m6rLi9FuB_{~U8_Qo5eG1*}`-w4bgX zd-$SDrxMgnWsPArN_n=;U+2_Oj6NcuC{?9V-%Pmv&zJ@l(^aQExg|$_jX8lM2kElv zdc6To4QjoPLLlan+TUbmsti3Z!KT%0!@al}jWqkUtzWkqDFXHL_{gzV`& zHbKqy|fn2UR(r+R`Lmz9wJuno8%BFiy*z_erjW!I*8!+}i=`RcLDqT(?V z$|dGI4uQjnKj1R)f%oJoR?i3h&PMGWvrx%r*E(%5JX^lYL}amZjdJh)&76GtJ@(Qe z*|D&{hdq4z-!leU6DaCve zfd)MMO7odbOv5)+lFj5%n?3dAXReF!s%FeI07+&iMia~{x3MVpaJlEZ*W$LNc*kOM zIU8Aj{#M#1>Ak;2F{Tg?(KINx#ylG23T(SD?H0ng-l?RE-(|^U)l*) z26f~ZX|8_ISo^^+O8Ro!Chv(zq?XCblR|CtxfG!=Tu<^jM$s!9H_Z!tRdAw9m{qE zpQCu+9~TyGDgOO2qp{do&lYZ)tEuIKGg~5EFluHuypm`stwkH~lBWhG`O8hxX|#`E zF77XM+uR;&-+UhpMC`16#WxduKvC1kiV#eqy>&*+8!SU_s@Bae2%tPEnzHx<=K?(& z;P51P)=T59t6g}O<>AXQ5lv<Tn0glz z6OY-iYWu`m-iz4BQUFFR3`%j-Ekxx>`Y<(5)Rd?zcl)8u2SXaN>3Os zx0GB7xE94dT_*1n+at?aUpsl-S2Q3H_B)xB_{mh5eAYA36qY|dSg=m7{209@yF~h) zqTSIknmKwG?ui`q7zFb^ZV}Z}SP}YQB)ozsimx%qHu@>`4)-!z5HBBB!@g2L3@=^9 z@c(K?#rh#kWs|vz3D3!RY%-G*?aIN;>#+8p!>Y?tifm+^Dsl5YZ*DCTJCD^4@E7B< zB*|_R5oy`RhRS>YZ>vcS$7Bsye6pf1^=t=IOKOjx9C0nnWy!wa z*e{z8nnS*$%@O7md%{%doas)C^kI9vRu|@A)&cJ}a6BQzyNJa(xJ(nKnRpybD5u=` zipk+wWko@Xojc}YX6K|oH4%LcA;o@?C*T4A7=YXsrj;I$P~8Qz1CXw~?apf|5Hw%l z=e!dywwG3VuLUh20DOx^|FwtKLWiPT|07jC(SI3su^=*4(hy_j&T&B@mUB0d6$eF| za4xWOjUi~MFa1A38XO4DY|-P_CUEv9iojV8O3>dH`gk)$=AaA+F_!rKu!xrOf7KC6 zBD8!A>~{n377&W|MML}|S*a}$8N$nQh_H%Cl~foh$WR=(tHCMP%ztXs(cMLW$7f3)?e?o>V@VCV{#o>~zOIf`lQGIJyvkKqp!*$+iy}gjH;o zQNq9Xiby|QqGklpTxh1<0*_sNn@YD7l+iAko)4?#Rt^7EFzzn8uVOP&hv0WLVZCiLAi5G2rEScU@56X_$In z6~)ARoQ&jO0J8JNZ{m==zn8rcd7)OdlL#NdEPiMTm(7+44&~d9nG7HM^q!V|DKT{|xV+ z{a`StywBjyDSybo#)v(*a0VhHBO`;5G$(^1GaF9LcnyF79wuhI@&pawMfEpU13uxA z|HRG2j8~p1$+%ixK~S@gfq?-z0sK=C)a*+#u9lZt)-TUyu7@GdX0F#Kw6sSaF0%K| zT9ukz(Q9jVMX%j^XDvqd{XAiz%5x=`wa=AY)_$I_5Em{F0C^pOX>6=#pP zcTfDU_enYLU{3=q@K!i_-kOIK-~>1UIs$S;Wq~aUkkX)}rTFIMOcbC*fZQEDadN+r zMqy&LJAUsR{(oU?eY|q*41ipaeIg#jEY<)l@ElP_r1c-MPvk8OTF=h_h-6ml(KQT_ zjS|@iDH{px6=XgPL^18{Nv7=X07d?uca~mF^8f$<07*qoM6N<$g6qlIj{pDw delta 648 zcmV;30(bp`1fK#aOJSMiX@v@aVg2l$KfS15n=YMqtSOwl(734|);aGYZ zSOM-1NI3wKTiN*fwE~1==>^)`{lH}19onB|!!|%TmVO63GugO5-fv~&&y5m96Gf~x zH>EWL@LyvHFa#I^7y`(O6lyk9%f&UdN?~>>WR#Qbl zZ-W>0(#R8+7uNttI*u94=hguPS&DyO-e^+R8Blhzx_$@?;j$glT0~0S1pCPQ`Hv^ zr$}IC9OuY60ri}y_cjv_mz7fX?g9TDFM#FdwgCV}MTafDZ2;em0|=Im(KQ0x^bXiL zfY$&loqM1l&?}KH1FrSO`xM9bT*64D= zzNi3+R5Y`$w^*26GNr#TBG9*E!{IX(%@_`!h1n%Teg8kfz|l-rq!4YF1W2Z$nSGw*{O@HY6%+|F1LC@{bjQgM*`~IJc6@0$l#0L)m#1G)*5msCJRZI}32Y(3wg!?4CoAaj;tRa91 z4*~$yIHvlb;9D24MgSt(O8}`lzg47rkqEFyxatp{!#c;aZmYw`lnwKp1^~jlROh~< z#0sfVhC2s<#DCS)Q-`*)p=I%)+M>R&cJtH{|2!A~17H9QfB`T72EYIq00UqE3}Bxk z-Z=ndQe29asekDzBJu*PImfOnv5Bbe1ywpUHd5X;o@Z>K|t|nj}0nr zp>&6TPR{XjqoeQlun_s< z1rH$1tpWhyDEO&F8Yf*FK!g$q`D}*N-Bop7X1;)*7nt-1&!Eo7bOx$KNFX9be-N5F zFVi<xHjFGCD~0WbgtzyKHk17H9QfB`T72EYI;PFxIq zf%JFvy7r8<0Laol7Ap(ORiM}&?DaR@ArrIbcwgM(6!zM%?XxT~U#yJKjz#)GTDU66 z2vt2$Q8tqKg3ch#b%iZ?gPC5S0zwfhJPUZPMS5;(iiNPh%_Nkl@k7?|DFh*(cmOCqLj{Q~ zZmQ5}F?}Kdpztv&{41M3HAg{YPXquu&!^upIHv|N%8b+g;1~cp&xyf(=km1uff}XU zF#u4!WYOT98h;8kNy&ErD4wL`MW4=N@(3Yq=Lc8^cET_5j>Kjm;3EVO0tf+w073vE zfDk|kAOsKs2myouLI5Fv5I}3=-jmyzx?Wa|y6*Xo@98S&)m61{X*^@+ciJk6q3|)F zC2zgP!^_8gTWgE`XN9N;4C8K65!ltzG7N1kD)*}E;(wVvjl6A^&ifXhWL*V-!qd>C z--zH}196`vo0ibvy+;Yj=s2iZHZ^P1a zu~t|Z)PFd>ue;r8LDF4Y`=@$!<$UaPVS z#g!Tq7Cx#Jm%iZnNHW$^y36@m`qdxxq0(}Ekc-0gm++^r8a&7G$8*rsBBXLpm75#$Vt=&02iH*eU?kzhOq!t}vJC-HgCoKx zoONvjA(WxEqr;Be1^H)JHVi%8%dq_a{?_>AS$ViHm+aN5c(fU~5l_JYA9vbIA5jpd zQ8M2@{^p=}f8Wi&ukz*&RJL~ZU$6H-{_ksLj{Be+3Bm5hd}Sn;P4ufJ^K)WyH)1I( zW`AdAJRlxH0Lb7`Pfx9ApsZG*Uf<8U)qnf7v%lt2V`Mk99=JU^Rt`oEKaEP8?3vfIOy%$A@_e2l9Pv*PF;?2SP zbrF(0e+HuQx8Xl=>FlwiuLcjYfH;1jFMo$!cKgl;5M|haX8;@U3=jgJ0fF}b2s0qK z0Q@`$=m-FQ9{r90kYMJFNf$o&jAQkO6rgpIf9YrZcdNprI7<3`6D|iQRoTgh<3Anh+7vF0dm8_sYt*POaP*lzr^XBwet+z< zfe6CY_$d5P{Np-9W3b-{wR=xK@t6z>&$hA=f^al`v(B-V-XQ52NYLJ6ZxRZhva|OH z!d83~er)_!y2GtBPt2yn(RpqILR;}2=?)(Okp>HozM}A)8}5Z5EX8;H{(vU_Ai?2> zpQTpkxeX8v + + diff --git a/public/favicon.ico b/public/favicon.ico index 3bf91faa1523c032d4d6be90e2bccce0b2e3d92b..92c8118593feb55a0af5909d2ae3b809ce0deef1 100755 GIT binary patch literal 1150 zcmbu-J4jn`6vy!s47DH_QR*Z{ZAER}t#J^psSbr!Bcd3kU_lFln4;L)6mf7AI!L5; ziy2G1Szkz}ijUP<#8(sxZdTF6?=km=BqmbuhR;3!$NBy5C5ecQPhOsIFOhe4kwOuv z1WT;M)+r+F<>$oQ%oA?jMZe%79>Jz_>vESJ3T!Aqw$80f`^^4o>I~M<3x{{XFYd<& zn$1NI{$Lta(DO8#gCXo7YPz5H1Nh?=&kK4|tS_RO4>kJY75Q|{96 zR6@?mYu$rppJ6{kK0rQ@A-~VMX78JKa>ja^=bv}3_(u%q$p?2?_#(|aY_L{BPQSx) ze8CB>I+s7M_52*}n|Wir4ZLjWeO0m5ZSmsCen8-EW C>5M4= literal 5430 zcmc&&Ur1zS6#vY?eVcjMU98=j>n36)MC_WTt6rB}EVRtDP$8y=RtuiV#G$>@sf)1vOCXQ`GFfD9f%~3}hMxProzHCzsFpuJ;=sM)+~QbM866 z-?{gjIp1}JC=(BeU{JtXV&p*~YJ?D$weK$>{t05Wh+&D0{Wwg)KOz#0mA|f65B>b% zGK1GLF74vgf2*H6x4F#VwTy4v|2sJS>wFA#S%C7$a*VGfZ~hk?AGjYwT^67`vK-@U z$ah?IvR+!Jz3LywRVVAE^{UNrw1)naxdp9dQQxRr6IJb@z0&d`-<){mnmq3$9O&#gLnJ@uWG%*VKHSpIrL7 z8ud#IUhDEUH-(s*DmWTMv`mOpg%D2QFw!9*_9FXp#zMIb@I2D}>GbiLvw(OWmM%{h z$LG-k;(7S4haS(KDBzwUyyn=E&l!3_APTtW6R$buSr7iOqATZ}wA@F*?-)M^@P`#$ z^}Ee|9I6MW4I}}nbCl&=TRwYm+CUOe^>jYx=IX(dFwj-|N?fW+B@A@cevYG^>!l_1 zyUJ1k>_d&A^8@Z3C@;pia@qyTls9{Bx>V>B|_x$|jvUddb2Z1>EFgiCvQ?FjU%iQWc>wMmq;R|is{ZFpS=Mcv|d!GG; z`hmVR|I)L*b=7{p=xShns}Q%}n96DD`_<9qnd+(eI$pnVmCw}otE0;^)l>6zynf>< zpQ-OxN0(=+r{?Q;{l-;3Q{S(SF3(g?&DZhzje~DZ+VJNBI!^% + + + + + + + + + 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 @@ + + + + + + From 00eb7ae9edfe1b5123c8c9959877ff75a2dbe0d5 Mon Sep 17 00:00:00 2001 From: connorshea Date: Wed, 30 Sep 2015 17:49:44 -0600 Subject: [PATCH 5/6] Update frontpage - Includes images even when not logged in - Includes a color version of the ImageHex logo --- app/assets/stylesheets/frontpage.scss | 7 +++++++ app/assets/stylesheets/header.scss | 10 ++++++++++ app/controllers/frontpage_controller.rb | 4 ++++ app/views/frontpage/index.html.erb | 8 +++++--- app/views/frontpage/index_with_user.html.erb | 7 +++---- app/views/images/index.html.erb | 1 - app/views/layouts/_header.html.erb | 4 ++++ config/locales/en/frontpage.en.yml | 8 ++++++++ config/locales/en/layouts.en.yml | 3 ++- config/locales/nv/frontpage.nv.yml | 8 ++++++++ 10 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 config/locales/en/frontpage.en.yml create mode 100644 config/locales/nv/frontpage.nv.yml diff --git a/app/assets/stylesheets/frontpage.scss b/app/assets/stylesheets/frontpage.scss index 5e051148..214f2313 100644 --- a/app/assets/stylesheets/frontpage.scss +++ b/app/assets/stylesheets/frontpage.scss @@ -23,6 +23,13 @@ flex-flow: row wrap; } +#frontpage-logo { + margin: auto; + width: 100%; + max-width: 400px; + 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 c3e55c9d..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 { 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/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/_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/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..d180a152 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" @@ -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" From a408bb3729a50189ecca1754a5fbba927edd2560 Mon Sep 17 00:00:00 2001 From: connorshea Date: Wed, 30 Sep 2015 17:58:17 -0600 Subject: [PATCH 6/6] Slight changes for frontpage logo and Noided Media copyright --- app/assets/stylesheets/frontpage.scss | 9 ++++++--- config/locales/en/layouts.en.yml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/frontpage.scss b/app/assets/stylesheets/frontpage.scss index 214f2313..80a5c67a 100644 --- a/app/assets/stylesheets/frontpage.scss +++ b/app/assets/stylesheets/frontpage.scss @@ -24,10 +24,13 @@ } #frontpage-logo { - margin: auto; width: 100%; - max-width: 400px; - pointer-events: none; + + img { + margin: auto; + height: 75px; + pointer-events: none; + } } .subscription-image { diff --git a/config/locales/en/layouts.en.yml b/config/locales/en/layouts.en.yml index d180a152..86f4984c 100644 --- a/config/locales/en/layouts.en.yml +++ b/config/locales/en/layouts.en.yml @@ -21,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"