Skip to content

Commit 64f9d43

Browse files
timmywilKrinkle
authored andcommitted
Remove GA script and stale revive.bocoup.com script; self-host Lato
Fixes #224. Closes #225.
1 parent 3c97d3d commit 64f9d43

13 files changed

+34
-64
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"grunt-docs": "https://github.com/gruntjs/grunt-docs.git#d224f17ae21fe606b5b7eca73155a31f4e341930",
3838
"grunt-sitemap": "~1.2.1",
3939
"highlight.js": "~9.12.0",
40-
"less-plugin-clean-css": "~1.5.1",
40+
"less-plugin-clean-css": "~1.6.0",
4141
"lodash": "~4.17.10",
4242
"marked": "https://github.com/vladikoff/marked/tarball/032a72231503b63e15e76b990a914becf664b0d7",
4343
"method-override": "~3.0.0",

src/fonts/lato-v24-latin-700.woff2

22.5 KB
Binary file not shown.
23 KB
Binary file not shown.

src/less/advertisements.less

-39
This file was deleted.

src/less/lato.less

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* lato-regular - latin */
2+
@font-face {
3+
font-display: swap;
4+
font-family: 'Lato';
5+
font-style: normal;
6+
font-weight: 400;
7+
src: local('Lato Regular') /* Full name */,
8+
local('Lato-Regular') /* PostScript name */,
9+
url('../fonts/lato-v24-latin-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
10+
}
11+
/* lato-700 - latin */
12+
@font-face {
13+
font-display: swap;
14+
font-family: 'Lato';
15+
font-style: normal;
16+
font-weight: 700;
17+
src: local('Lato Bold') /* Full name */,
18+
local('Lato-Bold') /* PostScript name */,
19+
url('../fonts/lato-v24-latin-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
20+
}
21+
/* Fallback font generated with https://screenspan.net/fallback */
22+
@font-face {
23+
font-family: 'Adjusted Arial Fallback';
24+
src: local(Arial);
25+
size-adjust: 97%;
26+
ascent-override: 97%;
27+
descent-override: normal;
28+
line-gap-override: normal;
29+
}

src/less/main.less

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@import "variables";
22
@import "bootstrap/bootstrap";
3+
@import "lato";
34
// import code highlight theme
45
@import "zenburn";
56
@import "icons";
67
@import "forms";
78
@import "hero-unit";
89
@import "wells";
910
@import "effects";
10-
@import "advertisements";
1111
@import "blm";
1212

1313
@text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
@@ -18,7 +18,7 @@ body {
1818
}
1919

2020
h1, h2, h3 {
21-
font-family: 'Lato', sans-serif;
21+
font-family: 'Lato', 'Adjusted Arial Fallback', sans-serif;
2222
position: relative;
2323
}
2424

@@ -144,7 +144,7 @@ i {
144144
}
145145
.grunt-name {
146146
font-size: 2.8em;
147-
font-weight: 900;
147+
font-weight: 700;
148148
letter-spacing: 0.06em;
149149
-webkit-text-stroke: 4px;
150150
text-transform: uppercase;
@@ -300,7 +300,7 @@ i {
300300
padding: 40px;
301301
line-height: 1.6em;
302302
h1, .title-header {
303-
font-family: 'Lato', sans-serif;
303+
font-family: 'Lato', 'Adjusted Arial Fallback', sans-serif;
304304
font-size: 32px;
305305
color: @brown;
306306
margin: 50px 0 0.8em;
@@ -483,9 +483,6 @@ i {
483483

484484
.plugin-unit {
485485
margin-left: 245px;
486-
.advertisements {
487-
float: right;
488-
}
489486

490487
.plugins-note {
491488
font-size: 90%;

src/tmpl/blm.pug

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ html(lang='en', prefix='og: http://ogp.me/ns#', itemscope, itemtype='http://sche
66

77
- var pageTitle = (locals.title ? locals.title + ' - ' : '') + 'Grunt: The JavaScript Task Runner';
88
title= pageTitle
9-
link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Lato:400,700')
109
link(rel='stylesheet', href='/css/main.css')
1110
include includes/favicons
1211
include includes/social

src/tmpl/blocks/advertisements.pug

-3
This file was deleted.

src/tmpl/blocks/footer.pug

-8
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,3 @@ footer.grunt-footer
2525

2626
if locals.page === 'plugins'
2727
script(src='/js/plugins.js', async)
28-
script.
29-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
30-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
31-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
32-
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
33-
34-
ga('create', 'UA-34623937-1', 'gruntjs.com');
35-
ga('send', 'pageview');

src/tmpl/docs.pug

-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ block content
2828
if link.icon
2929
i(class=link.icon)
3030
span= link.name
31-
include blocks/advertisements

src/tmpl/index.pug

-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ block content
124124
a(href='https://github.com/gruntjs/grunt') HEAD
125125
span (GitHub)
126126

127-
include blocks/advertisements
128-
129127
.latest-news
130128
h3 Latest News
131129
ul

src/tmpl/layout.pug

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ html(lang='en', prefix='og: http://ogp.me/ns#', itemscope, itemtype='http://sche
66

77
- var pageTitle = (locals.title ? locals.title + ' - ' : '') + 'Grunt: The JavaScript Task Runner';
88
title= pageTitle
9-
link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Lato:400,700')
109
link(rel='stylesheet', href='/css/main.css')
1110
include includes/favicons
1211
include includes/social

src/tmpl/plugins.pug

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ block content
88
.plugin-unit
99
h1 Plugins
1010
!= content
11-
include blocks/advertisements
1211
.main
1312
.plugin-list#plugins-contrib
1413
table.plugin-list#plugins-all.display

0 commit comments

Comments
 (0)