From 33068abf00a681ee75746bbaf35611ea016bdbd7 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 5 Feb 2014 15:14:00 +0000 Subject: [PATCH] font updates and further references to verdant removed --- .../css/components/formatters.less | 4 +- .../wagtailadmin/css/components/forms.less | 12 +-- .../wagtailadmin/css/components/icons.less | 26 ++++-- .../wagtailadmin/css/components/listing.less | 15 +++- .../static/wagtailadmin/css/core.less | 42 +++++++--- .../wagtailadmin/css/fonts/verdant.woff | Bin 7716 -> 0 bytes .../css/fonts/{verdant.eot => wagtail.eot} | Bin 12088 -> 12976 bytes .../css/fonts/{verdant.svg => wagtail.svg} | 7 +- .../css/fonts/{verdant.ttf => wagtail.ttf} | Bin 11924 -> 12812 bytes .../wagtailadmin/css/fonts/wagtail.woff | Bin 0 -> 8260 bytes .../wagtailadmin/css/layouts/login.less | 11 --- .../wagtailadmin/css/layouts/page-editor.less | 4 +- .../static/wagtailadmin/css/variables.less | 2 +- .../wagtailadmin/account/account.html | 4 +- .../wagtailadmin/account/change_password.html | 4 +- .../templates/wagtailadmin/base.html | 4 +- .../templates/wagtailadmin/home.html | 2 +- .../templates/wagtailadmin/login.html | 78 +++++++++--------- 18 files changed, 119 insertions(+), 96 deletions(-) delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff rename wagtail/wagtailadmin/static/wagtailadmin/css/fonts/{verdant.eot => wagtail.eot} (75%) rename wagtail/wagtailadmin/static/wagtailadmin/css/fonts/{verdant.svg => wagtail.svg} (92%) rename wagtail/wagtailadmin/static/wagtailadmin/css/fonts/{verdant.ttf => wagtail.ttf} (76%) create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.woff diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less index 18b3299df..144876613 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less @@ -1,5 +1,3 @@ - - .avatar{ .border-radius(100%); position:relative; @@ -139,7 +137,7 @@ &:before{ - font-family:verdant; + font-family:wagtail; display:inline-block; color:white; content:"u"; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less index c04080e86..e84a61582 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less @@ -87,7 +87,7 @@ input[type=radio]{ input[type=radio]:before{ .border-radius(100%); - font-family: verdant; + font-family: wagtail; font-style: normal; text-align:center; position:absolute; @@ -116,7 +116,7 @@ input[type=checkbox]{ } input[type=checkbox]:before{ - font-family: verdant; + font-family: wagtail; font-style: normal; text-align:center; position:absolute; @@ -129,7 +129,7 @@ input[type=checkbox]:before{ height:20px; background-color:white; border:1px solid @color-grey-4; - color:#EEE; + color:@color-grey-4; } input[type=checkbox]:checked:before{ color:@color-teal; @@ -430,7 +430,7 @@ ul.inline li:first-child, li.inline:first-child{ &:before{ vertical-align:middle; - font-family:verdant; + font-family:wagtail; content:""; position:relative; display:block; @@ -543,7 +543,7 @@ ul.inline li:first-child, li.inline:first-child{ } .ui-icon-close:before{ - font-family:verdant; + font-family:wagtail; display:block; color:@color-grey-3; content:"g"; @@ -581,7 +581,7 @@ ul.inline li:first-child, li.inline:first-child{ position:absolute; left:0.5em; top:1em; - font-family:verdant; + font-family:wagtail; content:"f"; font-size:25px; color:@color-grey-3; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less index 98e335c94..1fe2f5c1a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less @@ -1,13 +1,20 @@ @font-face { - font-family: "verdant"; - src:url("@{css-root}fonts/verdant.eot"); - src:url("@{css-root}fonts/verdant.eot?#iefix") format("embedded-opentype"), - url("@{css-root}fonts/verdant.ttf") format("truetype"), - url("@{css-root}fonts/verdant.svg#verdant") format("svg"), - url("@{css-root}fonts/verdant.woff") format("woff"); + font-family: "wagtail"; + src:url("@{css-root}fonts/wagtail.eot"); + src:url("@{css-root}fonts/wagtail.eot?#iefix") format("embedded-opentype"), + url("@{css-root}fonts/wagtail.ttf") format("truetype"), + url("@{css-root}fonts/wagtail.svg#wagtail") format("svg"), + url("@{css-root}fonts/wagtail.woff") format("woff"); font-weight: normal; font-style: normal; } +/* fix to make chrome on windows use svg, which renders better */ +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'wagtail'; + src: url("@{css-root}fonts/wagtail.svg#wagtail") format("svg"), + } +} .icon.teal{ color:@color-teal; @@ -21,7 +28,7 @@ .hallotoolbar [class^="icon-"], .hallotoolbar [class*=" icon-"]:before, .hallotoolbar [class^="icon-"]:before{ - font-family: "verdant"; + font-family: "wagtail"; font-style: normal; font-weight: normal; font-variant: normal; @@ -146,9 +153,12 @@ .icon-snippet:before { content: "D"; } -.icon-verdant:before { +.icon-wagtail:before { content: "V"; } +.icon-wagtail-inverse:before { + content: "0"; +} .icon-bold:before{ content:"C"; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less index c008ec9f2..9a94a2230 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less @@ -162,10 +162,20 @@ ul.listing{ .actions{ margin-top:1.5em; + li{ + border-color:@color-teal-darker; + } a{ color:white; } } + .button{ + background-color:@color-teal-darker; + + &:hover{ + background:@color-teal-dark; + } + } } @@ -200,7 +210,6 @@ ul.listing{ a{ color:inherit; text-decoration:none; - display: block; &:hover{ color:@color-link; @@ -210,7 +219,7 @@ ul.listing{ } .actions{ - margin-top:0.5em; + margin-top:0.8em; text-transform:uppercase; font-size:0.85em; @@ -220,7 +229,7 @@ ul.listing{ li{ display:inline-block; - padding:0 0.5em; + padding:0 0.5em 0 0.8em; border-left:1px solid @color-grey-3; line-height:1em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less index e039b3673..df4a9940e 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less @@ -13,7 +13,7 @@ @import "components/formatters.less"; html{ - background:url(~"@{static-root}bg-body.svg"); + background:@color-grey-4; //url(~"@{static-root}bg-body.svg"); height:100%; } @@ -41,7 +41,7 @@ h1{ font-size:1.5em; text-transform:uppercase; color:@color-grey-1; - font-weight:700; + font-weight:600; span{ text-transform:none; @@ -128,13 +128,14 @@ img{ text-align:center; text-decoration:none; color:white; - opacity:0.4; + opacity:0.8; em{ - font-family: verdant; + display:block; + font-family: wagtail; font-style: normal; font-size:7.7em; - line-height:1em; + line-height:1.2em; } span{ display:none; @@ -194,6 +195,11 @@ img{ .menu-explorer &.menu-explorer{ background:#222; + a{ + color:white; + } + + /* &:after{ content: " "; width: 0px; @@ -205,6 +211,7 @@ img{ border: 0.7em solid #fff; border-color: transparent #fff transparent transparent; } + */ } } @@ -384,6 +391,11 @@ header{ h1, h2{ margin:0; + color:white; + } + + h1{ + line-height:1.7em; } .left, .right{ @@ -403,6 +415,7 @@ header{ margin-right:2em; } .search-bar input{ + .border-radius(3px); width:auto; border-width:0; } @@ -421,9 +434,17 @@ header{ &.merged.no-border{ padding-bottom:0; } + /* &.hasform h1{ margin-top:0.2em; } + */ + .button{ + background-color:@color-teal-darker; + &:hover{ + background-color:@color-teal-dark; + } + } } .page-explorer header{ @@ -494,7 +515,7 @@ footer{ .clearfix(); font-size:0.85em; - margin-top:1em !important; + margin-top:1.5em !important; li { display: block; @@ -537,7 +558,7 @@ footer{ } &:hover { - background: @color-teal; + background: @color-teal-darker; a{ color:white; @@ -545,7 +566,7 @@ footer{ } } &:hover:after { - border-left-color: @color-teal; + border-left-color: @color-teal-darker; } &:first-child { @@ -555,6 +576,7 @@ footer{ &:before{ display:none; width:1em; + } a { width:2em; @@ -562,6 +584,7 @@ footer{ &:before{ line-height:1em; font-size:1.7em; + line-height:0.95em; } } } @@ -700,11 +723,10 @@ footer, .logo{ margin-bottom:1em; img{ - border:0; + border:2px solid white; } a{ padding:0 0 1em 0; - border-bottom:1px solid rgba(200,200,200,0.1); } &:before{ color:@color-grey-2; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff deleted file mode 100644 index 201ef286ff23b7e20e749e40cbac3f9289b9bb0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7716 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 AH~;_u diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.eot similarity index 75% rename from wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot rename to wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.eot index d4735a5411ef48dfbd5857041c45f7dc385ae1a3..f6d4d3e2559bc26f8ca7975088c03c4b030fc9c2 100644 GIT binary patch delta 1719 zcmZuxU1(fI6h3EW?##WLWH+1LyPK@rWSg|RX_HO%@7|l%G~0q&rD8=vl30J1G^Ulr zhPIH{2NzVVFBaPi7Hn(9ClR61indS?eG)3fH=(7)+7}-b^g-}JiDzcxPsBUSIdgvI zoVn*aoGVYS%*vGtKzrr1^hM(2?V;1VlO0RYfH^o$^f1hyZj}F{xR{z*_~2E5^3MQ} z-Fx5t55O!)lD{E2xBv0c%KqyIJ_o=_lAoAaXe^%n=-jseY>;$c&NYrLuB`zl|F6hy z&&|L1+#j0~?*NEr0frtuG}}11w*SG8!*1NvJRq;oofYz1og-BVw^1u#lJ_{!puW5*SjhbT{t>}LRp(jK~fGVx4o{8wmWqySj$ z<~RT0YikUQ-qtMq1dBKpeveOLDV$(SGXOCdhOICHA!KNW5Wqp&^r-cnHF*H8kw$0C zf`E64M?go^p-V6gC#VAYE5ROUn6ol6-3UARw!|=H7$s{Ne5gPbYT$(r^D-90m-rY4 z;b%M-86FuemHkS!=7o27FBZ>;yFI5me~4$|r@FRuO?G|Qbt7RXt|iaA?*m-^P5jb# zd1~wHswwEjb-aLIfPy~ghYM5|sqzIsNTo}Kyvhd?*oR(zK*lgob*uz_P>31k)6uWe zuA@2DS&MOEW#99ITHt#%qBXDPnbR%|(n&?jZBgkqr7M%Pl`PXzGRBAyQ{2W zNM$_Aq-3a+u+t-U+{xHZG*RnW>Yo_ee4^U7IpbbpiYZ4hX)$g|)+wZ5$hktskRh6F zm=@4NY--N9rsmUb>0|l$_HWNGBL+wUKk=Lc1VqYCDR>J$g{uUjn{=hCOY52{YDQ%Ugj zueQWG*2*n-D;}ZQa%thJ5%q$BWKhWKMOmU&4Bd2~Qst`Yg;A^qUSYkPG>R_ukT+0J zCQRDxFXWpV+O(feDOtxfPV2wZMWRxepA-@u!I|o?JEE$~ibO;kbK2uvNv<_^hxR0- z2`PQWTs7CJKAI!SBmJ0Vm@Mqr6v<|LGp>|4_z2<{Zo7DIshP0GF+hjvZ#%j1^SHfA zw!ss*zS@9`ywgcXQ;~@tcNDYfUfd%M78XkG5EdE)lT%YJY7>m zWHWRk$bQ;~xa^#zR=YbMC=pFj`$X?4wB;x3>}qdscx(9W)Q0H|u+*44-Z(rTzERxS zv(c1;osa_$ickr^D`vN^d**iLykezTDe1Yn@y6f5@+0})|2NSXGxIadu~fLiEgGM% xjZB4iMv@QhfJAG^(ZFM7I7UhCHaabH>T0BMxgNoIz}LIpTh$&krf>Yk{{$L|^}+xE delta 841 zcmZuvUr1A76#sqq-rcRgbDP^lH@#_Uk@s$Q?w@9%P)1J<|4}K)Wlp1X8#+wwK`N+- zAmx*gpnB~sLy3r>B=AK@2&{)9C=BYYq6mCwooiAU-NU)(JO94l`OZ1BsfQ=!cmSBz zrsSyPU0TRbH5Tp|K?+0Yg@H73Q-=PJ;f^O+(K-%jqX2wI4jpc$Sef)=q$@3Lfl$kv z?k4~<_0Hs=k-Z-7dkYAA$o8n;7|!PN5Gg)Eep~;*Sl^khb3Xy89jN|zDrNNMrO$VH z5%W*Hu>7E$S&ADO$RrKR2YVwRu9BV|G)A*H&m!cHldhzV!PJ$+gEgS0fovDEncvo$d_&iftjK61Htcf2K&UTp< z+fjo`Xy7O&=7^cu=6lxJw~hnMlV&3NAYq22jp#Sv35?VG&94c@#)&H9MdDtUiU5Mp z5h9FQgb_iMw~IQ{_$4vU70JPu#e%JBAgG6GYQvEz|0I?QS_yYZm&t46Gg6y7Sg`0& z9IcK;XSZ|Gx$1Jd8eQM!B+Hkw35Epf*nPH)T|i|tM&u1zWvlEBSIE^>k*aEwVji!@ zTj=&!SpgF(5``WmyHgZInK6OcG%dmW`#Q@6_E@yv^UJK{^sVx8iCF|@^|4KvH` zqZgRC#cYWAU^jcmUZWIAU{0zWv+|DM4bP?xqv588dX03BGrhiNvr9oe6vUxYQ&eh; z*_<%YoJr@JGei9;C8PzFdS&ARI>l984Fz?I*?iF-jGKB@@&8?B!Th#ZMiXDtkGty# isN0+XO*l?v>_-C*@PUw@MfufG@pf9A6-qG|Xyq3k!n;oZ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.svg similarity index 92% rename from wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg rename to wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.svg index 846f02b7a..8e1ece714 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.svg @@ -3,8 +3,8 @@ Generated by Fontastic.me - - + + @@ -48,7 +48,6 @@ - @@ -59,4 +58,6 @@ + + diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.ttf similarity index 76% rename from wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf rename to wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.ttf index acf206c5956906d535e838d22bcff6927aa65037..d3ba6a5251d7e2d2952b8391325148e2f440368d 100644 GIT binary patch delta 1689 zcmZ`(U1(fI6h3EW?##WLpUr0XX3ch!-DK0<{B5#7_a{k{tOZSlq7Al4TU&HVV$zbd zp$#PVWu*!VN|9c%P+Rq}h)}gC7K)-zLLcgzkg5;*qEJB}d{gR~yFtu@Gt8Vh|1;-1 z%v&elSZn|SKpVUS9Omcdjy!pK?SoeU%D;GMFW1knKYU1$p!^N#&E?e>U--Kx{w{!c9$;jCWvRaS@X!;V zknVe0-pa~Sqb^E}956wGft9t5t;h-aIq@G6zqNXHp`Je0L1+Ge_;YLZt#!DFF6k$T z&z`BTE$y$}`vG8_Z1Cmvv*$Mymn(DuhxC`j$I$~vetb3lTy*+RXkjD#UQ0r;>;i!QOV(qUYHJ0#KNOM`&-iAKN#MiZa} z$Ke8%LXQ&chkAHcAx|E`DjSNAQigHTmcfGxRKWo^xWUR;47SG*}neV zz}|deaAr_Ii@&(WDN|p+FmG@^cgKj=2qv)#| zR(#JdL_^}y(W}y`VR)>uCgDWNp6mIJ@3{``j_bJLX$JjdLeaFFyR;k9mI+!)mT4*( zWwa6DA<;+GuVgOd%6N`R$xta_CdbT}l`^gNxYNDaKReQQp_=JS**BSD$`VW(j2n`5 z2q_qHu8=Wgh~Wx}X3#)vXv((}WbQ7OVl3W=8BOtqP9?W)s=L_`a- zT4P*Et|exhwj`tpDeV%vhVE1!O%dhUeoQk=6efEj>2z<(mJ$b_LY%;%_x6<)04_0EM!S7p?{ zg8GIG=|YSV%%qc2XoQ92QUf0b2~ni~MhL?&bW7-EFxkou^yO{Dm}qf3J!i61XlxKM;jFkMU!?^tH1vTm_btd#U;y4&O5U>A$| z|I715F-QOEPsL;14xFIq9`))3W!eYRFawhir+;vMtOxzz%vh?GzT|EF-)Z^}0~_t1 delta 822 zcmZuvUr1A76#sqqZg=xv`{%aQnKw08>bASNe=ZG$Gp@JKub4v3CXx zKmlgKBih>9d1k1heHw62Qq*zkWJ@bz5D1?mEVgxcd~KUO&j6<4uKuK)y6GSI2yjO! z_GC~VPh~Qs1b38p{owG_z@_f1e*jG<;QX41%dw2++XLb@X$2FB_>8QPI7(oJ6sSxj z)04UHw7&^25uO+x?U%J*3{3#PML3m|CsVk_0>p<2iz9L}ek1yL2dHhJ*j#FKJT1Hw z76I3D;uo^bQG=Nmuk9BN4L^~`Q5bmpV`F{Sa~tcoSR)H5Cs;RYR_?MZEUFkeYl})# zUD@Tx>Hv=jsn_Lz26xEo$#w-VV450Nzh=mLJ1R&?bH^+$cp$+GA8JttKLQ9UOPrUv zmCsyQndMDN4R5S=c_go|w$2|2W@W%@w1Q5bW6aIVFF0T@nJtA@oBd!>vAaaM%+FC; zzOv1CSS91CNi?;aR?R);1@o50Y-zG=uk>lYm(4IlQO}my8V&FbQoQEy7U2`l@=KHw1gft9|>DV?(Hxow+39Aos3WQ-t9Q;m oqs{;!`cnkQ(SSzfmABLxq}gir`k>j-4sROouc@Bi%lm)+FTSm>aR2}S diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.woff new file mode 100644 index 0000000000000000000000000000000000000000..b53396b99edc18813604ef73e752a0bac5d003e5 GIT binary patch literal 8260 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 ZUiCYe0243x|IJSk=vc)6k~JOx^*{SJtH}TW literal 0 HcmV?d00001 diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/login.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/login.less index 2dca4f3f7..82a2631a1 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/login.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/login.less @@ -21,17 +21,6 @@ h1{ color:white; text-transform: none; white-space: nowrap; - - span{ - color:white; - font-weight:normal; - font-family:verdant; - font-size:1.8em; - line-height:1em; - display:inline-block; - margin:0 -0.3em; - vertical-align: -15%; - } } form{ width:100%; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less index 6914e3c6d..4c1348131 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less @@ -60,7 +60,7 @@ > h2, &.single-field label{ -webkit-font-smoothing: auto; - background:@color-grey-3 url(~"@{static-root}bg-light-diag.svg"); + background:@color-grey-3; text-transform:uppercase; padding:0.9em 0 0.9em 4em; font-size:0.95em; @@ -76,7 +76,7 @@ .box-shadow(0 0 7px 0 rgba(0,0,0,0.4)); &:before{ - font-family:verdant; + font-family:wagtail; text-transform:none; content:"q"; text-align:center; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less b/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less index 486aac27c..12069953b 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/variables.less @@ -28,7 +28,7 @@ @color-grey-5: #fafafa; @color-thead-bg: @color-grey-5; -@color-header-bg: #ff6a58; +@color-header-bg: @color-teal; // #ff6a58; @color-fieldset-hover: @color-grey-5; @color-input-border: @color-grey-3; @color-input-focus: #f4fcfc; diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html index 93326b3ac..ce1a176ee 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html @@ -1,9 +1,7 @@ {% extends "wagtailadmin/base.html" %} {% block content %} -
-

Account

-
+ {% include "wagtailadmin/shared/header.html" with title="Account" %}
    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html index f3ae9b510..04fb708e5 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html @@ -1,9 +1,7 @@ {% extends "wagtailadmin/base.html" %} {% block content %} -
    -

    Change password

    -
    + {% include "wagtailadmin/shared/header.html" with title="Change password" %}
    {% if can_change_password %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/base.html index a0b028a63..1b2ae7ccf 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/base.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/base.html @@ -2,10 +2,10 @@ {% load wagtailadmin_nav %} {% block furniture %} -
    Menu
    +
    Menu
    - + {% main_nav %}
    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html index bcd68d2e0..870dc252d 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html @@ -14,7 +14,7 @@
    {% if user.email %}
    -
    +
    {% endif %}
    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html index 31c087942..f292ac9c6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html @@ -10,48 +10,46 @@ {% endblock %} {% block furniture %} -
    -
    - {% csrf_token %} - -

    Sign in to Verdant

    + + {% csrf_token %} + +

    Sign in to Wagtail

    - {% if form.errors %} -
    -
      -
    • Your username and password didn't match. Please try again.
      • -
    + {% if form.errors %} +
    +
      +
    • Your username and password didn't match. Please try again.
      • +
    +
    + {% endif %} + +
      +
    • +
      + {{ form.username.label_tag }} + {{ form.username }}
      - {% endif %} - -
        -
      • -
        - {{ form.username.label_tag }} - {{ form.username }} +
        • +
      • +
        + {{ form.password.label_tag }} + {{ form.password }} +
        + {% if show_password_reset %} +

        Forgotten it?

        + {% endif %} +
        • + {% comment %} + Removed until functionality exists +
      • +
        +
        • -
      • -
        - {{ form.password.label_tag }} - {{ form.password }} -
        - {% if show_password_reset %} -

        Forgotten it?

        - {% endif %} -
        • - {% comment %} - Removed until functionality exists -
      • -
        - -
        -
        • - {% endcomment %} -
      • - -
        • -
      -
      • -
    + {% endcomment %} +
  • + +
    • +
+ {% endblock %} \ No newline at end of file