Skip to content

Add files via upload #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add files via upload #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21fdcfc
Add files via upload
shaolinkitty Sep 24, 2017
9802081
removed unused line in header
shaolinkitty Sep 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ body{
font-size: 16px;
}
#main{
overflow: auto;
overflow:auto;
position:static;
min-height: 950px;
}

#banner{
Expand Down Expand Up @@ -61,14 +63,17 @@ body{
padding: 0.5em 0;
}

#footer {
position: inherit;
}

#footer p{
font: 10px 'Merriweather', serif;
}

.facts{
height:10em:
height: 10em;
margin-bottom: 1em;
bacground-color: #efefef;
}

.facts p{
Expand Down
52 changes: 28 additions & 24 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
<!DOCTYPE html>
<html lang="en-US">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title>Design Travels Ltd.</title>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name ="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="A Designer Abroad">
<meta name="keywords" content="travel, design">
<meta name="author" content="Design Travels Ltd.">

<link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Merriweather|Oswald|Source+Sans+Pro">

<script src="http://code.jquery.com/jquery-latest.min.js"></script>
<script src="../js/index.js"></script>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="A Designer Abroad" />
<meta name="keywords" content="travel, design" />
<meta name="author" content="Design Travels Ltd." />

<link rel="stylesheet" type="text/css" href="../css/style.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Merriweather|Oswald|Source+Sans+Pro" />

<script type="text/javascript" src="../js/index.js" charset="UTF-8"></script>
</head>

<body>

<div id="header">
<h1>Design Travels Ltd.<h1>
<h1>Design Travels Ltd.</h1>
<h4> - A Designer Abroad - </h4>
<div id="nav" class="menu">
<ul>
Expand All @@ -29,29 +30,32 @@ <h4> - A Designer Abroad - </h4>
</ul>
</div>
</div>

<div id="main">
<div id="banner"><img src="../images/schloss.jpg" alt="Wetterstein Mountain range at the Schloss Elmau" id="image"></div>
<div id="banner"><img src="../images/schloss.jpg" alt="Wetterstein Mountain range at the Schloss Elmau" id="image" /></div>
<div class="facts col1">
<h3><a href="http://www.schloss-elmau.de/en/" target="_blank">Schloss Elmau</a></h3>
<p>Just 100km south of Munich and 1000m above sea level is Schloss Elmau, tucked deep in the calm of the Bavarian Alps. A sanctuary, framed by dramatic peaks, whispering forests and rushing streams.<br><br>
<p>Just 100km south of Munich and 1000m above sea level is Schloss Elmau, tucked deep in the calm of the Bavarian Alps. A sanctuary, framed by dramatic peaks, whispering forests and rushing streams.<br /><br />

A spa retreat &amp; cultural hideaway, a family escape &amp; romantic haven. A place to experience unbeatable music, literature &amp; poetry, to feast on outstanding food &amp; service - to relax, breathe deep and discover.</p>
</div>
<div class="facts col2">
<h3><a href="https://en.wikipedia.org/wiki/Bavaria" target="_blank">Bavaria</a></h3>
<p>Bavaria is a state in southeastern Germany bordering Liechtenstein, Austria and the Czech Republic. State capital Munich is known for its annual Oktoberfest beer festival, art museums and ornate Nymphenburg Palace.<br><br>
<p>Bavaria is a state in southeastern Germany bordering Liechtenstein, Austria and the Czech Republic. State capital Munich is known for its annual Oktoberfest beer festival, art museums and ornate Nymphenburg Palace.<br /><br />

The Romantic Road scenic route starts in northwestern Würzburg, winds south through pastoral villages and medieval towns and culminates in the foothills of the Alps near Germany’s southern border.</p>
</div>
<div class="facts col3">
<h3><a href="http://www.schloss-elmau.de/en/" target="_blank">German Alps</a></h3>
<p>The term is frequently used, but does not correspond to the common classification of the Eastern Alps (AVE) developed by the German, Austrian and South Tyrol Alpine Clubs. It should not be confused with the term Bavarian Prealps either. The latter only covers the Bavarian section of the prealps between the River Loisach in the west and the River Inn in the east.<br><br>
<h3><a href="https://en.wikipedia.org/wiki/Bavarian_Alps" target="_blank">German Alps</a></h3>
<p>The term is frequently used, but does not correspond to the common classification of the Eastern Alps (AVE) developed by the German, Austrian and South Tyrol Alpine Clubs. It should not be confused with the term Bavarian Prealps either. The latter only covers the Bavarian section of the prealps between the River Loisach in the west and the River Inn in the east.<br /><br />

According to the Italian Partizione delle Alpi classification, the Bavarian Alps (Alpi Bavaresi) comprise the Allgäu and Lechtal Alps as well as the adjacent Achen Lake mountains.</p>
</div>
</div>
<div id="footer">
</div>

<div id="footer">
<p>Copyright Design Travels Ltd.</p>
</div>
</div>

</body>
</html>
62 changes: 62 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title>Design Travels Ltd.</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="A Designer Abroad" />
<meta name="keywords" content="travel, design" />
<meta name="author" content="Design Travels Ltd." />

<link rel="stylesheet" type="text/css" href="../css/style.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Merriweather|Oswald|Source+Sans+Pro" />

<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js" charset="UTF-8"></script>
<script type="text/javascript" src="../js/index.js" charset="UTF-8"></script>
</head>

<body>

<div id="header">
<h1>Design Travels Ltd.</h1>
<h4> - A Designer Abroad - </h4>
<div id="nav" class="menu">
<ul>
<li><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="mailto:designtravelsltd@gmail.com">Contact</a></li>
</ul>
</div>
</div>

<div id="main">
<div id="banner"><img src="../images/schloss.jpg" alt="Wetterstein Mountain range at the Schloss Elmau" id="image" /></div>
<div class="facts col1">
<h3><a href="http://www.schloss-elmau.de/en/" target="_blank">Schloss Elmau</a></h3>
<p>Just 100km south of Munich and 1000m above sea level is Schloss Elmau, tucked deep in the calm of the Bavarian Alps. A sanctuary, framed by dramatic peaks, whispering forests and rushing streams.<br /><br />

A spa retreat &amp; cultural hideaway, a family escape &amp; romantic haven. A place to experience unbeatable music, literature &amp; poetry, to feast on outstanding food &amp; service - to relax, breathe deep and discover.</p>
</div>
<div class="facts col2">
<h3><a href="https://en.wikipedia.org/wiki/Bavaria" target="_blank">Bavaria</a></h3>
<p>Bavaria is a state in southeastern Germany bordering Liechtenstein, Austria and the Czech Republic. State capital Munich is known for its annual Oktoberfest beer festival, art museums and ornate Nymphenburg Palace.<br /><br />

The Romantic Road scenic route starts in northwestern Würzburg, winds south through pastoral villages and medieval towns and culminates in the foothills of the Alps near Germany’s southern border.</p>
</div>
<div class="facts col3">
<h3><a href="https://en.wikipedia.org/wiki/Bavarian_Alps" target="_blank">German Alps</a></h3>
<p>The term is frequently used, but does not correspond to the common classification of the Eastern Alps (AVE) developed by the German, Austrian and South Tyrol Alpine Clubs. It should not be confused with the term Bavarian Prealps either. The latter only covers the Bavarian section of the prealps between the River Loisach in the west and the River Inn in the east.<br /><br />

According to the Italian Partizione delle Alpi classification, the Bavarian Alps (Alpi Bavaresi) comprise the Allgäu and Lechtal Alps as well as the adjacent Achen Lake mountains.</p>
</div>
</div>

<div id="footer">
<p>Copyright Design Travels Ltd.</p>
</div>

</body>
</html>
13 changes: 13 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
var index = 0;

function swap () {
var image = document.getElementById('image');
var images = ['../images/schloss.jpg', '../images/plansee.jpg'];
image.src = images[index];
index++;
if (index >= images.length) {
index = 0;
}
}

setInterval(swap, 3000);
15 changes: 9 additions & 6 deletions js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
function swap() {
var image=document.getElementById("image");
var index = 0;
var images = ["../images/schloss.jpg","../images/plansee.jpg"]

if (++index >= images.length) index = 0;
image.src = images[index];
function swap () {
var image = document.getElementById('image');
var images = ['../images/schloss.jpg', '../images/plansee.jpg'];
image.src = images[index];
index++;
if (index >= images.length) {
index = 0;
}
}

setInterval(swap, 30000);
setInterval(swap, 3000);
102 changes: 102 additions & 0 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
body{
width:90%;
max-width: 1200px;
margin:0 auto;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
font-family: 'Source Sans Pro', sans-serif;
font-size: 16px;
}
#main{
overflow:auto;
position:static;
min-height: 950px;
}

#banner{
height:400px;
padding-bottom:40px;
}

#header, #nav, #banner, #footer {
text-align:center;
margin:1%;
}

#nav{
width: auto;
font: 13px 'Merriweather', serif;
}

#nav li {
display: inline;
padding: 0.5em;
}

#nav ul {
padding:0px;
margin:2px;
}

.menu a:link, a:visited {
color:black;
text-decoration:none;
}

.menu a:hover, a:active {
text-transform: uppercase;
}

.col1, .col2, .col3 {
width:31.3%;
float: left;
margin: 1%;
}

.col3 {
margin-right: 0%
}

#nav, #footer {
background-color: #ffffff;
padding: 0.5em 0;
}

#footer {
position: inherit;
}

#footer p{
font: 10px 'Merriweather', serif;
}

.facts{
height: 10em;
margin-bottom: 1em;
}

.facts p{
font: 13px 'Merriweather', serif;
line-height: 23px;
text-align: left;
margin-bottom:0px;
padding-bottom:20px;
}

.facts h3 a{
font-weight: bold;
text-transform: uppercase;
text-decoration: underline;
line-height: 20px;
color:#CD5C5C;
}

@media screen and (max-width:800px){
.col1, .col2, .col3 {
width:100%;
height:10%;
clear:both;
float: left;
}
}