Permalink
Browse files

Layout work in progress.

- Add YUI grids to layout.
- Move questions in from the edge (not ideal, but will do for now).
  • Loading branch information...
1 parent bb3d3c8 commit e4f6bad00d40a116632546b80d1098004f4efa36 @malcolmt committed Aug 16, 2010
Showing with 11 additions and 57 deletions.
  1. +1 −0 static/css/reset-fonts-grids.css
  2. +0 −1 static/css/reset-fonts.css
  3. +6 −52 static/css/style.layout.css
  4. +4 −4 templates/base.html

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,33 +1,10 @@
-/*
-* {
- margin: 0;
- padding: 0;
-}
-body {
- font: 12px/18px Arial, Tahoma, Verdana, sans-serif;
- width: 100%;
-}
-a {
- color: blue;
- outline: none;
- text-decoration: underline;
-}
-a:hover {
- text-decoration: none;
+.center {
+ margin-left: 25%;
+ margin-right: 25%;
+ margin-top: 1em;
+ margin-bottom: 1em;
}
-p {
- margin: 0 0 18px
-}
-img {
- border: none;
-}
-input {
- vertical-align: middle;
-}
-
- */
-
#wrapper {
width: 1000px;
margin: 0 auto;
@@ -54,11 +31,8 @@ input {
}
-/* Header
------------------------------------------------------------------------------*/
#header {
- padding-top: 2em;
- padding-bottom: 1em;
+ padding: 1em;
background: #FFE680;
text-align: center;
}
@@ -69,26 +43,6 @@ input {
}
-/* Middle
------------------------------------------------------------------------------*/
-#content {
- margin: 1em 1em 2em 1em;
-}
-
-#content ul {
- padding-left: 5em;
-}
-
-#content li {
- list-style: none;
-}
-
-#content input {
- margin-right: 1em;
-}
-
-/* Footer
------------------------------------------------------------------------------*/
#footer {
padding-top: 1em;
padding-bottom: 1em;
View
@@ -3,15 +3,15 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{% block title %}Minerva{% endblock %}</title>
- <link rel="stylesheet" href="{{MEDIA_URL}}css/reset-fonts.css" type="text/css" media="screen, projection" />
+ <link rel="stylesheet" href="{{MEDIA_URL}}css/reset-fonts-grids.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="{{MEDIA_URL}}css/base-min.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="{{MEDIA_URL}}css/style.layout.css" type="text/css" media="screen, projection" />
<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="{{MEDIA_URL}}js/login.js"></script>
</head>
<body>
- <div id="wrapper">
+ <div id="doc3">
<div id="header">
{% block header %}
<h1>Minerva: Foreign language vocabulary training</h1>
@@ -27,9 +27,9 @@
{% endblock %}
</div>
- <div id="content">
+ <div id="content" class="center">
{% block content %}{% endblock %}
- </div><!-- #content -->
+ </div>
<div id="footer">
<p><a href="{% url about %}">About</a> |

0 comments on commit e4f6bad

Please sign in to comment.