Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 09:13:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

font updates and further references to verdant removed

Browse source
This commit is contained in:
Dave Cranwell 2014-02-05 15:14:00 +00:00
parent 7d67a7bac5
commit 33068abf00
18 changed files with 119 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wagtail/wagtailadmin/static/wagtailadmin/css/components/formatters.less
View file

@ -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";

12
wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
View file

@ -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;

26
wagtail/wagtailadmin/static/wagtailadmin/css/components/icons.less
View file

@ -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";
}

15
wagtail/wagtailadmin/static/wagtailadmin/css/components/listing.less
View file

@ -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;

42
wagtail/wagtailadmin/static/wagtailadmin/css/core.less
View file

@ -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;

BIN
wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot → wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.eot
View file

Binary file not shown.

7
wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.svg → wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.svg
View file

@ -3,8 +3,8 @@
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by Fontastic.me</metadata>
<defs>
<font id="verdant" horiz-adv-x="512">
<font-face font-family="verdant" units-per-em="512" ascent="480" descent="-32"/>
<font id="wagtail" horiz-adv-x="512">
<font-face font-family="wagtail" units-per-em="512" ascent="480" descent="-32"/>
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#97;" d="M239 256c0 19-7 35-20 48c-13 14-29 20-48 20c-19 0-35-6-49-20c-13-13-20-29-20-48c0-19 7-35 20-48c14-14 30-20 49-20c19 0 35 6 48 20c13 13 20 29 20 48z m205-137c0 10-4 18-10 24c-7 7-15 11-24 11c-10 0-18-4-24-11c-7-6-11-14-11-24c0-9 4-17 10-24c7-6 15-10 25-10c9 0 17 4 24 10c6 7 10 15 10 24z m0 274c0 9-4 17-10 24c-7 6-15 10-24 10c-10 0-18-4-24-10c-7-7-11-15-11-24c0-10 4-18 10-25c7-6 15-10 25-10c9 0 17 4 24 10c6 7 10 15 10 25z m-103-113l0-49c0-2 0-4-2-5c-1-2-2-3-4-3l-41-6c-2-7-5-13-9-21c6-8 14-18 24-30c2-2 2-4 2-6c0-2 0-4-2-5c-4-5-11-13-22-24c-10-10-17-16-21-16c-2 0-3 1-5 2l-31 24c-6-3-13-6-20-8c-2-19-4-33-7-41c-1-5-3-7-8-7l-49 0c-2 0-4 1-5 2c-2 2-3 3-3 5l-6 41c-6 2-13 4-20 8l-32-24c-1-1-3-2-5-2c-2 0-4 1-6 3c-25 23-38 37-38 42c0 2 1 4 2 5c2 3 5 8 11 14c5 7 9 13 12 17c-4 8-7 15-9 22l-41 6c-1 0-3 1-4 3c-1 1-2 3-2 5l0 49c0 2 1 4 2 5c1 2 3 3 4 3l41 6c2 7 5 13 9 21c-6 8-14 18-24 30c-1 2-2 4-2 6c0 2 1 4 2 5c4 5 11 13 22 24c11 10 18 16 21 16c2 0 4-1 6-2l30-24c6 3 13 6 21 8c2 19 4 33 6 41c1 5 4 7 8 7l49 0c2 0 4-1 6-2c1-2 2-3 2-5l7-41c6-2 12-4 20-8l31 24c1 1 3 2 5 2c2 0 4-1 6-3c26-23 38-37 38-42c0-2 0-4-1-5c-3-3-6-8-12-15c-5-6-9-12-12-16c4-8 7-16 9-22l41-6c2 0 3-1 4-3c2-1 2-3 2-5z m171-142l0-37c0-3-13-6-40-8c-2-5-5-10-8-14c9-20 14-33 14-37c0-1 0-1-1-2c-22-13-33-19-33-19c-2 0-6 4-13 13c-6 8-11 14-13 18c-4-1-7-1-8-1c-2 0-5 0-8 1c-3-4-8-10-14-18c-7-9-11-13-13-13c0 0-11 6-33 19c0 1-1 1-1 2c0 4 5 17 14 37c-3 4-6 9-8 14c-27 2-40 5-40 8l0 37c0 3 13 6 40 8c2 6 5 10 8 14c-9 20-14 33-14 37c0 1 1 1 1 2c1 0 4 2 10 5c5 3 10 6 15 9c5 3 8 5 8 5c2 0 6-5 13-13c6-8 11-14 14-18c3 1 6 1 8 1c1 0 4 0 8-1c9 13 17 23 24 30l2 1c0 0 11-7 33-19c1-1 1-1 1-2c0-4-5-17-14-37c3-4 6-8 8-14c27-2 40-5 40-8z m0 273l0-37c0-3-13-6-40-8c-2-5-5-10-8-14c9-20 14-33 14-37c0-1 0-1-1-2c-22-13-33-19-33-19c-2 0-6 4-13 13c-6 8-11 14-13 18c-4-1-7-1-8-1c-2 0-5 0-8 1c-3-4-8-10-14-18c-7-9-11-13-13-13c0 0-11 6-33 19c0 1-1 1-1 2c0 4 5 17 14 37c-3 4-6 9-8 14c-27 2-40 5-40 8l0 37c0 3 13 6 40 8c2 6 5 10 8 14c-9 20-14 33-14 37c0 1 1 1 1 2c1 0 4 2 10 5c5 4 10 7 15 9c5 3 8 5 8 5c2 0 6-4 13-13c6-8 11-14 14-18c3 1 6 1 8 1c1 0 4 0 8-1c9 13 17 23 24 30l2 1c0 0 11-7 33-19c1-1 1-1 1-2c0-4-5-17-14-37c3-4 6-8 8-14c27-2 40-5 40-8z"/>
@ -48,7 +48,6 @@
<glyph unicode="&#78;" d="M479 311c0-10-4-19-11-26l-186-186c-7-7-16-11-26-11c-10 0-19 4-26 11l-186 186c-7 7-11 16-11 26c0 10 4 19 11 26l21 21c8 7 17 11 26 11c11 0 19-4 26-11l139-139l139 139c7 7 15 11 26 11c9 0 18-4 26-11l21-21c7-8 11-16 11-26z"/>
<glyph unicode="&#79;" d="M158 256c-29-1-52-12-71-34l-35 0c-15 0-27 3-37 11c-10 7-15 17-15 31c0 63 11 94 33 94c1 0 5-1 12-5c6-4 15-8 26-12c10-3 21-5 31-5c12 0 24 2 36 6c-1-7-1-13-1-18c0-24 7-47 21-68z m286-170c0-21-7-38-20-50c-13-13-30-19-51-19l-234 0c-21 0-38 6-51 19c-13 12-20 29-20 50c0 10 1 19 1 28c1 9 2 18 4 29c2 10 4 20 7 29c3 9 7 17 11 26c5 8 11 15 17 21c6 6 14 11 23 15c9 3 19 5 30 5c1 0 5-2 11-6c6-4 12-8 19-13c8-4 17-9 29-12c12-4 24-6 36-6c12 0 24 2 36 6c12 3 21 8 29 12c7 5 13 9 19 13c6 4 10 6 11 6c11 0 21-2 30-5c9-4 17-9 23-15c6-6 12-13 17-21c4-9 8-17 11-26c3-9 5-19 7-29c2-11 3-20 4-29c0-9 1-18 1-28z m-273 341c0-19-7-35-20-49c-14-13-30-20-49-20c-18 0-35 7-48 20c-13 14-20 30-20 49c0 19 7 35 20 48c13 13 30 20 48 20c19 0 35-7 49-20c13-13 20-29 20-48z m187-103c0-28-10-52-30-72c-20-20-44-30-72-30c-28 0-52 10-72 30c-20 20-30 44-30 72c0 29 10 53 30 73c20 20 44 30 72 30c28 0 52-10 72-30c20-20 30-44 30-73z m154-60c0-14-5-24-15-31c-10-8-22-11-37-11l-35 0c-19 22-42 33-71 34c14 21 21 44 21 68c0 5 0 11-1 18c12-4 24-6 36-6c10 0 21 2 31 5c11 4 20 8 26 12c7 4 11 5 12 5c22 0 33-31 33-94z m-34 163c0-19-7-35-20-49c-13-13-30-20-48-20c-19 0-35 7-49 20c-13 14-20 30-20 49c0 19 7 35 20 48c14 13 30 20 49 20c18 0 35-7 48-20c13-13 20-29 20-48z"/>
<glyph unicode="&#80;" d="M375 256c0-7-3-12-9-16l-156-91c-3-2-6-3-9-3c-3 0-6 1-9 3c-6 3-9 9-9 16l0 182c0 7 3 13 9 16c6 4 12 4 18 0l156-91c6-4 9-9 9-16z m36 0c0 28-7 54-20 78c-14 24-33 43-57 57c-24 13-50 20-78 20c-28 0-54-7-78-20c-24-14-43-33-57-57c-13-24-20-50-20-78c0-28 7-54 20-78c14-24 33-43 57-57c24-13 50-20 78-20c28 0 54 7 78 20c24 14 43 33 57 57c13 24 20 50 20 78z m64 0c0-40-9-77-29-110c-20-34-46-60-80-80c-33-20-70-29-110-29c-40 0-77 9-110 29c-34 20-60 46-80 80c-20 33-29 70-29 110c0 40 9 77 29 110c20 34 46 60 80 80c33 20 70 29 110 29c40 0 77-9 110-29c34-20 60-46 80-80c20-33 29-70 29-110z"/>
<glyph unicode="&#86;" d="M272 188c8 26 30 235 161 227c0 0-173-115-159-358c0 10-8-4-11 11c-10 42 17 265-183 394c-13 8 139-29 190-243c0-2 2-12 1-16c0-16 0-17 1-15z"/>
<glyph unicode="&#81;" d="M238 366c0 15-6 28-16 39c-11 10-24 16-39 16c-15 0-28-6-39-16c-11-11-16-24-16-39c0-8 2-16 5-24c-7 4-15 5-23 5c-16 0-28-5-39-16c-11-10-16-23-16-38c0-16 5-29 16-39c11-11 23-16 39-16c15 0 28 5 39 16c10 10 16 23 16 39c0 8-2 15-6 23c8-3 16-5 24-5c15 0 28 5 39 16c10 11 16 23 16 39z m243-201c0-4-5-10-14-19c-9-10-16-14-19-14c-2 0-4 1-8 4c-4 3-7 6-11 10c-3 3-6 7-11 11c-4 5-6 7-7 8l-27-28l63-63c5-5 8-12 8-19c0-8-4-16-11-23c-8-8-15-11-23-11c-8 0-15 2-20 8l-192 191c-33-25-68-37-104-37c-31 0-56 10-76 29c-19 20-29 45-29 76c0 30 9 60 27 89c18 30 42 53 71 71c29 18 59 27 89 27c31 0 57-9 76-29c20-19 30-45 30-76c0-36-13-70-38-104l102-101l27 27c-1 1-3 3-7 7c-5 4-9 8-12 11c-3 3-6 7-9 10c-3 4-5 7-5 9c0 3 5 9 14 18c9 10 16 14 19 14c2 0 5-1 7-2c1-2 5-6 13-13c7-7 15-15 23-23c8-8 16-16 25-24c8-9 15-16 21-23c5-6 8-10 8-11z"/>
<glyph unicode="&#121;" d="M392 142c70-24 105-45 105-62c0 0 0-54 0-54c0 0-241 0-241 0c0 0-241 0-241 0c0 0 0 54 0 54c0 17 35 38 105 62c32 12 54 24 65 36c12 12 18 28 18 48c0 8-4 16-12 25c-7 10-12 22-16 38c-1 4-2 7-5 9c-2 2-4 3-7 4c-2 1-4 4-7 9c-2 5-4 12-4 22c0 5 0 10 2 13c2 4 3 6 5 6c0 0 2 2 2 2c-3 17-5 32-6 45c-2 19 5 38 21 58c15 19 42 29 80 29c38 0 65-10 81-29c16-20 22-39 20-58c0 0-6-45-6-45c6-2 9-10 9-21c0-10-2-17-4-22c-3-5-5-8-7-9c-3-1-5-2-7-4c-3-2-4-5-5-9c-3-17-8-29-16-38c-8-9-12-17-12-25c0-20 6-36 18-48c12-12 34-24 65-36"/>
<glyph unicode="&#82;" d="M440 389l-188 0c-10 12-20 25-23 28c-2 6-8 10-14 10l-75 0c-5 0-9-3-13-6l-25-32l-30 0c-16 0-28-13-28-28l0-248c0-15 12-28 28-28l368 0c16 0 28 13 28 28l0 248c0 15-12 28-28 28z"/>
@ -59,4 +58,6 @@
<glyph unicode="&#88;" d="M365 141c1-4 1-7-2-10l-100-110c-1-2-4-3-6-3c-3 0-5 1-7 3l-101 110c-3 3-3 6-2 10c2 3 5 5 8 5l64 0l0 357c0 3 1 5 3 6c2 2 4 3 7 3l54 0c3 0 5-1 7-3c2-1 3-3 3-6l0-357l64 0c4 0 6-2 8-5z"/>
<glyph unicode="&#89;" d="M365 371c-2-3-5-5-8-5l-64 0l0-357c0-3-1-5-3-6c-2-2-4-3-7-3l-54 0c-3 0-5 1-7 3c-2 1-3 3-3 6l0 357l-64 0c-4 0-6 2-8 5c-1 4-1 7 2 10l100 110c1 2 4 3 6 3c3 0 5-1 7-3l101-110c3-3 3-6 2-10z"/>
<glyph unicode="&#90;" d="M201 302l0-165c0-3-1-5-2-6c-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3c-2 1-2 3-2 6l0 165c0 2 0 5 2 6c2 2 4 3 7 3l18 0c3 0 5-1 7-3c1-1 2-4 2-6z m73 0l0-165c0-3-1-5-2-6c-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3c-1 1-2 3-2 6l0 165c0 2 1 5 2 6c2 2 4 3 7 3l18 0c3 0 5-1 7-3c1-1 2-4 2-6z m73 0l0-165c0-3 0-5-2-6c-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3c-1 1-2 3-2 6l0 165c0 2 1 5 2 6c2 2 4 3 7 3l18 0c3 0 5-1 7-3c2-1 2-4 2-6z m37-207l0 271l-256 0l0-271c0-4 1-8 2-12c1-3 3-6 4-7c2-2 3-3 3-3l238 0c0 0 1 1 3 3c1 1 3 4 4 7c1 4 2 8 2 12z m-192 307l128 0l-14 34c-1 1-3 2-5 3l-90 0c-2-1-4-2-5-3z m265-9l0-18c0-3-1-5-2-7c-2-1-4-2-7-2l-27 0l0-271c0-16-5-30-14-41c-9-12-20-17-32-17l-238 0c-12 0-23 5-32 16c-9 11-14 25-14 41l0 272l-27 0c-3 0-5 1-7 2c-1 2-2 4-2 7l0 18c0 3 1 5 2 7c2 1 4 2 7 2l88 0l20 48c3 7 8 13 16 18c7 5 15 7 22 7l92 0c7 0 15-2 22-7c8-5 13-11 16-18l20-48l88 0c3 0 5-1 7-2c1-2 2-4 2-7z"/>
<glyph unicode="&#86;" d="M370 400c0-4-3-8-8-8c-4 0-8 4-8 8c0 5 4 8 8 8c5 0 8-3 8-8m3-76c0 0-11 50-77 37c-6 23-5 40 9 55c20 21 52 10 52 10l0 17c-11 5-22 6-33 6c-43 0-67-32-77-54l-119-219l34 6l-62-119l43 8l33 93c93 0 213 34 197 160m40 42l-26 26l-21-26z m-222-175c0 0 4 1 9 2c5 2 13 3 22 6c5 1 10 3 15 4c5 2 11 4 16 6c6 3 11 5 16 8c6 3 11 7 16 10c1 1 3 2 4 3l3 3c3 3 5 5 7 7c2 2 4 5 6 7c1 1 2 2 3 4l1 2l1 1c1 2 2 3 2 4c1 1 2 3 2 4c1 1 1 1 1 2c1 0 1 1 1 2c1 1 1 2 2 3c1 3 2 5 3 8c0 2 1 4 2 7c0 2 1 4 1 6c0 2 1 4 1 6c0 2 1 4 1 6c0 1 0 3 0 4c0 5 1 9 1 9l5-1c0 0-1-3-1-8c0-2-1-3-1-5c0-2 0-4-1-5c0-2 0-4-1-7c0-2-1-4-1-6c-1-3-2-5-3-8c-1-2-2-5-3-7c0-1-1-3-2-4c0-1 0-1-1-2c0-1 0-1-1-2c0-1-1-2-2-4c-1-1-1-2-2-3c-1-1-1-2-1-2l-2-2c-1-1-2-3-3-4c-2-2-4-5-6-7c-2-2-4-4-7-7l-3-3c-2-1-3-1-4-2c-6-4-11-8-17-11c-5-2-11-5-16-7c-6-2-11-4-17-6c-5-1-10-3-15-4c-9-2-17-4-22-5c-5-1-9-2-9-2"/>
<glyph unicode="&#48;" d="M346 321c0-2 0-4 0-6c0-2-1-4-1-7c0-2-1-5-1-7c-1-3-2-6-2-9c-1-3-2-6-3-9c-1-3-2-6-3-10c-1-1-2-3-2-4c-1-1-1-2-1-3c-1-1-1-1-2-2c-1-2-1-3-2-5c-1-2-2-3-3-5l-2-2l-1-3c-1-1-2-3-4-4c-2-3-4-7-7-9c-3-3-6-6-9-9l-4-4c-2-1-3-2-5-4c-6-5-13-9-20-13c-7-4-14-7-21-10c-7-3-14-6-21-8c-6-2-12-4-18-6c-12-3-22-5-29-7c-7-2-11-2-11-2c0 0 4 0 11 2c7 1 17 3 29 6c6 2 12 3 19 5c7 2 14 5 21 8c7 3 14 6 21 10c7 3 14 8 21 13c2 1 3 2 5 3l5 4c3 3 6 6 8 9c3 3 6 6 8 9c2 2 3 3 4 5l2 2c0 1 1 2 1 3c1 1 2 3 4 5c0 1 1 3 2 5c1 0 1 1 2 2c0 1 0 2 1 3c1 1 1 3 2 5c2 3 3 6 4 9c1 4 2 7 3 10c1 3 1 6 2 8c1 3 1 6 2 8c0 3 0 5 1 7c0 3 0 5 0 6c1 8 1 12 1 12l-6 0c0 0 0-4-1-11m112 80l-34 33c-1 33-22 55-32 61c-10 9-33 16-59 13c-25-4-61-17-86-64c-49-92-154-289-155-291c-1 0-1-1 0-1c0-1 1-1 1-1l40 7l-78-151c0-1 0-1 1-2c0 0 0 0 1 0c0 0 0 0 0 0l56 10c0 0 1 0 1 1l41 120c105 1 178 26 218 77c42 54 36 122 29 154l-5 31l60 0c0 0 1 0 1 1c1 0 0 1 0 2m-55 42c0-5-5-10-10-10c-6 0-10 5-10 10c0 6 4 11 10 11c5 0 10-5 10-11m-33-228c-40-50-112-75-216-75c-1 0-1-1-1-2l-42-120l-51-9l78 151c0 1 0 1 0 2c-1 0-1 1-2 1l-40-8c14 26 109 202 154 287c25 46 59 59 83 62c25 3 46-3 56-10l0-22c-2 0-16 5-29 5c-13 0-28-5-37-15c-16-18-20-36-12-66c54 10 78-13 87-27c7-30 15-99-28-154m29 186l23 30l30-30z"/>
</font></defs></svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf → wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.ttf
View file

