Permalink
Browse files

Integrated new stylesheet

  • Loading branch information...
2 parents dbf48c8 + cd2da24 commit 3e141ed16fe6bae622253113c6015d64085b953c @wakaleo committed Nov 13, 2011
View
@@ -135,19 +135,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>3.0.2.RELEASE</version>
+ <version>3.0.4.RELEASE</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.2.RELEASE</version>
+ <version>3.0.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.2.RELEASE</version>
+ <version>3.0.4.RELEASE</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -6,75 +6,7 @@
<html>
<head>
<title>The Game Of Life</title>
-<style type="text/css">
-h2 {
- color: blue;
- font-family: sans-serif;
-}
-
-.intro {
- font-family: sans-serif;
- background: rgb(200, 200, 200);
- border: 1pt rgb(150, 150, 150) solid;
- padding: 8px;
- margin: 4px;
- text-align: justify;
- color: rgb(25,25,25)
-}
-
-.footer {
- color: blue;
- font-size: small;
- text-align: right;
- background-color: silver;
- margin-top: 100px;
- border-top: thin solid black;
- padding: 2px;
- font-family: sans-serif;
-}
-
-.action-button {
- border-bottom:2px solid rgb(100,100,100);
- border-left:2px solid rgb(100,100,100);
- border-top:2px solid rgb(150,150,150);
- border-right:2px solid rgb(150,150,150);
- background: silver;
- width: 100px;
- margin: 8px;
- padding: 4px;
- text-align: center;
-}
-
-a {
- text-decoration: none;
- font-size: large;
- font-weight: bold;
- font-family: sans-serif;
-}
-
-li {
- list-style: circle;
- padding: 4px;
-}
-
-.breadcrumbs {
- font-family: sans-serif;
- color: blue;
-}
-
-#grid {
- border: 1px solid grey;
- padding:4px;
- margin: 16px;
- margin-left: 4px;
- font-family: sans-serif;
- background-color: rgb(255,255,225);
-
-}
-
-.griddisplay {
-}
-
+ <link rel="stylesheet" href="/css/default.css" />
</style>
</head>
<body>
@@ -6,80 +6,7 @@
<html>
<head>
<title>The Game Of Life</title>
-<style type="text/css">
-h2 {
- color: blue;
- font-family: sans-serif;
-}
-
-.intro {
- font-family: sans-serif;
- background: rgb(200, 200, 200);
- border: 1pt rgb(150, 150, 150) solid;
- padding: 8px;
- text-align: justify;
- color: rgb(25,25,25);
- margin: 4px;
-}
-
-.footer {
- color: blue;
- font-size: small;
- text-align: right;
- background-color: silver;
- margin-top: 100px;
- border-top: thin solid black;
- padding: 2px;
- font-family: sans-serif;
-}
-
-.action-button {
- border-bottom:2px solid rgb(100,100,100);
- border-left:2px solid rgb(100,100,100);
- border-top:2px solid rgb(150,150,150);
- border-right:2px solid rgb(150,150,150);
- background: silver;
- width: 100px;
- margin: 8px;
- padding: 4px;
- text-align: center;
-}
-
-a {
- text-decoration: none;
- font-size: large;
- font-weight: bold;
- font-family: sans-serif;
-}
-
-li {
- list-style: circle;
- padding: 4px;
-}
-
-.breadcrumbs {
- font-family: sans-serif;
- color: blue;
-}
-
-h4 {
- font-family: sans-serif;
-
-}
-
-#grid {
- border: 1px solid grey;
- padding:4px;
- margin: 16px;
- margin-left: 4px;
- font-family: sans-serif;
- background-color: rgb(255,255,225);
-}
-
-.griddisplay {
-}
-
-</style>
+ <link rel="stylesheet" href="/css/default.css" />
</head>
<body>
<h2>The Game!</h2>
@@ -5,61 +5,8 @@
<html>
<head>
<title>The Game Of Life</title>
-<!-- TODO: Don't inline this -->
-<style type="text/css">
-h2 {
- color: blue;
- font-family: sans-serif;
- font-size: 2em;
-}
-.intro {
- font-family: sans-serif;
- background: rgb(200, 200, 200);
- border: 1pt rgb(150, 150, 150) solid;
- padding: 8px;
- margin: 4px;
- text-align: justify;
- color: rgb(25,25,25)
-}
-
-.footer {
- color: white;
- font-size: medium;
- text-align: right;
- background-color: blue;
- margin-top: 100px;
- border-top: thin solid black;
- padding: 2px;
- font-family: sans-serif;
- font-weight: bold;
-}
-
-.action-button {
- border-bottom:2px solid rgb(100,100,100);
- border-left:2px solid rgb(100,100,100);
- border-top:2px solid rgb(150,150,150);
- border-right:2px solid rgb(150,150,150);
- background: silver;
- width: 100px;
- margin: 8px;
- padding: 4px;
- text-align: center;
-}
-
-a {
- text-decoration: none;
- font-size: large;
- font-weight: bold;
- font-family: sans-serif;
-}
-
-li {
- list-style: circle;
- padding: 4px;
-}
-
-</style>
+ <link rel="stylesheet" href="/css/default.css" />
</head>
<body>
<h2>Welcome to Conway's Game Of Life!</h2>
@@ -4,7 +4,7 @@
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee">
-
+
<display-name>Game of Life Web Application</display-name>
<servlet>
@@ -16,7 +16,10 @@
<servlet-name>gameoflife</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.css</url-pattern>
+ </servlet-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
@@ -0,0 +1,69 @@
+<style type="text/css">
+h2 {
+ color: green;
+ font-family: sans-serif;
+}
+
+.intro {
+ font-family: sans-serif;
+ background: rgb(200, 200, 200);
+ border: 1pt rgb(150, 150, 150) solid;
+ padding: 8px;
+ margin: 4px;
+ text-align: justify;
+ color: rgb(25,25,25)
+}
+
+.footer {
+ color: white;
+ font-size: medium;
+ text-align: right;
+ background-color: blue;
+ margin-top: 100px;
+ border-top: thin solid black;
+ padding: 2px;
+ font-family: sans-serif;
+ font-weight: bold;
+}
+
+.action-button {
+ border-bottom:2px solid rgb(100,100,100);
+ border-left:2px solid rgb(100,100,100);
+ border-top:2px solid rgb(150,150,150);
+ border-right:2px solid rgb(150,150,150);
+ background: silver;
+ width: 100px;
+ margin: 8px;
+ padding: 4px;
+ text-align: center;
+}
+
+a {
+ text-decoration: none;
+ font-size: large;
+ font-weight: bold;
+ font-family: sans-serif;
+}
+
+li {
+ list-style: circle;
+ padding: 4px;
+}
+
+.breadcrumbs {
+ font-family: sans-serif;
+ color: blue;
+}
+
+#grid {
+ border: 1px solid grey;
+ padding:4px;
+ margin: 16px;
+ margin-left: 4px;
+ font-family: sans-serif;
+ background-color: rgb(255,255,225);
+
+}
+
+.griddisplay {
+}

0 comments on commit 3e141ed

Please sign in to comment.