Skip to content
This repository has been archived by the owner on Jul 17, 2019. It is now read-only.

Commit

Permalink
Meeting 24/9
Browse files Browse the repository at this point in the history
  • Loading branch information
anders committed Sep 24, 2012
1 parent bcccf28 commit 0faa60b
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 27 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
17 changes: 17 additions & 0 deletions src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<session-config>
<session-timeout>
30
</session-timeout>
</session-config>
<welcome-file-list>
<welcome-file>
index.xhtml
</welcome-file>
</welcome-file-list>
</web-app>
62 changes: 62 additions & 0 deletions src/main/webapp/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
Document : style.css
Created on : Sep 24, 2012, 10:56:39 AM
Author : Anders and Julia
Description: Handling css for main design
*/
/**************************** BASICS ****************************/
/* Lite jobbiga saker som annars är satt som standard */
html,body{
height: 100%;
}
body, div, h1, h2, h3, h4, h5, h6,
p, ul, ol, li, dl, dt, dd, img, form,
fieldset, input, blockquote{
margin: 0;
padding: 0;
list-style-type: none;
outline: none;
border: none;
}

/* Tar bort understreck */
a,a:link,a:visited, a:hover, a:active{
text-decoration: none;
}

a:hover{
/* Kommer senare */
}
/****************************Main ****************************/
header#main_header{
width: 100%;
height: 100px;
background: #176EB2;
}

/* Navigation */
nav#main_menu{
width: 100%;
height: 50px;
background: #666;
border-bottom-left-radius: 1em;
border-bottom-right-radius: 1em;
}
nav#main_menu ul li{
display: inline;
}

div#main_content{
height: 100%;
background: #ccc;
width: 900px;
margin: 15px auto;
border-radius: 1.0em;
}

footer#main_footer{
width: 100%;
height: 120px;
background: #483619;
}

13 changes: 0 additions & 13 deletions src/main/webapp/index.jsp

This file was deleted.

25 changes: 25 additions & 0 deletions src/main/webapp/index.xhtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" type="text/css" href="css/style.css" />
<title>Paradise Travel Agency</title>
</head>
<body>
<header id="main_header">THIS IS THE HEADER</header>
<nav id="main_menu">
<ul>
<li><a href="#">Home</a></li>
<li><a href="#">News</a></li>
<li><a href="#">Contact</a></li>
<li><a href="#">About</a></li>
</ul>
</nav>
<div id="main_content">
<h2>Start sida</h2>
<p>TestTestTestTestTestTestTestTest</p>

</div>
<footer id="main_footer">THIS IS THE FOOTER</footer>
</body>
</html>
14 changes: 0 additions & 14 deletions src/main/webapp/juliastest.xhtml

This file was deleted.

0 comments on commit 0faa60b

Please sign in to comment.