zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-08-04 00:31:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Victoria Wang 2014-11-07 18:10:20 -06:00
commit 094b9112ad
12 changed files with 89 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
views/templates/index.erb
View file

@ -3,18 +3,10 @@
<head>
<meta charset="UTF-8">
<title>The web site of <%= username %></title>
<style type="text/css">
/* This is a CSS comment. CSS is how you can add style to your website, such as colors, fonts,
and positioning of your HTML content. To learn how to do something, just try searching Google
for questions like "how to change link color." To learn how another website does something,
right-click on the page and select View Page Source. Have fun! */
body {
background-color: white;
color: black;
font-family: Verdana;
}
</style>
<!-- The style.css file allows you to change the look of your web pages.
If you include the next line in all your web pages, they will all share the same look.
This makes it easier to make new pages for your site. -->
<link href="/style.css" rel="stylesheet" type="text/css" media="all">
</head>
<body>
<h1>Welcome to my Website!</h1>
@ -24,7 +16,7 @@
<p>Here's how you can make <strong>bold</strong> and <em>italic</em> text.</p>
<p>Here's how you can add an image:</p>
<img src="cat.png">
<img src="/cat.png">
<p>Here's how to make a list:</p>

6
views/templates/not_found.erb
View file

@ -3,11 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Not Found</title>
<style type="text/css">
body {
font-family: Verdana;
}
</style>
<link href="/style.css" rel="stylesheet" type="text/css" media="all">
</head>
<body>
<h1>Page Not Found</h1>

5
views/templates/style.css Normal file
View file

@ -0,0 +1,5 @@
body {
background-color: white;
color: black;
font-family: Verdana;
}