css wrangling

9 years ago · 362a081d68
parent 5e7665054e
commit 362a081d68
8 changed files with 64 additions and 120 deletions
--- a/supporting-docs/_includes/head.html
+++ b/supporting-docs/_includes/head.html
@ -5,8 +5,10 @@
  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

+  <link rel="stylesheet" href="http://matrix.org/site.css">
  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-  <link rel="stylesheet" href="{{ "/css/site.css" | prepend: site.baseurl }}">
+
+  <link rel="stylesheet" href="{{ "/css/site_overrides.css" | prepend: site.baseurl }}">
  <link rel="stylesheet" href="{{ "/css/basic.css" | prepend: site.baseurl }}">
  <link rel="stylesheet" href="{{ "/css/nature.css" | prepend: site.baseurl }}">

--- a/supporting-docs/_layouts/default.html
+++ b/supporting-docs/_layouts/default.html
@ -7,8 +7,9 @@
  <body>
  {% include nav.html %}
    <br />
-    <div class="page-content">
-      <div class="wrapper">
+    <div class="page-content" id="page">
+      <div class="wrapper" id="wrapper">
+        <div class="document_foo" id="foo">
      {{ content }}
      </div>
    </div>
--- a/supporting-docs/_posts/index.html
+++ b/supporting-docs/_posts/index.html
@ -1,7 +1,6 @@
 ---
 layout: default
 ---
-  {% include site.css %}
  {% include basic.css %}
  {% include nature.css %}

--- a/supporting-docs/css/default.css
+++ b/supporting-docs/css/default.css
@ -1,5 +0,0 @@
-p {
-    line-height: 1.5;
-}
-
-
--- a/supporting-docs/css/faq.css
+++ b/supporting-docs/css/faq.css
@ -1,16 +1,30 @@
-ul
-{
+.toc {
+    background: #f9f9f9;
+    border: 1px solid #aaaaaa;
+    display: table;
+    padding-top: 16px;
+    padding-right: 16px;
+    padding-bottom: 16px;
+    list-style: none;
+    color: #2EA3F2;
+}
+
+ul {
    padding-left: 30px;
 }

-p
-{
+p {
    padding-left: 30px;
+    color: #666;

 }

-h4,h5 
-{
+h3 {
+    padding-top: 48px;
+    color: #333;
+}
+
+h4, h5 {
    border-top: 40px solid transparent;
    margin-top: -40px;
    -webkit-background-clip: padding-box;
@ -19,6 +33,8 @@ h4,h5
    font-style: italic;
    font-size: 16px;
    padding-top: 16px;
+    color: #333;
+
 }


--- a/supporting-docs/css/site.css
+++ b/supporting-docs/css/site.css
@ -1,102 +0,0 @@
-/** Common layout **/
-
-html {
-    height: 100%;
-}
-
-body {
-    height: 100%;
-    font-family: "Open Sans", Helvetica, Arial, sans-serif ! important;
-    font-size: 12pt;
-    margin: 0px;
-}
-
-h1 {
-    font-size: 20pt;
-}
-
-a:link {    color: #666; 
-            text-decoration: underline;
-}
-a:visited { color: #666; }
-a:hover   { color: #000; }
-a:active  { color: #000; }
-
-a.anchor {  
-    display: block; 
-    position: relative; 
-    top: -50px; 
-    visibility: hidden;
-}
-
-#page {
-    min-height: 100%;
-    margin-bottom: -32px; /* to make room for the footer */
-}
-
-#wrapper {
-    margin: auto;
-    max-width: 1280px;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    padding-left: 20px;
-    padding-right: 20px;
-}
-
-#header
-{
-    position: fixed;
-    top: 0px;
-    width: 100%;
-    background-color: #000;
-    min-height: 40px;
-}
-
-.navButton {
-    font-size: 20px;
-    font-weight: bold;        
-    padding: 10px 20px 10px 20px;
-    text-decoration: none ! important; 
-}
-
-#header .navButton {
-    color: #fff ! important;
-}
-
-#headerContent {
-    /*
-    color: #ccc;
-    text-align: right;
-    */
-    text-align: center;
-    max-width: 1280px;
-    margin: auto;
-    min-height: 40px;
-    line-height: 40px;
-}
-
-#headerContent a:link,
-#headerContent a:visited,
-#headerContent a:hover,
-#headerContent a:active {
-    color: #fff;
-}
-
-#footer
-{
-    width: 100%;
-    border-top: #666 1px solid;
-    background-color: #aaa;
-    height: 32px;
-}
-
-#footerContent
-{
-    font-size: 8pt;
-    color: #fff;
-    max-width: 1280px;
-    margin: auto;
-    text-align: center;
-    height: 32px;
-    line-height: 32px;
-}
--- a/supporting-docs/css/site_overrides.css
+++ b/supporting-docs/css/site_overrides.css
@ -0,0 +1,36 @@
+p {
+    line-height: 1.5;
+    color: #666;
+}
+
+a.anchor {  
+    display: block; 
+    position: relative; 
+    top: -50px; 
+    visibility: hidden;
+}
+
+a:link {
+    color: #2EA3F2;
+    text-decoration: none;
+}
+
+a:visited {
+    color: #2EA3F2;
+    text-decoration: none;
+}
+
+a:active {
+    color: #2EA3F2;
+    text-decoration: none;
+}
+
+a:hover {
+    color: #2EA3F2;
+    text-decoration: underline;
+}
+
+h1,h2,h3,h4,h5 {
+    color: #333;
+}
+
--- a/supporting-docs/index.html
+++ b/supporting-docs/index.html
@ -1,9 +1,6 @@
 ---
 layout: default
 ---
-<link href="/docs/guides/css/default.css" type="text/css" rel="stylesheet" />
-
-
 <div class="home">

  <h1>Guides</h1>