Permalink
Browse files

Use px instead of em throughout.

  • Loading branch information...
Chad Mazzola
Chad Mazzola committed Jun 29, 2011
1 parent 2150f90 commit 3ef9ee73e0f95c899e02f6ced314f278df6b877b
@@ -1,12 +1,4 @@
<div>
- <div style="padding: 15px; text-align: right;">
- <% if params[:flutie] %>
- <a href="?flutie=false">Application Styles</a>
- <% else %>
- <a href="?flutie=true">Default Styles</a>
- <% end %>
- </div>
-
<h1>This is an example page of our basic styles</h1>
<h2>This is an h2 level heading</h2>
@@ -16,14 +8,12 @@
<blockquote>
<p>Blockquoted text. Not too long ago, two friends of mine were talking to a Cuban refugee, a businessman who had escaped from Castro, and in the midst of his story one of my friends turned to the other and said, "We don't know how lucky we are." And the Cuban stopped and said, "How lucky you are? I had someplace to escape to." And in that sentence he told us the entire story. If we lose freedom here, there's no place to escape to. This is the last stand on earth.</p>
- </blockquote>
+ </blockquote>
<h3>This is an h3 level heading</h3>
<p>Senator Humphrey last week charged that Barry Goldwater, as President, would seek to eliminate farmers. He should do his homework a little better, because he'll find out that we've had a decline of 5 million in the farm population under these government programs. He'll also find that the Democratic administration has sought to get from Congress [an] extension of the farm program to include that three-fourths that is now free. He'll find that they've also asked for the right to imprison farmers who wouldn't keep books as prescribed by the federal government. The Secretary of Agriculture asked for the right to seize farms through condemnation and resell them to other individuals. And contained in that same program was a provision that would have allowed the federal government to remove 2 million farmers from the soil.</p>
- <br />
<hr />
- <br />
<h1>This is an h1 heading</h1>
<h2>This is an h2 heading</h2>
@@ -32,9 +22,7 @@
<h5>This is an h5 heading</h5>
<h6>This is an h6 heading</h6>
- <br />
<hr />
- <br />
<h1>This is an h1 heading. It's extremely long and will undoubtedly wrap on a line or two by the time it's completely and utterly finished in ultimate perpetuity.</h1>
<p>And this is some text in a paragraph below it. Looks good. To understand what is really going on in a colony of ants or bees, Dr. Dornhaus, an assistant professor of ecology and evolutionary biology at the University of Arizona, tracks the little creatures individually — hence the paint and the numbers. Individual ants, she said, have “their own brains and legs, as well as complex and flexible behaviors.” She continues, “Each ant’s behavior and the rules under which it operates generate a pattern for the colony, so it’s crucial to discover its individual cognitive skill.”</p>
@@ -98,7 +86,7 @@
<dt>definition list dt</dt>
<dd>definition list dd one</dd>
<dd>definition list dd two</dd>
- </dl>
+ </dl>
@@ -616,7 +604,7 @@
</div>
<div class="notice">
This is a &lt;div&gt; with the class <strong>.notice</strong>.
- </div>
+ </div>
<div class="success">
This is a &lt;div&gt; with the class <strong>.success</strong>.
</div>
@@ -724,10 +712,10 @@ end</code></pre>
<tt>&lt;tt&gt;
This tt text should be monospaced
- and
- wrap as if
+ and
+ wrap as if
one line of text
- even though the code has newlines, spaces, and tabs.
+ even though the code has newlines, spaces, and tabs.
It should be the same size as &lt;p&gt; text.
</tt>
@@ -6,22 +6,40 @@
<title>Flutie v1</title>
<style type="text/css">
- /* These are styles to make the page look nice */
+ /* Styleguide-specific styles */
+ body {
+ background-color: #dadada;
+ }
+
+ .switcher {
+ margin: 30px auto 0;
+ text-align: right;
+ width: 880px;
+ }
- body { background-color: #dadada;}
.content {
background: #fff;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+ margin: 30px auto;
padding: 40px;
- margin: 40px auto;
width: 880px;
- -moz-border-radius: 24px;
- -webkit-border-radius: 24px;
}
</style>
</head>
<body>
+
+ <div class="switcher">
+ <% if params[:flutie] %>
+ <a href="?flutie=false">Application Styles</a>
+ <% else %>
+ <a href="?flutie=true">Default Styles</a>
+ <% end %>
+ </div>
+
<div class="content">
<%= yield %>
</div>
@@ -1,7 +1,9 @@
/*
- html5doctor.com Reset Stylesheet (Eric Meyer's Reset Reloaded + HTML5 baseline)
- v1.4 2009-07-27 | Authors: Eric Meyer & Richard Clark
- html5doctor.com/html-5-reset-stylesheet/
+html5doctor.com Reset Stylesheet
+v1.6.1
+Last Updated: 2010-09-17
+Author: Richard Clark - http://richclarkdesign.com
+Twitter: @rich_clark
*/
html, body, div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -23,6 +25,9 @@ time, mark, audio, video {
vertical-align: baseline;
background: transparent; }
+body {
+ line-height: 1; }
+
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block; }
@@ -45,11 +50,13 @@ a {
vertical-align: baseline;
background: transparent; }
+/* change colours to suit your needs */
ins {
background-color: #ff9;
color: #000;
text-decoration: none; }
+/* change colours to suit your needs */
mark {
background-color: #ff9;
color: #000;
@@ -60,18 +67,19 @@ del {
text-decoration: line-through; }
abbr[title], dfn[title] {
+ border-bottom: 1px dotted;
cursor: help; }
-/* tables still need cellspacing="0" in the markup */
table {
border-collapse: collapse;
border-spacing: 0; }
+/* change border colour to suit your needs */
hr {
display: block;
height: 1px;
border: 0;
- border-top: 1px solid #ccc;
+ border-top: 1px solid #cccccc;
margin: 1em 0;
padding: 0; }
@@ -80,7 +88,7 @@ input, select {
/* Legacy support for inline-block in IE7 (maybe IE6) */
body {
- color: #222;
+ color: #333;
font-size: 13px;
font-family: "helvetica neue", arial, helvetica, "lucida grande", sans-serif; }
@@ -91,9 +99,12 @@ h1, h2, h3, h4, h5, h6 {
/* Success, error & notice boxes for messages and errors. */
div.error, div.notice, div.success,
#flash_failure, #flash_success, #flash_notice {
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
border: 1px solid #ddd;
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ -ms-border-radius: 8px;
+ -o-border-radius: 8px;
+ border-radius: 8px;
margin-bottom: 1em;
padding: 0.8em; }
@@ -239,59 +250,52 @@ h1, h2, h3, h4, h5, h6 {
font-weight: bold; }
h1 {
- font-size: 2.2em;
- line-height: 1;
- margin-bottom: 0.25em; }
+ font-size: 28px;
+ line-height: 1.2;
+ margin-bottom: 12px; }
h2 {
- font-size: 1.6em;
- line-height: 1.1;
- margin-bottom: 0.25em; }
+ font-size: 24px;
+ line-height: 1.2;
+ margin-bottom: 6px; }
h3 {
- font-size: 1.3em;
- line-height: 1;
- margin-bottom: 0.25em; }
+ font-size: 18px;
+ line-height: 1.2;
+ margin-bottom: 4px; }
h4 {
- font-size: 1.1em;
- line-height: 1.25;
- margin-bottom: 0.25em; }
+ font-size: 16px;
+ line-height: 1.3;
+ margin-bottom: 4px; }
h5 {
- font-size: 1em;
- margin-bottom: 0.25em; }
+ font-size: 14px;
+ margin-bottom: 4px; }
h6 {
- font-size: 1em;
- margin-bottom: 0.25em; }
+ font-size: 12px;
+ margin-bottom: 4px; }
/* Text elements */
p {
- margin-bottom: 0.5em; }
-
-p.last {
- margin-bottom: 0; }
-
-p img {
- float: left;
- margin: 1.5em 1.5em 1.5em 0;
- padding: 0; }
+ line-height: 1.4;
+ margin-bottom: 12px; }
/* Use this if the image is at the top of the <p>. */
p img.top {
margin-top: 0; }
img {
- margin: 0 0 1.5em; }
+ margin: 0 0 12px; }
abbr, acronym {
border-bottom: 1px dotted #666;
cursor: help; }
address {
font-style: italic;
- margin-top: 1.5em; }
+ margin-top: 16px; }
del {
color: #666; }
@@ -314,8 +318,8 @@ blockquote {
border-left: 4px solid #d1d1d1;
color: #666;
font-style: italic;
- margin: 1.5em 0;
- padding-left: 1em; }
+ margin: 16px 0;
+ padding-left: 12px; }
strong {
font-weight: bold; }
@@ -328,7 +332,7 @@ dfn {
font-weight: bold; }
pre, code {
- margin: 1.5em 0;
+ margin: 12px 0;
white-space: pre;
/* CSS2 */
white-space: pre-wrap;
@@ -337,7 +341,7 @@ pre, code {
/* IE */ }
pre, code, tt {
- font: 1em 'andale mono', 'monotype.com', 'lucida console', monospace;
+ font: 12px 'andale mono', 'monotype.com', 'lucida console', monospace;
line-height: 1.5; }
pre.code {
@@ -348,12 +352,16 @@ pre.code {
tt {
display: block;
line-height: 1.5;
- margin: 1.5em 0; }
+ margin: 16px 0; }
/* Forms */
-/*removes dotted outline on submit buttons when clicking in firefox */
+/*
+ * Remove inner padding and border in FF3/4
+ * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
+ */
input[type="submit"]::-moz-focus-inner {
- border: none; }
+ border: 0;
+ padding: 0; }
form ol {
list-style: none;
@@ -1,5 +1,5 @@
body {
- color: #222;
+ color: #333;
font-size: 13px;
font-family: "helvetica neue", arial, helvetica, "lucida grande", sans-serif;
}
@@ -12,11 +12,10 @@ h1, h2, h3, h4, h5, h6 {
/* Success, error & notice boxes for messages and errors. */
div.error, div.notice, div.success,
#flash_failure, #flash_success, #flash_notice {
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
border: 1px solid #ddd;
- margin-bottom: 1em;
- padding: 0.8em;
+ @include border-radius (8px);
+ margin-bottom: 12px;
+ padding: 10px;
}
div.error,
@@ -59,8 +58,8 @@ div.success a,
/* Use a .box to create a padded box inside a column. */
.box {
background: #eee;
- margin-bottom: 1.5em;
- padding: 1.5em;
+ margin-bottom: 16px;
+ padding: 16px;
}
/* Use this to create a horizontal ruler across a column. */
@@ -71,7 +70,7 @@ hr {
color: #ddd;
float: none;
height: 1px;
- margin: 0 0 1.4em;
+ margin: 0 0 12px;
width: 100%;
}
@@ -87,7 +86,7 @@ hr.space {
display: block;
overflow: hidden;
text-align: left;
- text-indent: -999em;
+ text-indent: -9999px;
}
/* Hide for both screenreaders and browsers
Oops, something went wrong.

0 comments on commit 3ef9ee7

Please sign in to comment.