Skip to content

Commit 225205a

Browse files
authored
Merge pull request #7 from J-P-S-O/master
never gonna make you cry
2 parents df64114 + 03dc86b commit 225205a

5 files changed

Lines changed: 34 additions & 4 deletions

File tree

static/downframe.html

Whitespace-only changes.

static/start.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
let upb = document.getElementById("upb")
2+
let db = document.getElementById("downb")
3+
let frame = document.getElementById("frame")
4+
5+
upb.onclick(function(){
6+
if (frame.src != "uploadframe.html") frame.src = "uploadframe.html";
7+
})
8+
db.onclick(function(){
9+
if (frame.src != "downframe.html") frame.src = "downframe.html"
10+
})

static/style.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
nav {
2+
23
position: fixed;
34
top: 0%;
45
height: 10%;
@@ -11,4 +12,5 @@ nav {
1112
text-align:left;
1213
position: fixed;
1314
top: 0%;
14-
};
15+
16+
};

templates/rick.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
<title>Test</title>
55
</head>
66
<body>
7-
<iframe height="350" width="600"
7+
<iframe class = "rick"
88
src="https://www.youtube.com/embed/dQw4w9WgXcQ">
99
</iframe>
1010
</body>
11+
<style>
12+
.rick {
13+
height: 75%;
14+
width: 50%;
15+
position: absolute;
16+
top: 15%;
17+
left: 25%;
18+
};
19+
</style>
1120
</html>

templates/start.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,23 @@
1616
color: white;
1717
border-radius: 10%
1818
};
19+
div{
20+
vertical-align: middle;
21+
}
22+
1923
</style>
2024
<body>
2125

2226
<img width = 5% class = "eviloctopus" src = "favicon.ico">
2327
<nav>
24-
<button class="switch">Nothing happens here</button>
25-
<button class="switch">Nor here.</button>
28+
<button class="switch" id="downb">Nothing happens here</button>
29+
<button class="switch" id="upb">Nor here.</button>
2630
</nav>
31+
<div>
32+
<iframe id = "frame" height= 80% width= 50% src="uploadframe.html"> </iframe>
33+
</div>
34+
<script src = "start.js"></script>
35+
2736

2837
</body>
2938

0 commit comments

Comments
 (0)