From 14b579afd973c61a60e65cb5783afc7fc1626cda Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 8 Apr 2014 14:01:49 -0700 Subject: [PATCH] add layout class names and subpage class --- website/source/layouts/_header.erb | 2 +- website/source/stylesheets/_docs.less | 14 ++++++++++- website/source/stylesheets/_header.less | 16 ++++++------ website/source/stylesheets/_jumbotron.less | 9 +------ website/source/stylesheets/_utilities.less | 12 +++++++++ website/source/stylesheets/main.css | 29 +++++++++++++++++++++- 6 files changed, 63 insertions(+), 19 deletions(-) diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index 1e7a5b32ab..7e9f7eba96 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -39,7 +39,7 @@ -"> +">
">
diff --git a/website/source/stylesheets/_docs.less b/website/source/stylesheets/_docs.less index 3a7abc6bd4..25f19974f7 100755 --- a/website/source/stylesheets/_docs.less +++ b/website/source/stylesheets/_docs.less @@ -2,11 +2,23 @@ // Docs // -------------------------------------------------- +body.layout-docs, +body.layout-intro{ + background: #f7f3f9; + + >.container{ + .col-md-8[role=main]{ + min-height: 600px; + background-color: white; + } + } +} + .docs-sidebar{ margin-bottom: 30px; margin-top: 50px; margin-right: 4%; - background-color: @tan; + // background-color: @tan; border-radius: @el-border-radius; a{ diff --git a/website/source/stylesheets/_header.less b/website/source/stylesheets/_header.less index d9a846a39b..504e8dc4d2 100755 --- a/website/source/stylesheets/_header.less +++ b/website/source/stylesheets/_header.less @@ -2,6 +2,12 @@ // Header // -------------------------------------------------- +body.page-sub{ + #header{ + .consul-gradient-bg(); + } +} + #footer, #header { .anti-alias(); @@ -24,6 +30,7 @@ .navbar-toggle{ margin-top: 14px; + margin-bottom: 14px; border: 2px solid @white; .icon-bar{ border: 1px solid @white; @@ -200,14 +207,7 @@ @media (max-width: 768px) { #header{ - background: #694a9c; /* Old browsers */ - background: -moz-linear-gradient(left, #694a9c 0%, #cd2028 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, right top, color-stop(0%,#694a9c), color-stop(100%,#cd2028)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* IE10+ */ - background: linear-gradient(to right, #694a9c 0%,#cd2028 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#694a9c', endColorstr='#cd2028',GradientType=1 ); /* IE6-9 */ + .consul-gradient-bg(); .navbar-right{ float: none !important; diff --git a/website/source/stylesheets/_jumbotron.less b/website/source/stylesheets/_jumbotron.less index 9764e37ef8..e5a72469ea 100755 --- a/website/source/stylesheets/_jumbotron.less +++ b/website/source/stylesheets/_jumbotron.less @@ -15,14 +15,7 @@ padding-bottom: 0; margin-top: -92px; color: @jumbotron-color; - background: #694a9c; /* Old browsers */ - background: -moz-linear-gradient(left, #694a9c 0%, #cd2028 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, right top, color-stop(0%,#694a9c), color-stop(100%,#cd2028)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* IE10+ */ - background: linear-gradient(to right, #694a9c 0%,#cd2028 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#694a9c', endColorstr='#cd2028',GradientType=1 ); /* IE6-9 */ + .consul-gradient-bg(); &.mobile-hero{ background: transparent url( ../images/node-hero-pattern.jpg ) center center; diff --git a/website/source/stylesheets/_utilities.less b/website/source/stylesheets/_utilities.less index 1bfde1b9bb..a82ce83d3f 100755 --- a/website/source/stylesheets/_utilities.less +++ b/website/source/stylesheets/_utilities.less @@ -10,3 +10,15 @@ text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; } + +.consul-gradient-bg(){ + background: #694a9c; /* Old browsers */ + background: -moz-linear-gradient(left, #694a9c 0%, #cd2028 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, right top, color-stop(0%,#694a9c), color-stop(100%,#cd2028)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(left, #694a9c 0%,#cd2028 100%); /* IE10+ */ + background: linear-gradient(to right, #694a9c 0%,#cd2028 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#694a9c', endColorstr='#cd2028',GradientType=1 ); /* IE6-9 */ + +} \ No newline at end of file diff --git a/website/source/stylesheets/main.css b/website/source/stylesheets/main.css index 8bf9916abf..fe11385d4e 100644 --- a/website/source/stylesheets/main.css +++ b/website/source/stylesheets/main.css @@ -70,6 +70,24 @@ pre { padding-top: 15px; padding-bottom: 15px; } +body.page-sub #header { + background: #694a9c; + /* Old browsers */ + background: -moz-linear-gradient(left, #694a9c 0%, #cd2028 100%); + /* FF3.6+ */ + background: -webkit-gradient(linear, left top, right top, color-stop(0%, #694a9c), color-stop(100%, #cd2028)); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(left, #694a9c 0%, #cd2028 100%); + /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(left, #694a9c 0%, #cd2028 100%); + /* Opera 11.10+ */ + background: -ms-linear-gradient(left, #694a9c 0%, #cd2028 100%); + /* IE10+ */ + background: linear-gradient(to right, #694a9c 0%, #cd2028 100%); + /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#694a9c', endColorstr='#cd2028', GradientType=1); + /* IE6-9 */ +} #footer, #header { -webkit-font-smoothing: antialiased; @@ -93,6 +111,7 @@ pre { #footer .navbar-toggle, #header .navbar-toggle { margin-top: 14px; + margin-bottom: 14px; border: 2px solid #ffffff; } #footer .navbar-toggle .icon-bar, @@ -612,11 +631,19 @@ pre { .people .person .bio { padding-left: 150px; } +body.layout-docs, +body.layout-intro { + background: #f7f3f9; +} +body.layout-docs > .container .col-md-8[role=main], +body.layout-intro > .container .col-md-8[role=main] { + min-height: 600px; + background-color: white; +} .docs-sidebar { margin-bottom: 30px; margin-top: 50px; margin-right: 4%; - background-color: #f0f0e5; border-radius: 6px; } .docs-sidebar a {