diff --git a/ckanext/ozwillo_theme/fanstatic/ozwillo.css b/ckanext/ozwillo_theme/fanstatic/ozwillo.css index 36b1aa8..c3d05a4 100644 --- a/ckanext/ozwillo_theme/fanstatic/ozwillo.css +++ b/ckanext/ozwillo_theme/fanstatic/ozwillo.css @@ -1,10 +1,5 @@ -@font-face { - font-family: "DIN2"; - src: url("DIN.woff") format("woff"), url("DIN.ttf") format("truetype"); -} - body { - font-family: "DIN2" !important; + font-family: "DIN" !important; } .authed ul li a[href^="/user/edit"], @@ -306,7 +301,7 @@ body.toc-open #toggle-container, body.toc-open #off-nav { } h1.page-heading { - font-family: DIN2, Arial, sans-serif; + font-family: Dunkin, Arial, sans-serif; color: #714090; } diff --git a/ckanext/ozwillo_theme/fanstatic/templates.t3_bs3_blank.less.themes.dark.template.less.css b/ckanext/ozwillo_theme/fanstatic/templates.t3_bs3_blank.less.themes.dark.template.less.css index 4933896..71fba6c 100644 --- a/ckanext/ozwillo_theme/fanstatic/templates.t3_bs3_blank.less.themes.dark.template.less.css +++ b/ckanext/ozwillo_theme/fanstatic/templates.t3_bs3_blank.less.themes.dark.template.less.css @@ -59,6 +59,11 @@ p.large { .nav li a.logo { padding: 3px 15px 4px; } +@media (min-width: 980px) { + .nav li a.logo { + padding-left: 0; + } +} .navbar, .navbar .btn { font-size: 18px; diff --git a/ckanext/ozwillo_theme/public/fonts/DIN.eot b/ckanext/ozwillo_theme/public/fonts/DIN.eot new file mode 100644 index 0000000..1314e62 Binary files /dev/null and b/ckanext/ozwillo_theme/public/fonts/DIN.eot differ diff --git a/ckanext/ozwillo_theme/public/fonts/DIN.svg b/ckanext/ozwillo_theme/public/fonts/DIN.svg new file mode 100644 index 0000000..d88fa7c --- /dev/null +++ b/ckanext/ozwillo_theme/public/fonts/DIN.svg @@ -0,0 +1,593 @@ + + + + +Created by FontForge 20110222 at Tue Jun 10 08:51:48 2014 + By deploy user +(c) Dutch Design: Albert-Jan Pool, 1995. Published by FontShop International FontFont release 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ckanext/ozwillo_theme/fanstatic/DIN.ttf b/ckanext/ozwillo_theme/public/fonts/DIN.ttf similarity index 100% rename from ckanext/ozwillo_theme/fanstatic/DIN.ttf rename to ckanext/ozwillo_theme/public/fonts/DIN.ttf diff --git a/ckanext/ozwillo_theme/fanstatic/DIN.woff b/ckanext/ozwillo_theme/public/fonts/DIN.woff similarity index 100% rename from ckanext/ozwillo_theme/fanstatic/DIN.woff rename to ckanext/ozwillo_theme/public/fonts/DIN.woff diff --git a/ckanext/ozwillo_theme/public/fonts/Dunkin.eot b/ckanext/ozwillo_theme/public/fonts/Dunkin.eot new file mode 100644 index 0000000..ce11de8 Binary files /dev/null and b/ckanext/ozwillo_theme/public/fonts/Dunkin.eot differ diff --git a/ckanext/ozwillo_theme/public/fonts/Dunkin.svg b/ckanext/ozwillo_theme/public/fonts/Dunkin.svg new file mode 100644 index 0000000..47f9482 --- /dev/null +++ b/ckanext/ozwillo_theme/public/fonts/Dunkin.svg @@ -0,0 +1,791 @@ + + + + +Created by FontForge 20110222 at Tue Jun 10 08:54:07 2014 + By deploy user +Dunkin (c) (Neale Davidson). 2012. All Rights Reserved + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ckanext/ozwillo_theme/public/fonts/Dunkin.ttf b/ckanext/ozwillo_theme/public/fonts/Dunkin.ttf new file mode 100644 index 0000000..9c9da88 Binary files /dev/null and b/ckanext/ozwillo_theme/public/fonts/Dunkin.ttf differ diff --git a/ckanext/ozwillo_theme/public/fonts/Dunkin.woff b/ckanext/ozwillo_theme/public/fonts/Dunkin.woff new file mode 100644 index 0000000..d2e69eb Binary files /dev/null and b/ckanext/ozwillo_theme/public/fonts/Dunkin.woff differ