Skip to content
Snippets Groups Projects
Commit c8a13a9a authored by Fufiri's avatar Fufiri
Browse files

border fix

parent 1f652398
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Exercise 1/home.html
+ 1
− 21
View file @ c8a13a9a
<<<<<<< HEAD:Exercise 1/home.html
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Home page</title>
<link rel="stylesheet" href="style.css">
<script src="script.js"></script>
</head>
<body>
<div id="home-div">
<img src="images/image5-small.jpg">
</div>
</body>
=======
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
...@@ -30,9 +11,8 @@ ...@@ -30,9 +11,8 @@
<body> <body>
<div id="home-div"> <div id="home-div">
<img src="image5-small.jpg"> <img src="images/image5-small.jpg">
</div> </div>
</body> </body>
>>>>>>> cc2dd46e0fff5b3555924b908ffd108deabb1e1a:Exercise 1+2/home.html
</html> </html>
\ No newline at end of file
Exercise 1/slideshow.html
+ 11
− 70
View file @ c8a13a9a
<<<<<<< HEAD:Exercise 1/slideshow.html
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Slideshow page</title>
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<link rel="stylesheet" href="desoslide-2.2.0\doc\assets\css\vendor\animate\animate.min.css">
<link href="desoslide-2.2.0\dist\css\jquery.desoslide.css" rel="stylesheet">
<link href="desoslide-2.2.0\dist\css\jquery.desoslide.min.css" rel="stylesheet">
<link rel="stylesheet" href="style.css">
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script src="desoslide-2.2.0\src\js\jquery.desoslide.js"></script>
<script src="desoslide-2.2.0\dist\js\jquery.desoslide.min.js"></script>
<script src="script.js"></script>
</head>
<body>
<div id="slideshow-wrapper">
<div id="thumbs-div">
<ul id="slideshow_thumbs" class="desoslide-thumbs-horizontal list-inline text-center">
<li>
<a href="images/image1.jpg">
<img src="images/image1-small.jpg"
alt="Cat"
data-desoslide-caption-title="A cat">
</a>
</li>
<li>
<a href="images/image2.jpg">
<img src="images/image2-small.jpg" alt="Image"
data-desoslide-caption-title="Another cat">
</a>
</li>
<li>
<a href="images/image3.jpg">
<img src="images/image3-small.jpg" alt="Image"
data-desoslide-caption-title="More cat">
</a>
</li>
</ul>
</div>
<div id="slideshow-div">
<ul id="slideshow"></ul>
</div>
</div>
</body>
=======
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
...@@ -63,15 +5,15 @@ ...@@ -63,15 +5,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Slideshow page</title> <title>Slideshow page</title>
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<link rel="stylesheet" href="\Exercise 1\desoslide-2.2.0\doc\assets\css\vendor\animate\animate.min.css"> <link rel="stylesheet" href="desoslide-2.2.0\doc\assets\css\vendor\animate\animate.min.css">
<link href="\Exercise 1\desoslide-2.2.0\dist\css\jquery.desoslide.css" rel="stylesheet"> <link href="desoslide-2.2.0\dist\css\jquery.desoslide.css" rel="stylesheet">
<link href="\Exercise 1\desoslide-2.2.0\dist\css\jquery.desoslide.min.css" rel="stylesheet"> <link href="desoslide-2.2.0\dist\css\jquery.desoslide.min.css" rel="stylesheet">
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
<script src="https://code.jquery.com/jquery-1.12.4.js"></script> <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script src="\Exercise 1\desoslide-2.2.0\src\js\jquery.desoslide.js"></script> <script src="desoslide-2.2.0\src\js\jquery.desoslide.js"></script>
<script src="\Exercise 1\desoslide-2.2.0\dist\js\jquery.desoslide.min.js"></script> <script src="desoslide-2.2.0\dist\js\jquery.desoslide.min.js"></script>
<script src="script.js"></script> <script src="script.js"></script>
...@@ -81,21 +23,21 @@ ...@@ -81,21 +23,21 @@
<div id="thumbs-div"> <div id="thumbs-div">
<ul id="slideshow_thumbs" class="desoslide-thumbs-horizontal list-inline text-center"> <ul id="slideshow_thumbs" class="desoslide-thumbs-horizontal list-inline text-center">
<li> <li>
<a href="\Exercise 1\images\image1.jpg"> <a href="images/image1.jpg">
<img src="\Exercise 1\images\image1-small.jpg" <img src="images/image1-small.jpg"
alt="Cat" alt="Cat"
data-desoslide-caption-title="A cat"> data-desoslide-caption-title="A cat">
</a> </a>
</li> </li>
<li> <li>
<a href="\Exercise 1\images\image2.jpg"> <a href="images/image2.jpg">
<img src="\Exercise 1\images\image2-small.jpg" alt="Image" <img src="images/image2-small.jpg" alt="Image"
data-desoslide-caption-title="Another cat"> data-desoslide-caption-title="Another cat">
</a> </a>
</li> </li>
<li> <li>
<a href="\Exercise 1\images\image3.jpg"> <a href="images/image3.jpg">
<img src="\Exercise 1\images\image3-small.jpg" alt="Image" <img src="images/image3-small.jpg" alt="Image"
data-desoslide-caption-title="More cat"> data-desoslide-caption-title="More cat">
</a> </a>
</li> </li>
...@@ -112,5 +54,4 @@ ...@@ -112,5 +54,4 @@
</div> </div>
</body> </body>
>>>>>>> cc2dd46e0fff5b3555924b908ffd108deabb1e1a:Exercise 1+2/slideshow.html
</html> </html>
\ No newline at end of file
Exercise 1/style.css
+ 4
− 3
View file @ c8a13a9a
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#home-div { #home-div {
border-style: solid; border-style: solid;
border-color: black; border-color: black;
width: 800px; height: 400px;
height: 500px; overflow: hidden;
} }
#sortable { #sortable {
...@@ -56,6 +56,7 @@ iframe { ...@@ -56,6 +56,7 @@ iframe {
height: 500px; height: 500px;
margin-left: 150px; margin-left: 150px;
border: 0; border: 0;
} }
.desoslide-overlay { .desoslide-overlay {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment