jimi
/
rails_galm
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Layout redesign: 

- Added reset stylesheet
  - Used em for width, % for fonts
layout
jimi 16 years ago
committed by jimi
parent
46f74e8443
commit
0563668921
3 changed files with 128 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/views/layouts/application.html.erb
  2. 102
      public/stylesheets/application.css
  3. 54
      public/stylesheets/reset.css

2
app/views/layouts/application.html.erb
View File

@ -3,7 +3,7 @@
<html> <html>
<head> <head>
<title><%= h(yield(:title) || "Untitled") %></title> <title><%= h(yield(:title) || "Untitled") %></title>
<%= stylesheet_link_tag 'application' %>
<%= stylesheet_link_tag 'reset', 'application' %>
<%= yield(:head) %> <%= yield(:head) %>
</head> </head>
<body> <body>

102
public/stylesheets/application.css
View File

@ -1,15 +1,59 @@
html {
overflow-y: scroll;
}
body { body {
background-color: #4B7399;
font-family: Verdana, Helvetica, Arial;
font-size: 14px;
background-color: #33FF66;
font-family: Verdana, sans-serif;
padding: 0.75em;
line-height: 1.333;
}
h1, h2, h3, h4, h5, h6 {
font-weight: bold;
margin-bottom: 0.5em;
}
h1 {
font-size: 175%;
} }
a img {
border: none;
h2 {
font-size: 150%;
}
h3 {
font-size: 125%;
}
h4 {
font-size: 113%;
}
h5, h6 {
font-size: 100%;
} }
a { a {
color: #003399;
text-decoration: none;
}
a:hover {
color: #0000FF; color: #0000FF;
text-decoration: underline;
}
p {
font-size: 75%;
margin-bottom: 0.375em;
}
strong {
font-weight: bold;
}
em {
font-style: italic;
} }
.clear { .clear {
@ -19,27 +63,27 @@ a {
} }
#container { #container {
width: 75%;
margin: 0 auto;
background-color: #FFF;
padding: 20px 40px;
width: 44em;
margin: 0.5em auto;
background-color: #FFFFFF;
padding: 0.75em 1.75em;
border: solid 1px black; border: solid 1px black;
margin-top: 20px;
} }
#flash_notice, #flash_error { #flash_notice, #flash_error {
padding: 5px 8px;
margin: 10px 0;
font-size: 75%;
padding: 0.375em 1.5em;
margin: 0.5em 0;
} }
#flash_notice { #flash_notice {
background-color: #CFC;
border: solid 1px #6C6;
background-color: #CCFFCC;
border: solid 1px #66CC66;
} }
#flash_error { #flash_error {
background-color: #FCC;
border: solid 1px #C66;
background-color: #FFCCCC;
border: solid 1px #CC6666;
} }
.fieldWithErrors { .fieldWithErrors {
@ -47,35 +91,35 @@ a {
} }
#errorExplanation { #errorExplanation {
width: 400px;
width: 25em;
border: 2px solid #CF0000; border: 2px solid #CF0000;
padding: 0px;
padding-bottom: 12px;
margin-bottom: 20px;
background-color: #f0f0f0;
padding: 0;
padding-bottom: 0.75em;
margin-bottom: 1.25em;
background-color: #F0F0F0;
} }
#errorExplanation h2 { #errorExplanation h2 {
text-align: left; text-align: left;
font-weight: bold; font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
padding: 0.375em 0.375em 0.375em 1.0em;
font-size: 75%;
margin: 0; margin: 0;
background-color: #c00;
color: #fff;
background-color: #CC0000;
color: #FFFFFF;
} }
#errorExplanation p { #errorExplanation p {
color: #333;
color: #333333;
margin-bottom: 0; margin-bottom: 0;
padding: 8px;
padding: 0.5em;
} }
#errorExplanation ul { #errorExplanation ul {
margin: 2px 24px;
margin: 0.125em 1.5em;
} }
#errorExplanation ul li { #errorExplanation ul li {
font-size: 12px;
font-size: 75%;
list-style: disc; list-style: disc;
} }

54
public/stylesheets/reset.css
View File

@ -0,0 +1,54 @@
/* http://meyerweb.com/eric/tools/css/reset/ */
/* v1.0 | 20080212 */
html, body, div, span, applet, object,
iframe, h1, h2, h3, h4, h5, h6, p,
blockquote, pre, a, abbr, acronym,
address, big, cite, code, del, dfn, em,
font, img, ins, kbd, q, s, samp, small,
strike, strong, sub, sup, tt, var, b, u,
i, center, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, table,
caption, tbody, tfoot, thead, tr, th,
td {
margin: 0;
padding: 0;
border: 0;
outline: 0;
font-size: 100%;
vertical-align: baseline;
background: transparent;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
/* remember to define focus styles! */
:focus {
outline: 0;
}
/* remember to highlight inserts somehow! */
ins {
text-decoration: none;
}
del {
text-decoration: line-through;
}
/* tables still need 'cellspacing="0"' in the markup */
table {
border-collapse: collapse;
border-spacing: 0;
}