Binary file not shown.

BIN
wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.woff Normal file
View file

Binary file not shown.

11
wagtail/wagtailadmin/static/wagtailadmin/css/layouts/login.less
View file

@ -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%;

4
wagtail/wagtailadmin/static/wagtailadmin/css/layouts/page-editor.less
View file

@ -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;

2
wagtail/wagtailadmin/static/wagtailadmin/css/variables.less
View file

@ -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;

4
wagtail/wagtailadmin/templates/wagtailadmin/account/account.html
View file

@ -1,9 +1,7 @@
{% extends "wagtailadmin/base.html" %}
{% block content %}
<header>
<h1>Account</h1>
</header>
{% include "wagtailadmin/shared/header.html" with title="Account" %}
<div class="nice-padding">
<ul class="listing">

4
wagtail/wagtailadmin/templates/wagtailadmin/account/change_password.html
View file

@ -1,9 +1,7 @@
{% extends "wagtailadmin/base.html" %}
{% block content %}
<header>
<h1>Change password</h1>
</header>
{% include "wagtailadmin/shared/header.html" with title="Change password" %}
<div class="nice-padding">
{% if can_change_password %}

4
wagtail/wagtailadmin/templates/wagtailadmin/base.html
View file

@ -2,10 +2,10 @@
{% load wagtailadmin_nav %}
{% block furniture %}
<div id="nav-toggle" data-afteropen="Collapse" class="icon icon-verdant text-replace">Menu</div>
<div id="nav-toggle" data-afteropen="Collapse" class="icon icon-wagtail-inverse text-replace">Menu</div>
<div class="nav-wrapper">
<div class="inner">
<a href="{% url 'wagtailadmin_home' %}" class="logo"><em>V</em><span>erdant</span></a>
<a href="{% url 'wagtailadmin_home' %}" class="logo"><em>0</em></a>
{% main_nav %}
</div>

