Skip to content

Commit 165e933

Browse files
committed
Trying to resolve pull conflicts
1 parent 4e88d19 commit 165e933

File tree

2 files changed

+2
-65
lines changed

2 files changed

+2
-65
lines changed

alt-style-2.html

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2-
<html>
3-
<head>
4-
<title>Alternate Stylesheets</title>
5-
<link rel="alternate stylesheet" href="alt-style-1.css" type="text/css" title="Grape World">
6-
<link rel="alternate stylesheet" href="alt-style-2.css" type="text/css" title="On Fire!">
7-
<link rel="alternate stylesheet" href="alt-style-3.css" type="text/css" title="kaleidoscope">
8-
</head>
9-
<body id="www-meyerweb-com" class="css">
10-
<h1>Alternate Stylesheets, Part 2</h1>
11-
<p>
12-
Once you've picked one of the alternate stylesheets for this page, go back to the <a href="alt-style.html"><strong>first page</strong></a>, which links in the same alternate stylesheets. Notice that it starts out with the default stylesheet instead of the alternate that was picked for this page. Even worse, when you come back here odds are you'll be back to the default styles. This is why Javascript-and-cookie-based style pickers are gaining in popularity.
13-
</p>
14-
<ul>
15-
<li><a href="http://www.meyerweb.com/">meyerweb home page</a>
16-
<li><a href="http://www.webreview.com/style/">Style Sheets Reference Guide</a>
17-
<li><a href="http://www.w3.org/">W3C</a>
18-
</ul>
19-
<p>
20-
Lorem ipsum, dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
21-
</p>
22-
23-
<!--#include virtual="/inc/page-end.html" -->
24-
</body>
25-
</html>
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head><title>Alternate Stylesheets</title><link rel="alternate stylesheet" href="alt-style-1.css" type="text/css" title="Grape World"><link rel="alternate stylesheet" href="alt-style-2.css" type="text/css" title="On Fire!"><link rel="alternate stylesheet" href="alt-style-3.css" type="text/css" title="kaleidoscope"></head><body id="www-meyerweb-com" class="css"><h1>Alternate Stylesheets, Part 2</h1><p>Once you've picked one of the alternate stylesheets for this page, go back to the <a href="alt-style.html"><strong>first page</strong></a>, which links in the same alternate stylesheets. Notice that it starts out with the default stylesheet instead of the alternate that was picked for this page. Even worse, when you come back here odds are you'll be back to the default styles. This is why Javascript-and-cookie-based style pickers are gaining in popularity.</p><ul><li><a href="http://www.meyerweb.com/">meyerweb home page</a><li><a href="http://www.webreview.com/style/">Style Sheets Reference Guide</a><li><a href="http://www.w3.org/">W3C</a></ul><p>Lorem ipsum, dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p><!--#include virtual="/inc/page-end.html" --></body></html>

alt-style.html

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2-
<html>
3-
<head>
4-
<title>Alternate Stylesheets</title>
5-
<link rel="alternate stylesheet" href="alt-style-1.css" type="text/css" title="Grape World">
6-
<link rel="alternate stylesheet" href="alt-style-2.css" type="text/css" title="On Fire!">
7-
<link rel="alternate stylesheet" href="alt-style-3.css" type="text/css" title="kaleidoscope">
8-
</head>
9-
<body id="www-meyerweb-com" class="css">
10-
<h1>Alternate Stylesheets</h1>
11-
<p>
12-
Lorem ipsum, dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
13-
</p>
14-
<h3>How to Choose an Alternate Stylesheet</h3>
15-
<p>
16-
This varies by browser. At the moment, only Netscape Navigator 6 supports this natively, so the directions are for that browser. They're pretty simple:
17-
</p>
18-
<ol>
19-
<li>Select the "View" menu.
20-
<li>Select the "Use Stylesheet" submenu
21-
<li>Select the stylesheet you wish to apply to this document.
22-
</ol>
23-
<p>
24-
Note that the titles shown in the "Choose Stylesheet" submenu are specified in the <code>title</code> attribute of the <code>LINK</code> element. Please feel free to examin the source of this document for further information.
25-
</p>
26-
<p>
27-
For the sake of completeness, I'll include some links which will get different styles in each alternate stylesheet:
28-
</p>
29-
<ul>
30-
<li><a href="http://www.meyerweb.com/">meyerweb home page</a>
31-
<li><a href="http://www.webreview.com/style/">Style Sheets Reference Guide</a>
32-
<li><a href="http://www.w3.org/">W3C</a>
33-
</ul>
34-
<p>
35-
Once you've picked one of the alternate stylesheets for this page, go to the <a href="alt-style-2.html"><strong>next page</strong></a>, which links in the same alternate stylesheets. Notice that it starts out with the default stylesheet instead of the alternate that was picked for this page. Even worse, when you come back here odds are you'll be back to the default styles. This is why Javascript-and-cookie-based style pickers are gaining in popularity.
36-
</p>
37-
38-
<!--#include virtual="/inc/page-end.html" -->
39-
</body>
40-
</html>
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head><title>Alternate Stylesheets</title><link rel="alternate stylesheet" href="alt-style-1.css" type="text/css" title="Grape World"><link rel="alternate stylesheet" href="alt-style-2.css" type="text/css" title="On Fire!"><link rel="alternate stylesheet" href="alt-style-3.css" type="text/css" title="kaleidoscope"></head><body id="www-meyerweb-com" class="css"><h1>Alternate Stylesheets</h1><p>Lorem ipsum, dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p><h3>How to Choose an Alternate Stylesheet</h3><p>This varies by browser. At the moment, only Netscape Navigator 6 supports this natively, so the directions are for that browser. They're pretty simple:</p><ol><li>Select the "View" menu.<li>Select the "Use Stylesheet" submenu<li>Select the stylesheet you wish to apply to this document.</ol><p>Note that the titles shown in the "Choose Stylesheet" submenu are specified in the <code>title</code> attribute of the <code>LINK</code> element. Please feel free to examin the source of this document for further information.</p><p>For the sake of completeness, I'll include some links which will get different styles in each alternate stylesheet:</p><ul><li><a href="http://www.meyerweb.com/">meyerweb home page</a><li><a href="http://www.webreview.com/style/">Style Sheets Reference Guide</a><li><a href="http://www.w3.org/">W3C</a></ul><p>Once you've picked one of the alternate stylesheets for this page, go to the <a href="alt-style-2.html"><strong>next page</strong></a>, which links in the same alternate stylesheets. Notice that it starts out with the default stylesheet instead of the alternate that was picked for this page. Even worse, when you come back here odds are you'll be back to the default styles. This is why Javascript-and-cookie-based style pickers are gaining in popularity.</p><!--#include virtual="/inc/page-end.html" --></body></html>

0 commit comments

Comments
 (0)