PR#1458: Fix mixed content blocked in the doc - pagure - Pagure.io

pagure

#1458 Fix mixed content blocked in the doc

Merged 9 years ago by pingou. Opened 9 years ago by pingou.

mixed-content-blocked into master

Fix pointing to the site.css for the fonts

Pierre-Yves Chibon • 9 years ago

d245821

Fix mixed content blocked

Rahul Bajaj • 9 years ago

0434228

doc/_static/fonts.css

file added

+40

		`@@ -0,0 +1,40 @@`
		`+ h1 {`
		`+ font-family: Helvetica Neue;`
		`+ font-size: 24px;`
		`+ font-style: normal;`
		`+ font-variant: normal;`
		`+ font-weight: 700;`
		`+ line-height: 38.4px;`
		`+ }`
		`+ h3 {`
		`+ font-family: Helvetica Neue;`
		`+ font-size: 14px;`
		`+ font-style: normal;`
		`+ font-variant: normal;`
		`+ font-weight: 700;`
		`+ line-height: 22.4px;`
		`+ }`
		`+ p {`
		`+ font-family: Cantarell, Arial;`
		`+ font-size: 15px;`
		`+ font-style: normal;`
		`+ font-variant: normal;`
		`+ font-weight: 400;`
		`+ line-height: 18px;`
		`+ }`
		`+ blockquote {`
		`+ font-family: sans-serif;`
		`+ font-size: 21px;`
		`+ font-style: normal;`
		`+ font-variant: normal;`
		`+ font-weight: 400;`
		`+ line-height: 25.2px;`
		`+ }`
		`+ pre {`
		`+ font-family: Helvetica Neue;`
		`+ font-size: 14px;`
		`+ font-style: normal;`
		`+ font-variant: normal;`
		`+ font-weight: 400;`
		`+ line-height: 16.8px;`
		`+ }`

doc/_static/site.css

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`@import url("cloud.css");`
		`- @import url("http://fonts.googleapis.com/css?family=Comfortaa");`
alert("boo! (puiterwijk was here)"); Uiterwijk (puiterwijk)">puiterwijk commented 9 years ago You could also just have used https here, but this is better :).
		`+ @import url("fonts.css");`

		`.pagure-logo span {`
		`background: url("pagure.png") no-repeat scroll 50% 0 transparent;`

doc/conf.py

file modified

+2

		`@@ -155,6 +155,8 @@`
		`"codetrimcolor": "#79db32", # First Green`

		`"footerbgcolor": "#FEFEFE",`
		`+`
		`+ "fontcssurl": "_static/site.css"`
		`}`
		`# Add any paths that contain custom themes here, relative to this directory.`
		`#html_theme_path = []`

pingou commented 9 years ago

This PR takes over https://pagure.io/pagure/pull-request/1323
and fixes https://pagure.io/pagure/issue/1259

rebased

9 years ago

puiterwijk commented on line 3 of doc/_static/site.css 9 years ago

You could also just have used https here, but this is better :).

puiterwijk commented 9 years ago

+1

rebased

9 years ago

pingou commented 9 years ago

Thanks :)

Pull-Request has been merged by pingou

9 years ago

Pull-Request has been merged by pingou

9 years ago

Metadata

Assignee

None

Tags

No Tags

Flags

Build successful

Changes Summary 3

doc/_static/fonts.css

file changed

doc/_static/site.css

file changed

Powered by Pagure 5.14.1

Documentation • File an Issue • About • SSH Hostkey/Fingerprint

© Red Hat, Inc. and others.