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 201ef286f..000000000
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.woff and /dev/null differ
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 d4735a541..f6d4d3e25 100644
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.eot and b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.eot differ
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 @@
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 acf206c59..d3ba6a525 100644
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/verdant.ttf and b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.ttf differ
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 000000000..b53396b99
Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/css/fonts/wagtail.woff differ
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
-