From 362a081d68bad05af8c7167d6bcb1549ea96ae1d Mon Sep 17 00:00:00 2001 From: Oddvar Lovaas Date: Fri, 4 Sep 2015 16:32:20 +0100 Subject: [PATCH] css wrangling --- supporting-docs/_includes/head.html | 4 +- supporting-docs/_layouts/default.html | 5 +- supporting-docs/_posts/index.html | 1 - supporting-docs/css/default.css | 5 -- supporting-docs/css/faq.css | 28 +++++-- supporting-docs/css/site.css | 102 ------------------------- supporting-docs/css/site_overrides.css | 36 +++++++++ supporting-docs/index.html | 3 - 8 files changed, 64 insertions(+), 120 deletions(-) delete mode 100644 supporting-docs/css/default.css delete mode 100644 supporting-docs/css/site.css create mode 100644 supporting-docs/css/site_overrides.css diff --git a/supporting-docs/_includes/head.html b/supporting-docs/_includes/head.html index bb99e6ddc..ddb4d988d 100644 --- a/supporting-docs/_includes/head.html +++ b/supporting-docs/_includes/head.html @@ -5,8 +5,10 @@ {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + - + + diff --git a/supporting-docs/_layouts/default.html b/supporting-docs/_layouts/default.html index ae99cc0d7..ff7f69f33 100644 --- a/supporting-docs/_layouts/default.html +++ b/supporting-docs/_layouts/default.html @@ -7,8 +7,9 @@ {% include nav.html %}
-
-
+
+
+
{{ content }}
diff --git a/supporting-docs/_posts/index.html b/supporting-docs/_posts/index.html index c442d6e15..15c7d5c2b 100644 --- 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 %} diff --git a/supporting-docs/css/default.css b/supporting-docs/css/default.css deleted file mode 100644 index 7910683d3..000000000 --- a/supporting-docs/css/default.css +++ /dev/null @@ -1,5 +0,0 @@ -p { - line-height: 1.5; -} - - diff --git a/supporting-docs/css/faq.css b/supporting-docs/css/faq.css index d8dec2303..9730efa30 100644 --- 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; + } diff --git a/supporting-docs/css/site.css b/supporting-docs/css/site.css deleted file mode 100644 index 5baf9b285..000000000 --- a/supporting-docs/css/site.css +++ /dev/null @@ -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; -} diff --git a/supporting-docs/css/site_overrides.css b/supporting-docs/css/site_overrides.css new file mode 100644 index 000000000..700a09e1c --- /dev/null +++ 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; +} + diff --git a/supporting-docs/index.html b/supporting-docs/index.html index 2bc0177f0..2a77562d0 100644 --- a/supporting-docs/index.html +++ b/supporting-docs/index.html @@ -1,9 +1,6 @@ --- layout: default --- - - -

Guides