diff --git a/package.json b/package.json index 5f04ad11..b4400103 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "grunt-docs": "https://github.com/gruntjs/grunt-docs.git#d224f17ae21fe606b5b7eca73155a31f4e341930", "grunt-sitemap": "~1.2.1", "highlight.js": "~9.12.0", - "less-plugin-clean-css": "~1.5.1", + "less-plugin-clean-css": "~1.6.0", "lodash": "~4.17.10", "marked": "https://github.com/vladikoff/marked/tarball/032a72231503b63e15e76b990a914becf664b0d7", "method-override": "~3.0.0", diff --git a/src/fonts/lato-v24-latin-700.woff2 b/src/fonts/lato-v24-latin-700.woff2 new file mode 100644 index 00000000..11de83fe Binary files /dev/null and b/src/fonts/lato-v24-latin-700.woff2 differ diff --git a/src/fonts/lato-v24-latin-regular.woff2 b/src/fonts/lato-v24-latin-regular.woff2 new file mode 100644 index 00000000..ff60934d Binary files /dev/null and b/src/fonts/lato-v24-latin-regular.woff2 differ diff --git a/src/less/advertisements.less b/src/less/advertisements.less deleted file mode 100644 index 26499366..00000000 --- a/src/less/advertisements.less +++ /dev/null @@ -1,39 +0,0 @@ -.advertisements { - margin: 20px 0 10px 15px; - min-height: 105px; - - .adsbybocoup { - font-size: 10px; - font-style: italic; - text-align: center; - display: block; - clear: both; - width: 120px; - } - - img { - float: left; - } - - p { - font-size: 12px; - line-height: 1.4em; - width: 120px; - float: left; - margin: 0 0 0 10px; - min-height: 90px; - } - - a { - font-weight: 700; - } - -} - -.page-index .advertisements { - margin: 0 0 -10px !important; - - p { - width: 150px; - } -} diff --git a/src/less/lato.less b/src/less/lato.less new file mode 100644 index 00000000..65a1e6dd --- /dev/null +++ b/src/less/lato.less @@ -0,0 +1,29 @@ +/* lato-regular - latin */ +@font-face { + font-display: swap; + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: local('Lato Regular') /* Full name */, + local('Lato-Regular') /* PostScript name */, + url('../fonts/lato-v24-latin-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* lato-700 - latin */ +@font-face { + font-display: swap; + font-family: 'Lato'; + font-style: normal; + font-weight: 700; + src: local('Lato Bold') /* Full name */, + local('Lato-Bold') /* PostScript name */, + url('../fonts/lato-v24-latin-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* Fallback font generated with https://screenspan.net/fallback */ +@font-face { + font-family: 'Adjusted Arial Fallback'; + src: local(Arial); + size-adjust: 97%; + ascent-override: 97%; + descent-override: normal; + line-gap-override: normal; +} diff --git a/src/less/main.less b/src/less/main.less index 4ffedb67..7cd8e547 100644 --- a/src/less/main.less +++ b/src/less/main.less @@ -1,5 +1,6 @@ @import "variables"; @import "bootstrap/bootstrap"; +@import "lato"; // import code highlight theme @import "zenburn"; @import "icons"; @@ -7,7 +8,6 @@ @import "hero-unit"; @import "wells"; @import "effects"; -@import "advertisements"; @import "blm"; @text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25); @@ -18,7 +18,7 @@ body { } h1, h2, h3 { - font-family: 'Lato', sans-serif; + font-family: 'Lato', 'Adjusted Arial Fallback', sans-serif; position: relative; } @@ -144,7 +144,7 @@ i { } .grunt-name { font-size: 2.8em; - font-weight: 900; + font-weight: 700; letter-spacing: 0.06em; -webkit-text-stroke: 4px; text-transform: uppercase; @@ -300,7 +300,7 @@ i { padding: 40px; line-height: 1.6em; h1, .title-header { - font-family: 'Lato', sans-serif; + font-family: 'Lato', 'Adjusted Arial Fallback', sans-serif; font-size: 32px; color: @brown; margin: 50px 0 0.8em; @@ -483,9 +483,6 @@ i { .plugin-unit { margin-left: 245px; - .advertisements { - float: right; - } .plugins-note { font-size: 90%; diff --git a/src/tmpl/blm.pug b/src/tmpl/blm.pug index 14584039..18ccd7ea 100644 --- a/src/tmpl/blm.pug +++ b/src/tmpl/blm.pug @@ -6,7 +6,6 @@ html(lang='en', prefix='og: http://ogp.me/ns#', itemscope, itemtype='http://sche - var pageTitle = (locals.title ? locals.title + ' - ' : '') + 'Grunt: The JavaScript Task Runner'; title= pageTitle - link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Lato:400,700') link(rel='stylesheet', href='/css/main.css') include includes/favicons include includes/social diff --git a/src/tmpl/blocks/advertisements.pug b/src/tmpl/blocks/advertisements.pug deleted file mode 100644 index c83d3d78..00000000 --- a/src/tmpl/blocks/advertisements.pug +++ /dev/null @@ -1,3 +0,0 @@ -.advertisements - | - span.adsbybocoup Ads by Bocoup. diff --git a/src/tmpl/blocks/footer.pug b/src/tmpl/blocks/footer.pug index d58219d2..d22dab04 100644 --- a/src/tmpl/blocks/footer.pug +++ b/src/tmpl/blocks/footer.pug @@ -25,11 +25,3 @@ footer.grunt-footer if locals.page === 'plugins' script(src='/js/plugins.js', async) -script. - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-34623937-1', 'gruntjs.com'); - ga('send', 'pageview'); diff --git a/src/tmpl/docs.pug b/src/tmpl/docs.pug index ed88ed32..2e8dd2c0 100644 --- a/src/tmpl/docs.pug +++ b/src/tmpl/docs.pug @@ -28,4 +28,3 @@ block content if link.icon i(class=link.icon) span= link.name - include blocks/advertisements diff --git a/src/tmpl/index.pug b/src/tmpl/index.pug index 203965d0..f50c60b7 100644 --- a/src/tmpl/index.pug +++ b/src/tmpl/index.pug @@ -124,8 +124,6 @@ block content a(href='https://github.com/gruntjs/grunt') HEAD span (GitHub) - include blocks/advertisements - .latest-news h3 Latest News ul diff --git a/src/tmpl/layout.pug b/src/tmpl/layout.pug index b06fbde0..90427592 100644 --- a/src/tmpl/layout.pug +++ b/src/tmpl/layout.pug @@ -6,7 +6,6 @@ html(lang='en', prefix='og: http://ogp.me/ns#', itemscope, itemtype='http://sche - var pageTitle = (locals.title ? locals.title + ' - ' : '') + 'Grunt: The JavaScript Task Runner'; title= pageTitle - link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Lato:400,700') link(rel='stylesheet', href='/css/main.css') include includes/favicons include includes/social diff --git a/src/tmpl/plugins.pug b/src/tmpl/plugins.pug index 0e96f3f8..db421300 100644 --- a/src/tmpl/plugins.pug +++ b/src/tmpl/plugins.pug @@ -8,7 +8,6 @@ block content .plugin-unit h1 Plugins != content - include blocks/advertisements .main .plugin-list#plugins-contrib table.plugin-list#plugins-all.display