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

[bug 1307567] Remove inline styles from legacy pages #4406

Merged
merged 2 commits into from Oct 24, 2016
Merged

[bug 1307567] Remove inline styles from legacy pages #4406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2ec19c
Bug 1307567 - Remove inline styles from legacy pages
alexgibson Oct 11, 2016
f3a1c9b
Review fixes
alexgibson Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Expand Up @@ -25,6 +25,9 @@ indent_size = 4
[*.less]
indent_size = 4

[*.scss]
indent_size = 4

[*.html]
indent_size = 2

Expand Down
6 changes: 3 additions & 3 deletions bedrock/firefox/templates/firefox/geolocation.html
View file
Open in desktop
Expand Up @@ -21,11 +21,11 @@
<div id="main-feature">
<h1>{{ _('Location-Aware Browsing') }}</h1>
<p>
{% trans url='#geo-demo', id='try-geolocation', style='display:none' %}
{% 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 }}" style="{{ style }}">Give it a try!</a>
<a href="{{ url }}" id="{{ id }}">Give it a try!</a>
{% endtrans %}
</p>
</div>
Copy link
Member

Choose a reason for hiding this comment

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

Just noticed the demo popup at the bottom of this page has style="display:none", we can replace that with class="hidden"

Copy link
Member Author

Choose a reason for hiding this comment

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

Nice catch!

Expand Down Expand Up @@ -217,7 +217,7 @@ <h3 data-accordion-role="tab">{{ _('How can I add support for Geolocation to my

</section><!-- end #faq -->

<div style="display:none">
<div class="hidden">
<div id="geo-demo">
<div id="map_canvas"></div>
<button id="locateButton" type="button">{{ _('Where am I?') }}</button>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/foundation/templates/foundation/annualreport/2010/people.html
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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