2
wagtail/wagtailadmin/templates/wagtailadmin/home.html
View file

@ -14,7 +14,7 @@
<div class="row row-flush">
{% if user.email %}
<div class="col1">
<div class="avatar icon icon-user"><a href="http://gravatar.com" title="Change or set your Gravatar"><img src="{% gravatar_url user.email %}" /></a></div>
<div class="avatar icon icon-user"><img src="{% gravatar_url user.email %}" /></div>
</div>
{% endif %}
<div class="col10">

78
wagtail/wagtailadmin/templates/wagtailadmin/login.html
View file

@ -10,48 +10,46 @@
{% endblock %}
{% block furniture %}
<div class="content-wrapper">
<form action="{% url 'django.contrib.auth.views.login' %}" method="post">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}" />
<h1>Sign in to <span>V</span>erdant</h1>
<form action="{% url 'django.contrib.auth.views.login' %}" method="post">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}" />
<h1>Sign in to Wagtail</h1>
{% if form.errors %}
<div class="messages">
<ul>
<li class="error">Your username and password didn't match. Please try again.</li>
</ul>
{% if form.errors %}
<div class="messages">
<ul>
<li class="error">Your username and password didn't match. Please try again.</li>
</ul>
</div>
{% endif %}
<ul class="fields">
<li class="full">
<div class="field icon icon-user">
{{ form.username.label_tag }}
{{ form.username }}
</div>
{% endif %}
<ul class="fields">
<li class="full">
<div class="field icon icon-user">
{{ form.username.label_tag }}
{{ form.username }}
</li>
<li class="full">
<div class="field icon icon-password">
{{ form.password.label_tag }}
{{ form.password }}
</div>
{% if show_password_reset %}
<p class="help"><a href="{% url 'django.contrib.auth.views.password_reset' %}">Forgotten it?</a></p>
{% endif %}
</li>
{% comment %}
Removed until functionality exists
<li class="checkbox">
<div class="field">
<label><input type="checkbox" /> Remember me</label>
</div>
</li>
<li class="full">
<div class="field icon icon-password">
{{ form.password.label_tag }}
{{ form.password }}
</div>
{% if show_password_reset %}
<p class="help"><a href="{% url 'django.contrib.auth.views.password_reset' %}">Forgotten it?</a></p>
{% endif %}
</li>
{% comment %}
Removed until functionality exists
<li class="checkbox">
<div class="field">
<label><input type="checkbox" /> Remember me</label>
</div>
</li>
{% endcomment %}
<li class="submit">
<input type="submit" value="Sign in"/>
</li>
</ul>
</form>
</div>
{% endcomment %}
<li class="submit">
<input type="submit" value="Sign in"/>
</li>
</ul>
</form>
{% endblock %}