Merge lp:~cjohnston/qa-dashboard/css-cleanup into lp:qa-dashboard

[Chris Johnston]

Misc CSS cleanup

[Joe Talbott (joetalbott)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:666
http://10.97.0.26:8080/job/dashboard-ci/232/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/232/rebuild

review: Approve (continuous-integration)

=== modified file 'common/static/css/new-style.css'
--- common/static/css/new-style.css	2013-10-22 14:25:56 +0000
+++ common/static/css/new-style.css	2013-10-25 15:44:02 +0000
@@ -1,3 +1,6 @@
+html {
+    font-size : 100%;
+}
 body {
     background : url("/static/images/body_bg.jpg") #fff;
     color : #333;
@@ -10,6 +13,60 @@
     border: 0;
     vertical-align: baseline;
 }
+code, li, p, pre {
+    font-size : 1em;
+    margin-bottom : 0.75em;
+    line-height : 1.6;
+    margin-bottom : 0.75em;
+}
+h1, h2, h3, h4 {
+    font-weight : 300;
+    line-height : 1.3;
+}
+h1 {
+    font-size : 2.813em;
+    margin-bottom : 0.267em;
+}
+h2 {
+    font-size : 2em;
+    margin-bottom : 0.375em;
+}
+h1 span, h2 span {
+    display : block;
+}
+ol + h2, p + h2, pre + h2, ul + h2 {
+    margin-top : 0.563em;
+}
+header nav a:link {
+    font-weight : normal;
+}
+h3 {
+    font-size : 1.438em;
+    margin-bottom : 0.522em;
+}
+ol + h3, p + h3, pre + h3, ul + h3 {
+    margin-top : 0.783em;
+}
+h4 {
+    font-size : 1.219em;
+    margin-bottom : 0.615em;
+}
+ol + h4, p + h4, pre + h4, ul + h4 {
+    margin-top : 1.219em;
+}
+h5 {
+    font-size : 1em;
+    margin-bottom : 0.75em;
+}
+h6 {
+    font-size : 0.813em;
+    margin-bottom : 0.923em;
+    text-transform : uppercase;
+    letter-spacing : 0.1em;
+}
+li {
+    margin-bottom : 0.4em;
+}
 header {
     margin : 0;
     padding : 0;

=== modified file 'common/static/css/style.css'
--- common/static/css/style.css	2013-10-22 14:25:56 +0000
+++ common/static/css/style.css	2013-10-25 15:44:02 +0000
@@ -218,62 +218,6 @@
     height: 14px;
 }
 
-h1 {
-    font-size: 2.4em; /** 36px (desired value) / 15px (baseline font-size value) */
-    font-weight: normal;
-    line-height: 1.3;
-    margin-bottom: .333em; /** 12px (desired value) / 36px (computed font-size value) */
-}
-
-h2 {
-    font-size: 1.6667em; /** 25px (desired value) / 15px (baseline font-size value) */
-    font-weight: normal;
-    line-height: 1.3;
-    margin-bottom: .48em; /** 12px (desired value) / 25px (computed font-size value) */
-}
-
-p + h2, ul + h2, ol + h2 {
-    margin-top: .72em; /** 18px (desired value) / 25px (computed font-size value) */
-}
-
-h3 {
-    font-size: 1.4em; /** 21px (desired value) / 15px (baseline font-size value) */
-    font-weight: normal;
-    line-height: 1.3;
-    margin-bottom: .571em; /** 12px (desired value) / 21px (computed font-size value) */
-}
-
-p + h3, ul + h3, ol + h3 {
-    margin-top: .857em; /** 18px (desired value) / 21px (computed font-size value) */
-}
-
-h4 {
-    font-size: 1.2em;
-    font-weight: normal;
-    line-height: 1.3;
-    margin-bottom: .666em;
-}
-
-p + h4, ul + h4, ol + h4 {
-    margin-top: 1.2em; /** 18px (desired value) / 15px (computed font-size value) */
-}
-
-h5 {
-    font-size : 1em;
-    margin-bottom : 0.75em;
-}
-
-p {
-    font-size: 1em;
-    line-height: 1.4;
-    margin-bottom: .666em;
-}
-
-li {
-    line-height: 1.4;
-    margin-bottom: .769em;
-}
-
 table.basic thead th, table.basic thead a {
     font-weight:bold;
 }