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.

Sign up for GitHub

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

Jump to bottom

Add Matomo to website #3765

Merged
merged 15 commits into from
Jul 20, 2019
Merged

Add Matomo to website #3765

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
13bd8f2
Added Matomo to index.md
MarioDiaz98 Feb 23, 2019
94ced8f
Fixed
MarioDiaz98 Feb 23, 2019
84301b1
Deleted <p>
MarioDiaz98 Feb 23, 2019
e4473da
Deleted center tag and added style css
MarioDiaz98 Feb 25, 2019
0d84624
Requested changes done
MarioDiaz98 Feb 26, 2019
bdbb8ad
Changed Matomo logo to another file
MarioDiaz98 Feb 26, 2019
5a06953
Changing css and adding aside to html
MarioDiaz98 Feb 28, 2019
90dc3a2
Fixed height and width
MarioDiaz98 Feb 28, 2019
db43d76
Fixed identations
MarioDiaz98 Mar 4, 2019
1fe22f8
Deleted footer logo
MarioDiaz98 Mar 5, 2019
68fef8b
Requested changes done
MarioDiaz98 Mar 5, 2019
c853ab2
Last changes
MarioDiaz98 Mar 5, 2019
3093d33
Trim and eresize matomo image
Munter Mar 5, 2019
f0d5fd4
Remove resizing, it increased image weight
Munter Mar 5, 2019
405e827
Retain matomo image aspect ratio
Munter Mar 5, 2019
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
89 changes: 46 additions & 43 deletions docs/_includes/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,54 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>{{ page.title }}</title>
<link
rel="preload"
href="https://opencollective.com/static/images/user.svg"
as="image"
crossorigin="anonymous"
/>
<link rel="stylesheet" href="css/normalize.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="css/prism.css" />
<link rel="shortcut icon" href="favicon.ico" />
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>{{ page.title }}</title>
<link rel="preload"
href="https://opencollective.com/static/images/user.svg"
as="image"
crossorigin="anonymous" />
<link rel="stylesheet" href="css/normalize.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="css/prism.css" />
<link rel="shortcut icon" href="favicon.ico" />

<!--[if lt IE 9]> <script src="js/html5shiv.min.js"></script> <![endif]-->
</head>
<!--[if lt IE 9]> <script src="js/html5shiv.min.js"></script> <![endif]-->
</head>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these indentations changed?


<body>
<header id="_header">
<h1>
<a href="/">
<img
src="/images/mocha-logo.svg"
alt="Mocha"
width="192"
height="192"
/>
</a>
</h1>
<body>
<header id="_header">
<h1>
<a href="/">
<img src="/images/mocha-logo.svg"
alt="Mocha"
width="192"
height="192" />
</a>
</h1>

<p id="tag"><em>simple</em>, <em>flexible</em>, <em>fun</em></p>
</header>
<p id="tag"><em>simple</em>, <em>flexible</em>, <em>fun</em></p>
</header>

<main id="content">{{ content }}</main>
<main id="content">{{ content }}</main>

<footer>
<span>
<a href="https://mochajs.org">mochajs.org</a> is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"
>Creative Commons Attribution 4.0 International License</a
>.
<p>
<em>Last updated: {{ 'now' | date: '%a %b %d %H:%M:%S %Y' }}</em>
</p></span
>
</footer>
</body>
<aside>
<a href="https://matomo.org/" rel="external noopener" target="_blank">
<img id="matomoLogo"
class="sponsor-logo"
src="images/matomo-logo.png"
alt="Matomo logo">
</a>
</aside>

<footer>
<span>
<a href="https://mochajs.org">mochajs.org</a> is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
<p>
<em>Last updated: {{ 'now' | date: '%a %b %d %H:%M:%S %Y' }}</em>
</p>
</span>
</footer>
</body>
</html>
8 changes: 8 additions & 0 deletions docs/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,14 @@ img.screenshot {
max-width: 100%;
}

Munter marked this conversation as resolved.
Show resolved Hide resolved
.sponsor-logo {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this class name is on several adblocker lists. Ghostery put display: none !important on it on my machine, which I think is something we'd like to avoid.

Suggested change
.sponsor-logo {
#matomoLogo {

display: block;
margin-left: auto;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Centering will happen elsewhere. See https://github.com/mochajs/mocha/pull/3765/files#r262466444

Suggested change
margin-left: auto;

margin-right: auto;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Centering will happen elsewhere. See https://github.com/mochajs/mocha/pull/3765/files#r262466444

Suggested change
margin-right: auto;

width: 176px;
height: 176px;
}

footer {
background-color: #eee;
padding: 50px 0;
Expand Down
Binary file added docs/images/matomo-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.