Skip to content

Commit

Permalink
Remove inline styles from legacy pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexgibson
alexgibson committed Oct 11, 2016
1 parent 7ba1db8 commit ff04c10
Show file tree
Hide file tree
Showing 28 changed files with 600 additions and 444 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
View file
Expand Up @@ -25,6 +25,9 @@ indent_size = 4
[*.less]
indent_size = 4

[*.scss]
indent_size = 4

[*.html]
indent_size = 2

Expand Down
12 changes: 6 additions & 6 deletions bedrock/firefox/templates/firefox/geolocation.html
View file
Expand Up @@ -21,12 +21,12 @@
<div id="main-feature">
<h1>{{ _('Location-Aware Browsing') }}</h1>
<p>
{% trans url='#geo-demo', id='try-geolocation', style='display:none' %}
Firefox can tell websites where you’re located so you can find info
that’s more relevant and more useful. It’s about making the Web smarter
&ndash; and is done in a way that totally respects your privacy.
<a href="{{ url }}" id="{{ id }}" style="{{ style }}">Give it a try!</a>
{% endtrans %}
{% trans url='#geo-demo', id='try-geolocation' %}
Firefox can tell websites where you’re located so you can find info
that’s more relevant and more useful. It’s about making the Web smarter
&ndash; and is done in a way that totally respects your privacy.
<a href="{{ url }}" id="{{ id }}">Give it a try!</a>
{% endtrans %}
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion bedrock/foundation/templates/foundation/annualreport/2010/people.html
View file
Expand Up @@ -43,7 +43,7 @@ <h2>{{ _('People') }}</h2>
</div>
<p>{% trans indonesia="http://www.mozilla.web.id/" %}The <a href="{{ indonesia }}">Mozilla community in Indonesia</a> has developed an Indonesian mascot character, “Kumi,” which has been celebrated and distributed as a paper toy at many of this year’s events. The community now has regional leaders in the five largest cities in Indonesia, which have been actively promoting Mozilla and Firefox. Thanks to the enthusiasm and passion of this community, Firefox enjoys the largest market share in the world in Indonesia.{% endtrans %}</p>

<img src="{{ static('img/foundation/annualreport/2010/kumi.png') }}" width="134" height="104" style="margin-left: 150px" alt="Kumi" />
<img src="{{ static('img/foundation/annualreport/2010/kumi.png') }}" width="134" height="104" alt="Kumi" />

<div class="img-left">
<img src="{{ static('img/foundation/annualreport/2010/photo-mozilla-paris.jpg') }}" width="294" height="278" alt="{{ _('ReMo Work Week in Paris') }}" />
Expand Down
60 changes: 13 additions & 47 deletions bedrock/mozorg/templates/mozorg/book.html
View file
Expand Up @@ -5,45 +5,11 @@
<!DOCTYPE html>
<html lang="en-US" dir="ltr">
<head>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<title>The Book of Mozilla</title>

<style type="text/css">
html {
background: maroon;
color: white;
font-style: italic;
}

.moztext {
margin-top: 15%;
font-size: 1.1em;
font-family: serif;
text-align: center;
line-height: 1.5;
}

.from {
font-size: 1.95em;
font-family: serif;
text-align: right;
}

em {
font-size: 1.3em;
line-height: 0;
}

.f {
padding-left: .2ex;
}

a {
text-decoration: none;
color: white;
}

</style>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<title>The Book of Mozilla</title>
{% block page_css %}
{% stylesheet 'book' %}
{% endblock %}
</head>
<body>

Expand All @@ -53,9 +19,9 @@
<!-- This verse announces the birth of the beast (Netscape) and warns bad coders (up to Netscape 3, when you watched the HTML source code with the internal viewer, bad tags blinked). -->

<p class="moztext">
And the beast shall come forth surrounded by a roiling <em>cloud</em> of
<em>vengeance</em>. The house of the unbelievers shall be <em>razed</em>
and they shall be <em>scorched</em> to the earth. Their tags shall <em>blink</em>
And the beast shall come forth surrounded by a roiling <em>cloud</em> of
<em>vengeance</em>. The house of the unbelievers shall be <em>razed</em>
and they shall be <em>scorched</em> to the earth. Their tags shall <em>blink</em>
until the end of <em>days.</em>
</p>

