From 26d6e23377b6ce380ed8dce87e922b531c727ace Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 8 May 2020 17:10:05 -0500 Subject: [PATCH] Fix #4425: Add Danbooru Discord server prominently * Add Discord, Twitter, and Github links to site footer. * Remove "Desktop mode" and "Keyboard shortcuts" links from footer. Users can use the desktop site option in their browser to switch between desktop and mobile mode. * Remove git hash from footer. Users can hover over the Github logo to see the hash instead. --- app/javascript/src/javascripts/common.js | 7 ---- app/javascript/src/styles/base/020_base.scss | 2 +- .../src/styles/common/main_layout.scss | 6 +++ app/views/static/_footer.html.erb | 38 +++++++++--------- config/danbooru_default_config.rb | 5 +++ public/images/discord-logo.png | Bin 0 -> 2050 bytes public/images/github-logo.png | Bin 0 -> 2603 bytes public/images/twitter-logo.png | Bin 0 -> 2455 bytes 8 files changed, 32 insertions(+), 26 deletions(-) create mode 100755 public/images/discord-logo.png create mode 100755 public/images/github-logo.png create mode 100755 public/images/twitter-logo.png diff --git a/app/javascript/src/javascripts/common.js b/app/javascript/src/javascripts/common.js index 3401df5b1..e1d8c3065 100644 --- a/app/javascript/src/javascripts/common.js +++ b/app/javascript/src/javascripts/common.js @@ -1,5 +1,4 @@ import Cookie from './cookie' -import CurrentUser from './current_user' $(function() { $("#hide-upgrade-account-notice").on("click.danbooru", function(e) { @@ -20,12 +19,6 @@ $(function() { $('#notice').fadeOut("fast"); e.preventDefault(); }); - - $("#desktop-version-link a").on("click.danbooru", async function(e) { - e.preventDefault(); - await CurrentUser.update({ enable_desktop_mode: true }); - location.reload(); - }); }); window.submitInvisibleRecaptchaForm = function () { diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss index d9cb265cf..4dbfee03a 100644 --- a/app/javascript/src/styles/base/020_base.scss +++ b/app/javascript/src/styles/base/020_base.scss @@ -126,7 +126,7 @@ table tfoot { } .text-small { - font-size: 0.8em; + font-size: 0.9em; } .fixed-width-container { diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss index e76b157a9..1af5253b4 100644 --- a/app/javascript/src/styles/common/main_layout.scss +++ b/app/javascript/src/styles/common/main_layout.scss @@ -30,6 +30,12 @@ footer#page-footer { text-align: center; padding: 1em 0 1em; border-top: var(--footer-border); + + .social-icon img { + vertical-align: bottom; + margin: 0 0.1em; + height: 16px; + } } .sidebar-container { diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb index f17b4b5c8..d8b75bf17 100644 --- a/app/views/static/_footer.html.erb +++ b/app/views/static/_footer.html.erb @@ -1,21 +1,23 @@ diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 5b728f4d5..634dde958 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -425,6 +425,11 @@ module Danbooru end end + # The url of the Discord server associated with this site. + def discord_server_url + nil + end + # The twitter username associated with this site (username only, don't include the @-sign). def twitter_username nil diff --git a/public/images/discord-logo.png b/public/images/discord-logo.png new file mode 100755 index 0000000000000000000000000000000000000000..d104a61753664526825adcc45d634537e4013e08 GIT binary patch literal 2050 zcmeAS@N?(olHy`uVBq!ia0y~yV9;VFS$kcwMxBC~Tsu8PGyx4c|A|K%6Y&9{%XpT|HfgE zni{HmtLtlh<*v$;w$Uj^WfRXN6$tw{Bu|?vWp%mu$ARnX_Z9tl@J|2d^Dm1Pw<(t0 zPuAb}kbBBj$(tqyWx)pL3_Qaa8P)mge_tz}|Gw&*a?5qDA>`INaW&M0~ zM(QR1t$7b$ot=5*hhgU1Yw7=@u9qC2{N&`%3>J%+dpC64q{H*J`Y=CRJu^*g&%aGa zlPrSdx2*ZeJ*9eTWLHMyGS=-4odw-9G&n4~e(iT(Kk=mHx%t)yqa$`~QhU5PHS);f zjqOx$o#Qo|1VfhD&ho6bCmGQK_su4+^~tKKXFfNqPkSoGs|SWt|eY zK)e{seD|h*n|J{6k(GjdAutuP=s;9HQg2Q586y+r7FB#YBHtR&Mmd< zxSFeYfyrn`tkU{3VtyWevkDSTxRZt1R&Z3j{Ul&h5YEE)e@espZ~cc{E-_5k5_^9! z$zhUhhkoR)3;gQ8)gOLYz_&G2FJikAi{tz^7V+n!b}Z!i@^$%xHwA3BqW^A4>Xf&8 zA=5TbnDgD&$VRV43a>hja2BxHR$kZQeb+a=Xu{gwI1cuyi~4;-T~@5ue8@kStC5dA zwc^#ntRKhs*Ebd)wmP=cfZMk7+!vR7ODtk8uVd_MeP(rjj>EIr(*3&(qnH%;HyLsj zq*rtBOcp)7_*}dH@oSeJG=2(tI!ox?muO8MCyCqFbUK|n&9hC)b-u-$*DZ0$$^Fup z7ZDym(}VSbq5ht;#jz)ABD?#U3)x;xaASM7iScn~(wC|z+fRmpvtM5Ld%{m{sY}$8 z2WRia2Y>k57&z~$^kbyoP86OvsT|Jc=3b9V^u=1 zlc2`zym_A-c1_rmz4|VzI^Uf02ln5SY)}c4e8udqK> z`M!CDJ1p`JJdW1lT30SDHi`MT+MK?98{Aj=2u*Z%YF+t4LCRGSprx%fePWs;h`B8y$x ztCnRJo*OEYXD<7|d$V<=ZosOmen-yzJg@(GvHybfm2=FVA1(g#jUn83<(8wZ9_;5n zR;xtMT6FxKmE*DgnF*6U828t13wH~-@vTB+7vIxKohVs<{bSgkFya=Gra=l=V8A6hZa|5M!* zaOJ|XH!90d%-EYH#`UM3gY`&zwf=`EJEdMbzuon_J8@s)L$1~o{YR(&> zT_JPJVBNA*nYX)^+KIRCwv&GLsV8YFhqXum*Qy$&kKM^^=`GI3g=41Y#l><3+Vq}& zd*VFjxzk-bw~lCRzFf~V$8p`C=eLx4<1}(+0$p^*`PdQYa)v` zr{ips4Zn*Y<0P|8BR6ooiecTxAiv{zqxQP15={Nj&pQQmYkE#J}eL6BRJpha)o;%Q9>R<4TJ;tzSIwmb?P*}*6qV(?01JfCK#_OIsPZB)p_4aM|pZDAJzrA;SWM8^Q ze<$m1mX!iGB;~K_N8J|7?OA_CiF;4o{C3yHTMw=Jp{0@)Xwa*}w%@h<-e5g5d(`_ouby?OP55*%^03hLl9qdi`L;}dRxa;r_u-zpa(+t5 zUG*oP0>_O4#W)Xf*H<$}CFx$ca)o802aCv6>(?7!Wlky1(~tl6T-ct8@%ULM3z;?t zgDJc1_ia*5I&*5%^|E*I_wTOW`?zfSl-X{-$~#=I8~a{P`1$GSpVW;JJ`z$=Nz!IH z0>6I!QjqIEeB*{h&i#FJBO@Hy*x45@Uflfu-J3U06jCGGzI`kE@Uvz^=4G`PuU<8k zzP|RcveAJdV{Pv3Z5#jIz3*7^@R;gs`Jcc2;ujM;BS-5xm^U2>& guTH-8pGAV9G(&3P(0|Nttr>mdKI;Vst0Hj*w4gdfE literal 0 HcmV?d00001 diff --git a/public/images/github-logo.png b/public/images/github-logo.png new file mode 100755 index 0000000000000000000000000000000000000000..6f98ddf1e2fa9f93d725047bdcb8d183eda046c1 GIT binary patch literal 2603 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 literal 0 HcmV?d00001 diff --git a/public/images/twitter-logo.png b/public/images/twitter-logo.png new file mode 100755 index 0000000000000000000000000000000000000000..fc30e86b982d267329d3b604671bedc726f9b62d GIT binary patch literal 2455 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?Fbo$7YsJ#5UdxlUMYc98?OPVSMp^dQv9N4yqorQUBQ#xGoHCZ{D)mfg z_;k-jh*{;KU{XWM=No%>fB*P>&hE}VX0vx!p0wXNGv(X8|NqbZpZ|I8`#HONiur71 zr`F9Y-EeQm>&tA57c4p{Q*L;m-MqbWQ(9BE-E@|K$ues`W^-Aa-_o8lV}{l=A32@6 zIZsp7t9O~bUdLF{CO@|Sp0i&dD{AqncA66l_pZCBeb|8URtaCT zaKzw7b*fBLolyWwB9`hUj7 z1Cwv~Kghfg#V9*T?ypDfd;j?_?cYyhe69UusrI+k^$O*M2@{H5?03vQxno&Rwte`j zef#v<1OsDN?6?;5;W0n+d*QupcE}F%L_m)TfjNP2kCs@*#v#rs+ zJpa!QzxggXhx29sh>0BvDZ03$*mveWrB&Rq90xwkyv?*vtXJLB>HaU1EEVo4CzKjb z}2 zQ_(d)nQmR>Jh_7*?P-RY;I_5}FY7Lg*L~Y1oDql(uO`nHX*>|zbuytyQ_b*%^$d|;H?Vcp*E3zYN6?fyYdH*LG3hA5>Nc_$!eC@{}gX|e4 zrcL=ts%+MR#&t(pF6$b+IwGpPU;CDcF0%w%;1S(>J5Dodt6Q%9x&G_JZ1$b!emFL< zo;kS;rHd zrhedx;v~@pDIJx)x>FpNFZE0acUA2WY_6{~VEMo5>OsxYMfC+vJ>kzAyN}&Hv{1k2 zWm!aP4ZpYRk302$&jzz|Z}@v#FT!5?pj8>yC$SRUT^^xo)^EEVZhdgw?X=;i$VrB4 zsd)#4%4U@aWk*<7wePU%Xt?*!XY-xs$1Xe0O^RJU%W}#!X|df?%%#MB-!Nkc4E^al zg*R5(cYBE0%$q^6((;P8PN%;k`Y#Dnq+Sdy{ zC}>VRUwcbfJ7{gZNAQiv!^>DprZ-o}P5i&rsk!v2)sO0vi|<)VZmV)GTWVSFT`eV!8VqRnQ=lL4G zk0xhNJf55)ruOF0ThBE`ZyY`r+~`>Ew)EL$#wB|XJ!1G%;?ME#+s-^utB*WNO`+{h z0{O@LLte?AJhbtmT-hYPUh%#OX6?Lrr;B!3S)CU76Jk0w)=)w4=yVx(^~cRw%yPF^ zM@gFAJ7<V7O|-FE|`NxC#i(=|HQdvYF$GQLc7Z;R&=#_HfjcUb5pHm$62)YRUJs9|@n&scFZC<(3 zDQ9kpSu|R|=_}(Zk=|;$X%g!W``~R}-aYfzu}Wplt}SKzv)8LV_Ic?Q{e;lyySXP5 zo=V&)U2ko!EVwE!OLt#YO#IJF>aV)zNw{*bT8E~UoR_faEYwu`Xt;OIhD{ohp0ieN zo0@E!5cRQ;@BcFa#&f%FK3R5rLs5(Pr@5==ot<1SxYc~stOv7p8%IIw7idL zX3xd592Q0F*B<8Wao+6C^KggsOG+dOCK zAFEHU6Q6ftVpw@qez^Wmv$;lMw!w?m9aLGa@%PKTo?qT8e41Bt$MpYyQ1?pv%oZ^kLF-8Q;C|?TEKtXS;u$ z&7L=29lJZzj>cIDEZ%$cUFoI+%H5kTDQFW`)anSb#~8u=WnZV@BLOQ zQqEXq=hd*qUm#qD4w4`??^Np2xtTq1o z^PE|p?#}7cUu&M0&?6G^^X!{n3i8)hH6DKw(`B-7#ypK?`KQM!r^r4nU)HrWxV@vg mn2qcBg&T5$U;nd8Fg(