diff options
| author | s1n <[email protected]> | 2019-09-18 12:57:13 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-18 12:57:13 -0700 |
| commit | 3956295b1729ed6f321b7fa2a654d17917533d2b (patch) | |
| tree | 419258a430976055a1dec3d9a3276bb1d74f525c | |
| parent | upload main files (diff) | |
| parent | reF dSFJIXI :()(( (diff) | |
| download | cs2-simple-website-3956295b1729ed6f321b7fa2a654d17917533d2b.tar.xz cs2-simple-website-3956295b1729ed6f321b7fa2a654d17917533d2b.zip | |
Merge pull request #1 from 8cy/dev
merge dev with master
| -rw-r--r-- | 404.html | 4 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | about/index.html | 8 | ||||
| -rw-r--r-- | guestbook.html | 8 | ||||
| -rw-r--r-- | home/index.html | 10 | ||||
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | js/redirect-to-home.js | 2 |
7 files changed, 19 insertions, 18 deletions
@@ -7,6 +7,6 @@ <title>404</title>
</head>
<body>
- <a href="/index.html">woops</a>
+ <a href="/cs2-simple-website/index.html">woops</a>
</body>
-</html>
\ No newline at end of file +</html>
diff --git a/README.md b/README.md new file mode 100644 index 0000000..6145ccc --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +This is the dev branch, here I just make changes to the site so it doesn't effect my original project. diff --git a/about/index.html b/about/index.html index 6a68024..3730b1c 100644 --- a/about/index.html +++ b/about/index.html @@ -5,14 +5,14 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>About</title>
- <link rel="stylesheet" href="/home/css/main.css">
+ <link rel="stylesheet" href="/cs2-simple-website/home/css/main.css">
</head>
<body>
- <script src="/about/js/main.js"></script>
+ <script src="/cs2-simple-website/about/js/main.js"></script>
<div class="nav">
<nav class="bar">
- <a href="/home/">Home</a>
+ <a href="/cs2-simple-website/home/">Home</a>
<a href="#">About</a>
<a href="https://s1n.pw/">S1N</a>
</nav>
@@ -22,4 +22,4 @@ <p>Proof of concept. Not setup :/</p>
</center>
</body>
-</html>
\ No newline at end of file +</html>
diff --git a/guestbook.html b/guestbook.html index aa0c5b5..a03a1a9 100644 --- a/guestbook.html +++ b/guestbook.html @@ -6,15 +6,15 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>About</title>
- <link rel="stylesheet" href="/home/css/main.css">
+ <link rel="stylesheet" href="/cs2-simple-website/home/css/main.css">
</head>
<body>
- <script src="/about/js/main.js"></script>
+ <script src="/cs2-simple-website/about/js/main.js"></script>
<div class="nav">
<nav class="bar">
- <a href="/home/">Home</a>
+ <a href="/cs2-simple-website/home/">Home</a>
<a href="#">About</a>
<a href="https://s1n.pw/">S1N</a>
</nav>
@@ -27,4 +27,4 @@ </center>
</body>
-</html>
\ No newline at end of file +</html>
diff --git a/home/index.html b/home/index.html index 84063c7..a1e8b6e 100644 --- a/home/index.html +++ b/home/index.html @@ -6,17 +6,17 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Simple Website</title>
- <link rel="stylesheet" href="/home/css/main.css">
+ <link rel="stylesheet" href="/cs2-simple-website/home/css/main.css">
</head>
<body>
- <script src="/js/main.js"></script>
+ <script src="/cs2-simple-website/js/main.js"></script>
<div class="nav">
<nav class="bar">
<center>
<a href="#">Home</a>
- <a href="/about/">About</a>
+ <a href="/cs2-simple-website/about/">About</a>
<a href="https://s1n.pw/">S1N</a>
</center>
</nav>
@@ -24,7 +24,7 @@ <p class="important">* Sorry, but I had to do it, 90s web design at its finest.</p>
<p class="update">Last Updated: 06/12/1996</p>
- <a href="/404.html"><img class="welcome" src="http://stryvemarketing.com/wp-content/uploads/2016/04/welcome.gif" alt=""
+ <a href="/cs2-simple-website/404.html"><img class="welcome" src="http://stryvemarketing.com/wp-content/uploads/2016/04/welcome.gif" alt=""
width="200px"></a>
<div class="main">
@@ -58,4 +58,4 @@ </div>
</body>
-</html>
\ No newline at end of file +</html>
@@ -5,9 +5,9 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Loading...</title>
- <script src="/js/redirect-to-home.js"></script>
+ <script src="/cs2-simple-website/js/redirect-to-home.js"></script>
</head>
<body>
</body>
-</html>
\ No newline at end of file +</html>
diff --git a/js/redirect-to-home.js b/js/redirect-to-home.js index d173793..70666e8 100644 --- a/js/redirect-to-home.js +++ b/js/redirect-to-home.js @@ -1 +1 @@ -document.location = "/home/"
\ No newline at end of file +document.location = "/cs2-simple-website/home/" |