Expand All @@ -68,13 +34,13 @@
<!-- The source code is made available to the legion of thousands of coders of the open source community, that will fight against the followers of Mammon (Microsoft Internet Explorer). -->

<p class="moztext">
And the beast shall be made <em>legion</em>.
Its numbers shall be increased a <em>thousand thousand</em> fold.
The din of a million keyboards like unto a great <em>storm</em>
And the beast shall be made <em>legion</em>.
Its numbers shall be increased a <em>thousand thousand</em> fold.
The din of a million keyboards like unto a great <em>storm</em>
shall cover the earth, and the followers of Mammon shall <em>tremble</em>.
</p>

<p class="from">
<p class="from">
from <strong>The Book of Mozilla,</strong> 3:31<br/>
(Red Letter Edition)
</p>
Expand Down Expand Up @@ -121,7 +87,7 @@
<p class="moztext">
The <em>twins</em> of Mammon quarrelled. Their warring plunged the world into a
<em>new darkness</em>, and the beast abhorred the darkness. So it began to move
<em>swiftly</em>, and grew more powerful, and went forth and multiplied.
<em>swiftly</em>, and grew more powerful, and went forth and multiplied.
And the beasts brought <em class="f">fire</em> and light to the darkness.
</p>

Expand Down
18 changes: 4 additions & 14 deletions bedrock/mozorg/templates/mozorg/credits.html
View file
Expand Up @@ -5,21 +5,11 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Our Contributors</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
html {
background-color: #FFFFFF;
}

body {
color: #000000;
}

h1 {
text-align: center;
}
</style>
<title>Our Contributors</title>
{% block page_css %}
{% stylesheet 'credits' %}
{% endblock %}
<link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css">
</head>

Expand Down
80 changes: 3 additions & 77 deletions bedrock/mozorg/templates/mozorg/mpl/1.1/annotated/index.html
View file
Expand Up @@ -5,83 +5,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Mozilla Public License version 1.1</title>
<style>
/* Thanks to Eric Meyer for the inspiration
http://www.meyerweb.com/eric/css/edge/popups/demo.html
*/

h1 {
text-align: center;
}

div#version {
text-align: center;
font-style: italic;
}

div#moveacross {
margin-top: 15px;
border: 2px #b00000 solid;
padding: 5px;
background-color: #ffffb0;
}

div#moveacross p:first-child {
margin-top: 0px;
}

div.subsection {
margin-left: 2em;
}

dt {
font-weight: bold;
margin-top: 1ex;
margin-bottom: 1ex;
}

div.popup li {
margin-bottom: 10px;
}

a.mouseover {
text-decoration: none;
color: green;
}

div#moveacross a:hover span {
display: block;
position: absolute;
left: 0px;
margin: 0px 5px 5px 5px;
padding: 5px;
border: 2px orange solid;
background-color: yellow;
width: 280px;
color: black;
font-weight: normal;
text-decoration: none;
}


div#moveacross a:hover {
background: #ffffb0;
}

div#moveacross a span {
display: none;
}

div#moveacross a:hover span {
display: block;
}

/* Mark changes from 1.0 version */
div.changed {
color: red;
}

</style>
{% block page_css %}
{% stylesheet 'mpl-1-1-annotated' %}
{% endblock %}
</head>

<body>
Expand Down
14 changes: 3 additions & 11 deletions bedrock/mozorg/templates/mozorg/mpl/1.1/index.html
View file
Expand Up @@ -2,17 +2,9 @@
<html lang="en">
<head>
<title>Mozilla Public License version 1.1</title>
<style type="text/css">
.very-strong{
text-transform:uppercase;
}
dt{
font-weight:bold;
}
dd p{
margin:0;
}
</style>
{% block page_css %}
{% stylesheet 'mpl-1-1' %}
{% endblock %}
</head>
<body>
<p><small>(<a href="{{ static('MPL/1.1/index.txt') }}">Plain text version</a>)</small></p>
Expand Down
112 changes: 5 additions & 107 deletions bedrock/mozorg/templates/mozorg/mpl/2.0/differences.html
View file
Expand Up @@ -5,112 +5,10 @@
<meta name="generator" content="HTML Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org">

<title>Mozilla Public License 2.0: Changes from MPL 1.1</title>
<link href='https://fonts.googleapis.com/css?family=Crimson+Text' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Lora' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>

