From 78dae6edea158c560d08a53136f4f05f136b654d Mon Sep 17 00:00:00 2001 From: Paradox Date: Fri, 15 Jul 2011 15:54:23 -0700 Subject: [PATCH] New design for header/top of page toolbar. Updated icons, added mod-mail, and got reddit/subreddit logos working --- .../public/static/compact/havemail-active.png | Bin 0 -> 1342 bytes r2/r2/public/static/compact/havemail.png | Bin 0 -> 975 bytes .../public/static/compact/modmail-active.png | Bin 0 -> 1681 bytes r2/r2/public/static/compact/modmail.png | Bin 0 -> 1460 bytes .../static/compact/newmodmail-active.png | Bin 0 -> 1598 bytes r2/r2/public/static/compact/newmodmail.png | Bin 0 -> 1312 bytes r2/r2/public/static/compact/nomail-active.png | Bin 0 -> 1270 bytes r2/r2/public/static/compact/nomail.png | Bin 0 -> 995 bytes r2/r2/public/static/css/compact.scss | 22 ++++++---- r2/r2/templates/redditheader.compact | 38 +++++++++++++----- 10 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 r2/r2/public/static/compact/havemail-active.png create mode 100644 r2/r2/public/static/compact/havemail.png create mode 100644 r2/r2/public/static/compact/modmail-active.png create mode 100644 r2/r2/public/static/compact/modmail.png create mode 100644 r2/r2/public/static/compact/newmodmail-active.png create mode 100644 r2/r2/public/static/compact/newmodmail.png create mode 100644 r2/r2/public/static/compact/nomail-active.png create mode 100644 r2/r2/public/static/compact/nomail.png diff --git a/r2/r2/public/static/compact/havemail-active.png b/r2/r2/public/static/compact/havemail-active.png new file mode 100644 index 0000000000000000000000000000000000000000..6e9ce5bfeb8369b5acf3fc987c8a695c249e2574 GIT binary patch literal 1342 zcmV-E1;P4>P)twQK);VYPUVD9Ot+Uo%d(?#|u_Zb>Xv$ir zHUNH%Tv?_~F&Z_pS>QLwA0z|eHl;PxCK0_DxDG<;_&A@wB!5mL66*oCkiWfO)Aqco zeE`)JAyg^{wldIEr%C{HDU~q_Nv@brxp1O)(J*^+fK$f^KE4`o5K8?Wt>4)d+183? zokB!s5K=BI2ykiSX2Fw2BW7$&I6=%!-9`P(jY}}*S%RlT&R()W>*Lck+q)voZP;Na z(WKL;TJo0jC3-AU0-iB062>6J#kc54)Jbtu@pk=`#D~ki0WLYC? zMTh8$aJV`gMn+k?f8VDXmOKvcd~`?j_AP`hT1i3M(%^T~*<6&hWQmsT(h2%k;VLZH zAw(W*Z|Crg2OO+xs>Gc!1S}s^i`Cl2R!P9MqD}$_JWmutO|4Z+9_v6*D~c)2&}s=4 zm+&29{I9Jcw;d!F^%~39&5vL$Pc8y-QbrhV4_GKpK6M>vez-KSi5pDQ4kn7|39z;V zj(Q!dNUXR#>8;0Bz-OUzEW7uf0r6Z2EJ$o_MV_;jK=6C;05KgJjFEW#V^kt9V%O{t2H~A`A37ieJ6uMmi{2{~iF3YL5gmMzYdM^8Ga>?br zV}e?4QK*YNHi`|f&}*S<z*(m6(VW(TwW5ZN8^w`)0&v||5?JaMcMn3Fz zhK`sO<)kf#O&V$D8aoJFroMoyErW97Vq44*FfG4~@v(AQUH`;^Nh=jcg4z2aC=mbqj`IEdh7*zCUKWnSW!^Y0Rs$`;fj4XI}duHsR^-H6WCThcu9vnBh_QD$P$XB z98AO=#D@FPICXV!Pv3>JE3&$xxox2P%;i%9y@#Sx7w3+QcI-uUOFJq9+DmXPeRTtH z$sL!M4DShg8=Jld_xcbTCr5_%pYHDyj8)IoJbKE%hL`?1+0%Xd{P(Xc2Ey%bu(H70 zQiAOppi&7Q=okKL>^}Ni=SM#b+10gYIJL0uKM5M}IB(D0ztZ2hFgjwDQ%d27b~$yO z&rI`C8u_4i@GSMe6Ah>p9c7lWcsIM& zdhq;ug4WV6BN;So+fZ?ye%rxL|L?_I~NIzB=6{4uJx|A4)ya(dr-@ZI` zHefOUPW%5AixGM1<&2>X1gFX5iG|5>DS2v-i7?yJ_=G}AxMXiuFIML--b{&!hHtro(jE9zehzFVL%95zmucSAPOWase|XVZ|Q* zwe}mpqcd(DzlLoO_o!|D5;)dn0_XPv&#%wTv1c~N)`D(|0DHnmjo`xf9hcI9;=>df zZ64GE+c~$eXEw*ym`<4XBtgj)IAjXo0yUf6PXJY!=hCcqi|<&mgEIM{Teog}F1bP+ zwInFH0>>$8qerQn6k(JTb4=Um-UESh3Y}a6;C_+=IgvGxup$;}Aj-1nI+tSsFeer} zco#Ufy_zu?%L`Vn*)Z|B<7Ldj(>5D&h~+IO&A}5tY)*VPnk_NAkC|;^^fQ(hOqa7Y zV{Jui&*)^#z|1x=+6ZU$Yakm>-@M;zobJ*OQ4KmB|5ZAN4PdqzBdBvFE>(5xZ0>C6 zvEaq4zEO;srlNk?`)#p8H!zNm21|GK9bF@12)|cnmdRTO(P>cTr7y!oXoG)8av#|gG002ovPDHLkV1je7#4`W@ literal 0 HcmV?d00001 diff --git a/r2/r2/public/static/compact/modmail-active.png b/r2/r2/public/static/compact/modmail-active.png new file mode 100644 index 0000000000000000000000000000000000000000..7b43d287a6981a4f01f2f973a271d4466a0262ce GIT binary patch literal 1681 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 literal 0 HcmV?d00001 diff --git a/r2/r2/public/static/compact/newmodmail.png b/r2/r2/public/static/compact/newmodmail.png new file mode 100644 index 0000000000000000000000000000000000000000..b13f4dd539d040216b91ee22b6b1c41d240520de GIT binary patch literal 1312 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 literal 0 HcmV?d00001 diff --git a/r2/r2/public/static/compact/nomail.png b/r2/r2/public/static/compact/nomail.png new file mode 100644 index 0000000000000000000000000000000000000000..551876b49c1bf7f3aea1687d6a0d966127de4cc9 GIT binary patch literal 995 zcmV<9104K`P)&B_E_{11U&>n5L6IRA-D~;6q}Md z&H1xw{$A?U&T-7HdYz{83t#TN=iKxCe82ac^ZlO7y0*9st;nlK3r&q<)d8!J3YzpO zft<3|>LhEl-$8o6uSYz<;gC&HGnp*REj`{rw<}1OkrU~|B9=V?9fD_YA3^i*u69DHR*eorAd-YkmV$h~(2`;szoIEnDuzHiu2dt&y#pRW zbMUrY)(?rj4CIk(N2#elS&$F*W5%sYaIb*J9TNxyEk{{Pv27lgGlmwNq_nDKeUicC zUbgr`J4L|fL3gK6j&8$6a90OkfWcIo!C1Pxgu+t9B%4j(ZBq%BSw2k-MGUwzU#68ZG&BTevl)CoU#V?-dm9`M2gqcy>h)1& zuTWi`m{v7iuyLtW3VOZ1IFBZi35_X$LZN`^>1l{Yqu_G6KrWY;MO?Y68OtIQm>>wS z+wH}Ocs$;IkyfdSN*A$M3~V;L2*(cAve$6LHk%DbMn-@n>(^zGNCX@Xr#R+6B4*yl zc+p^OMh@G@WaX-+%eUX1Ehfl9%_nky9$6G#DDBSGn1NX(@adBSA+z1v_UeSsVVG6g z$MdslPd-mM6NzNo>hZp9>IY_(z^FK<&nRTC{ei%dpFR#0+eVBx2$wF)Tnjg5Uq-^a z>py>bjyzhA#{<|lW>lq2iCAQOxOn|ZJR1JsaM&S+s!_{lt#k@pZWn}tfsF?X^G`8@ z@m!6Lp7^if%F2uP7e20ST}8=2-bmtL5?s}?*{o|qdE)KT&C44?KKD6lP9FLTgB&=E zF8VE}uV*J1VK)OFIMz)mhx>QYtpVveP7@9PJ0ST?!nPTYjyq=U;s_>e}??V RX7&I8002ovPDHLkV1k3a&3ga< literal 0 HcmV?d00001 diff --git a/r2/r2/public/static/css/compact.scss b/r2/r2/public/static/css/compact.scss index 2ea8da268..eabc0fb04 100644 --- a/r2/r2/public/static/css/compact.scss +++ b/r2/r2/public/static/css/compact.scss @@ -260,18 +260,26 @@ button.button { @include vertical_gradient(#CEE3F8, #A8C4E0); border-bottom: 1px solid #7599BD; border-top: 1px solid #DCEAF7; @include box-sizing(border-box); - padding: 0px 10px 10px; + padding: 0px 10px 10px 0px; +} +#header-img { + width: 90px; + } #topbar > h1 { color: #444; - font-size: 20px; + font-size: 16px; font-weight: bold; text-align: center; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - width: 230px; - margin: 10px auto 0 auto; + width: 100px; + margin: { + left: auto; + right: auto; + top: 26px; + } padding: 0; text-shadow: hsla(0, 100%, 100%, 0.5) 0px 1px 0px, hsla(0, 0%, 0%, 0.1) 0px -1px 0px; } @@ -286,14 +294,14 @@ body[orient="landscape"] > #topbar > h1 { #topbar > .right { position: absolute; right: 6px; - top: 5px; + bottom: 0px; padding: 0 5px; } #topbar > .left { position: absolute; - left: 6px; - top: 5px; + bottom: 2px; padding: 0 5px; + padding-left: 0px; } #topbar > .right > .button { padding-top: 8px; padding-bottom: 3px; diff --git a/r2/r2/templates/redditheader.compact b/r2/r2/templates/redditheader.compact index 58235dde9..957304e22 100644 --- a/r2/r2/templates/redditheader.compact +++ b/r2/r2/templates/redditheader.compact @@ -20,14 +20,16 @@ ## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! - from r2.lib.template_helpers import static + from r2.lib.template_helpers import static, s3_https_if_secure + from r2.models.subreddit import DefaultSR + %> <%namespace file="utils.html" import="plain_link, text_with_js, img_link, separator, logout"/> <% from r2.lib.menus import PageNameNav toolbars = thing.toolbars - nav = "reddit mobile" + nav = "mobile" if toolbars and isinstance(toolbars[0], PageNameNav): nav = toolbars[0] toolbars = toolbars[1:] @@ -35,23 +37,39 @@
- ${plain_link("Home", "/", _sr_path=False, _class ='button')} + <% + header_title = c.site.header_title + if c.site.header and c.allow_styles: + header_img = c.site.header + else: + d = DefaultSR() + header_img = d.header + header_title = d.header_title + %> + ${img_link(c.site.name, s3_https_if_secure(header_img), '/', _id = "header-img-a", img_id = 'header-img', title = header_title)}

${nav}

%if c.user_is_loggedin: <% - mail_img ="mail" if c.have_messages: - mail_img += ".png" mail_img_class = 'havemail' + mail_path = '/message/unread/' else: - mail_img += "gray.png" mail_img_class = 'nohavemail' - mail_img = static(mail_img) - %> - ${img_link(_("messages"), mail_img, path="/message/inbox/", - _id = "mail", _class="button " + mail_img_class)} + mail_path = '/message/inbox/' + %> + ${plain_link('', mail_path, _sr_path=False, _class=mail_img_class, _id='mail')} + %if c.show_mod_mail: + <% + mail_path = '/message/moderator/' + if c.have_mod_messages: + mail_img_class = 'havemail' + else: + mail_img_class = 'nohavemail' + %> + ${plain_link('', mail_path, _sr_path=False, _class=mail_img_class, _id='modmail')} + %endif %endif