Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove GA script and stale revive.bocoup.com script; self-host Lato #225

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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",
"matchdep": "~2.0.0",
Expand Down
Binary file added src/fonts/lato-v24-latin-700.woff2
Binary file not shown.
Binary file added src/fonts/lato-v24-latin-regular.woff2
Binary file not shown.
39 changes: 0 additions & 39 deletions src/less/advertisements.less

This file was deleted.

29 changes: 29 additions & 0 deletions src/less/lato.less
Original file line number Diff line number Diff line change
@@ -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;
}
11 changes: 4 additions & 7 deletions src/less/main.less
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@import "variables";
@import "bootstrap/bootstrap";
@import "lato";
// import code highlight theme
@import "zenburn";
@import "icons";
@import "forms";
@import "hero-unit";
@import "wells";
@import "effects";
@import "advertisements";
@import "blm";

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

h1, h2, h3 {
font-family: 'Lato', sans-serif;
font-family: 'Lato', 'Adjusted Arial Fallback', sans-serif;
position: relative;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -483,9 +483,6 @@ i {

.plugin-unit {
margin-left: 245px;
.advertisements {
float: right;
}

.plugins-note {
font-size: 90%;
Expand Down
1 change: 0 additions & 1 deletion src/tmpl/blm.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/tmpl/blocks/advertisements.pug

This file was deleted.

8 changes: 0 additions & 8 deletions src/tmpl/blocks/footer.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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');
1 change: 0 additions & 1 deletion src/tmpl/docs.pug
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ block content
if link.icon
i(class=link.icon)
span= link.name
include blocks/advertisements
2 changes: 0 additions & 2 deletions src/tmpl/index.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/tmpl/layout.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/tmpl/plugins.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down