<style>
/* Thanks to Eric Meyer for the inspiration
http://www.meyerweb.com/eric/css/edge/popups/demo.html
*/

body {
font-family: 'Crimson Text', serif;
margin-right:auto;
max-width: 60em;
}

div#intro {
margin-left:auto;
max-width: 40em;
}

h1, h2, h3 {
font-family: 'Lora', serif;
font-variant: small-caps;
}

h1 {
text-align: center;
}

div#version {
text-align: center;
font-style: italic;
}

div#moveacross {
margin-left: 300px;
margin-top: 15px;
<!-- border: 2px #b00000 solid;-->
padding: 5px;
<!-- background-color: #ffffb0;-->
}

div#moveacross p:first-child {
margin-top: 0px;
}

div.subsection {
margin-left: 2em;
}

dt {
font-weight: bold;
margin-top: 1ex;
margin-bottom: 1ex;
}

div.popup li {
margin-bottom: 10px;
}

a.mouseover {
text-decoration: none;
background-color: yellow;
<!-- color: green;-->
}

strike {
color: red;
}

strong {
color: blue;
font-weight: normal;
text-decoration: underline;
}

div#moveacross a:hover span {
display: block;
position: absolute;
left: 0px;
margin: 0px 5px 5px 5px;
padding: 5px;
border: 2px orange solid;
background-color: yellow;
width: 280px;
color: black;
font-weight: normal;
text-decoration: none;
font-size: 100%;
font-variant: normal;
}

div#moveacross a:hover {
background: #ffffb0;
}

div#moveacross a span {
display: none;
}

div#moveacross a:hover span {
display: block;
}

</style>

{% block page_css %}
{% stylesheet 'mpl-differences' %}
{% endblock %}
</head>

<body>
Expand Down Expand Up @@ -204,7 +102,7 @@ <h2 id="license-grants-and-conditions.">2. License Grants and Conditions.</h2>

<p><strike>Subject to third party intellectual property claims, each</strike><strong>Each</strong> Contributor hereby grants You a world-wide, royalty-free, non-exclusive license<strong>:</strong></p>

<ol style="list-style-type: lower-alpha;">
<ol class="alpha">
<li>
<p>under intellectual property rights (other than patent or trademark) Licensable by <strong>such</strong> Contributor<strike>,</strike> to use, reproduce, <strong>make available,</strong> modify, display, perform, <strike>sublicense and</strike> distribute <strike>the Modifications created by such Contributor (or portions thereof)</strike><strong>, and otherwise exploit its Contributions,</strong> either on an unmodified basis, with <strike>other</strike> Modifications, <strike>as Covered Code and/</strike> or as part of a Larger Work; and</p>
</li>
Expand All @@ -223,7 +121,7 @@ <h2 id="license-grants-and-conditions.">2. License Grants and Conditions.</h2>
<p><strong>2.3. Limitations on Grant Scope.</strong></p>

<p><strike>(d)</strike> <strong>The licenses granted in this Section <strong>2</strong> are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License.</strong> Notwithstanding Section <strike>2.2(b)</strike><strong>2.1(b)</strong> above, no patent license is granted <strong>by a Contributor</strong>:</p>
<ol style="list-style-type: lower-alpha;">
<ol class="alpha">
<li><strike>1)</strike> for any code that <strong>a</strong> Contributor has <strike>deleted from the Contributor Version</strike> <strong>removed from Covered Software</strong>; <strong>or</strong></li>
<li><strike>2) separate from the Contributor Version; 3)</strike> for infringements caused by: <strong>(</strong>i) <strong>Your and any other</strong> third party<strong>'s</strong> modifications of <strike>Contributor Version</strike> <strong>Covered Software,</strong> or <strong>(</strong>ii) the combination of <strike>Modifications made by that Contributor</strike> <strong>its Contributions</strong> with other software (except as part of <strike>the</strike> <strong>its</strong> Contributor Version) <strike>or other devices</strike>; or</li> <li><strike>4)</strike> under Patent Claims infringed by Covered <strike>Code</strike> <strong>Software</strong> in the absence of <strike>Modifications made by that Contributor</strike> <strong>its Contributions</strong>.</li>
</ol>
Expand Down

0 comments on commit ff04c10

Please sign in to comment.