diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index 314b6e416..4a2665058 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -1,21 +1,3 @@ -@font-face { - 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; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index 0d1880d16..388b08b2a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -12,6 +12,8 @@ @import "components/messages.scss"; @import "components/formatters.scss"; +@import "fonts.scss"; + html{ background:$color-grey-4; height:100%; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts.scss new file mode 100644 index 000000000..9092012c6 --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts.scss @@ -0,0 +1,83 @@ +@font-face { + font-family: "Open Sans"; + src:url("#{$css-root}fonts/OpenSans-Light-webfont.eot"); + src:url("#{$css-root}fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$css-root}fonts/OpenSans-Light-webfont.ttf") format("truetype"), + url("#{$css-root}fonts/OpenSans-Light-webfont.svg#opensans_italic_webfont") format("svg"), + url("#{$css-root}fonts/OpenSans-Light-webfont.woff") format("woff"); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: "Open Sans"; + src:url("#{$css-root}fonts/OpenSans-Regular-webfont.eot"); + src:url("#{$css-root}fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$css-root}fonts/OpenSans-Regular-webfont.ttf") format("truetype"), + url("#{$css-root}fonts/OpenSans-Regular-webfont.svg#opensans_regular_webfont") format("svg"), + url("#{$css-root}fonts/OpenSans-Regular-webfont.woff") format("woff"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: "Open Sans"; + src:url("#{$css-root}fonts/OpenSans-Semibold-webfont.eot"); + src:url("#{$css-root}fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$css-root}fonts/OpenSans-Semibold-webfont.ttf") format("truetype"), + url("#{$css-root}fonts/OpenSans-Semibold-webfont.svg#opensans_semibold_webfont") format("svg"), + url("#{$css-root}fonts/OpenSans-Semibold-webfont.woff") format("woff"); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: "Open Sans"; + src:url("#{$css-root}fonts/OpenSans-Bold-webfont.eot"); + src:url("#{$css-root}fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), + url("#{$css-root}fonts/OpenSans-Bold-webfont.ttf") format("truetype"), + url("#{$css-root}fonts/OpenSans-Bold-webfont.svg#opensans_bold_webfont") format("svg"), + url("#{$css-root}fonts/OpenSans-Bold-webfont.woff") format("woff"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: "Bitter"; + src: url("#{$css-root}fonts/Bitter-Regular.eot"); + src: url("#{$css-root}fonts/Bitter-Regular.eot?#iefix") format("embedded-opentype"), + url("#{$css-root}fonts/Bitter-Regular.ttf") format("truetype"), + url("#{$css-root}fonts/Bitter-Regular.svg#Bitter-Regular") format("svg"), + url("#{$css-root}fonts/Bitter-Regular.woff") format("woff"); + font-weight:400; + font-style:normal; +} + +@font-face { + font-family: "Bitter"; + src: url("#{$css-root}fonts/Bitter-Bold.eot"); + src: url("#{$css-root}fonts/Bitter-Bold.eot?#iefix") format("embedded-opentype"), + url("#{$css-root}fonts/Bitter-Bold.ttf") format("truetype"), + url("#{$css-root}fonts/Bitter-Bold.svg#Bitter-Bold") format("svg"), + url("#{$css-root}fonts/Bitter-Bold.woff") format("woff"); + font-weight:700; + font-style:normal; +} + +@font-face { + 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"); + } +} \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.eot new file mode 100755 index 000000000..3f7cd4b62 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.svg new file mode 100755 index 000000000..55578f039 --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.svg @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.ttf new file mode 100755 index 000000000..54f8d2cc0 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.woff new file mode 100755 index 000000000..406dce1f1 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Bold.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.eot new file mode 100755 index 000000000..810a54e7a Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.svg new file mode 100755 index 000000000..8f13ac5c3 --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.ttf new file mode 100755 index 000000000..183d7ccda Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.woff new file mode 100755 index 000000000..e1663b32e Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/Bitter-Regular.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.eot new file mode 100755 index 000000000..5d20d9163 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.svg new file mode 100755 index 000000000..3ed7be4bc --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.svg @@ -0,0 +1,1830 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.ttf new file mode 100755 index 000000000..2109c958e Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.woff new file mode 100755 index 000000000..1205787b0 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Bold-webfont.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.eot new file mode 100755 index 000000000..14868406a Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.svg new file mode 100755 index 000000000..11a472ca8 --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.svg @@ -0,0 +1,1831 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.ttf new file mode 100755 index 000000000..63af664cd Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.woff new file mode 100755 index 000000000..e78607481 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Light-webfont.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.eot new file mode 100755 index 000000000..6bbc3cf58 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.svg new file mode 100755 index 000000000..25a395234 --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.svg @@ -0,0 +1,1831 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.ttf new file mode 100755 index 000000000..c537f8382 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.woff new file mode 100755 index 000000000..e231183dc Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Regular-webfont.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.eot new file mode 100755 index 000000000..d8375dd0a Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.eot differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.svg new file mode 100755 index 000000000..eec4db8bd --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.svg @@ -0,0 +1,1830 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.ttf new file mode 100755 index 000000000..b3290843a Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.woff new file mode 100755 index 000000000..28d6adee0 Binary files /dev/null and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/OpenSans-Semibold-webfont.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss index 3045cfd7e..fbaa0cb71 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss @@ -3,6 +3,8 @@ @import "components/icons.scss"; +@import "fonts.scss"; + html, body{ background-color:transparent; } diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html index f895cc32c..30256781e 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html @@ -14,9 +14,6 @@ {% block js %} {% compress js %} - {% comment %} - Core JS includes (for inclusion on all pages) to be specified here - {% endcomment %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html index e46ac8ab7..bc9475695 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html @@ -13,9 +13,6 @@ - - - {% compress css %} {% endcompress %}