From 6f80674d66408cf2d3b225156d097cf624a6a48e Mon Sep 17 00:00:00 2001 From: Thatcher Peskens Date: Mon, 25 Mar 2013 21:16:33 -0700 Subject: [PATCH] Fixed a little problem in the style --- docs/theme/docker/static/css/main.css | 12 +- docs/theme/docker/static/css/main.less | 209 ++++++++++++------------- 2 files changed, 110 insertions(+), 111 deletions(-) diff --git a/docs/theme/docker/static/css/main.css b/docs/theme/docker/static/css/main.css index d64370de0c..1e37fd06c9 100755 --- a/docs/theme/docker/static/css/main.css +++ b/docs/theme/docker/static/css/main.css @@ -82,7 +82,7 @@ h4 { .btn-custom { background-color: #292929 !important; background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#515151", endColorstr="#282828"); + filter: progid:dximagetransform.microsoft.gradient(startColorstr="#515151", endColorstr="#282828"); background-image: -khtml-gradient(linear, left top, left bottom, from(#515151), to(#282828)); background-image: -moz-linear-gradient(top, #515151, #282828); background-image: -ms-linear-gradient(top, #515151, #282828); @@ -247,9 +247,9 @@ section.header { /* ======================= Social footer ======================= */ -#footer .twitter, -#footer .github, -#footer .googleplus { +.social .twitter, +.social .github, +.social .googleplus { background: url("../img/footer-links.png") no-repeat transparent; display: inline-block; height: 35px; @@ -258,10 +258,10 @@ section.header { width: 35px; margin-right: 10px; } -#footer .twitter { +.social .twitter { background-position: 0px 2px; } -#footer .github { +.social .github { background-position: -59px 2px; } /* ======================= diff --git a/docs/theme/docker/static/css/main.less b/docs/theme/docker/static/css/main.less index 599e7883a6..100f7b418d 100644 --- a/docs/theme/docker/static/css/main.less +++ b/docs/theme/docker/static/css/main.less @@ -1,4 +1,5 @@ + /* ========================================================================== Author's custom styles ========================================================================== */ @@ -14,29 +15,29 @@ .red { - background-color: red; + background-color: red; } .blue { - background-color: blue; + background-color: blue; } .orange { - background-color: orange; + background-color: orange; } .gray { - background-color: grey; + background-color: grey; } body { - padding-top: 58px; - font-family: Arial, Helvetica, sans-serif; + padding-top: 58px; + font-family: Arial, Helvetica, sans-serif; } h1, h2, h3, h4 { - font-family: Arial, Helvetica, sans-serif; - // font-weight: bold; - font-weight: 900; + font-family: Arial, Helvetica, sans-serif; +// font-weight: bold; + font-weight: 900; } /* =================== @@ -45,25 +46,25 @@ h1, h2, h3, h4 { .navbar { z-index: 999; - .nav { - // float: right; + .nav { + // float: right; - li a{ - padding: 22px 15px 22px; - } - } - - .brand { - padding: 13px 10px 13px 28px ; - // padding-left: 30px; + li a{ + padding: 22px 15px 22px; + } + } - } + .brand { + padding: 13px 10px 13px 28px ; + // padding-left: 30px; - background-color: white; + } + + background-color: white; } .navbar-dotcloud .container { - border-bottom: 2px @black solid; + border-bottom: 2px @black solid; } @@ -130,11 +131,11 @@ h1, h2, h3, h4 { ===================== */ h1.pageheader { - color: @white; - font-size: 20px; - font-family: "Arial Black", Tahoma, sans-serif; - margin: 8px; - margin-left: 22px; + color: @white; + font-size: 20px; + font-family: "Arial Black", Tahoma, sans-serif; + margin: 8px; + margin-left: 22px; } /* =================== @@ -146,14 +147,14 @@ section.header { } .hero-unit { - background-color: @darkblue; + background-color: @darkblue; - h5 { - color: @white; - } - .subtitle { + h5 { + color: @white; + } + .subtitle { - } + } } @@ -162,15 +163,15 @@ section.header { ===================== */ .contentblock { - margin-top: 20px; - border-width: 3px; - // border-color: #E00; + margin-top: 20px; + border-width: 3px; +// border-color: #E00; // border-style:solid; // border-color: @borderGray; - // box-sizing: border-box; - background-color: @grayLighter; - box-sizing: content-box; - padding: 20px; +// box-sizing: border-box; + background-color: @grayLighter; + box-sizing: content-box; + padding: 20px; } .section img { @@ -185,17 +186,17 @@ section.header { ===================== */ .dotcloudsidebar { - // background-color: #ee3; - // border: 1px red dotted; - float: left; - height: 100%; - top: 0px; - bottom: 0px; - position: relative; - // margin: 0px; - min-height: 100%; - margin-top: 78px; - margin-bottom: 22px; +// background-color: #ee3; +// border: 1px red dotted; + float: left; + height: 100%; + top: 0px; + bottom: 0px; + position: relative; +// margin: 0px; + min-height: 100%; + margin-top: 78px; + margin-bottom: 22px; } @@ -218,7 +219,7 @@ section.header { padding: 0px; li { font-size: 14px; -// list-style: none; + // list-style: none; list-style-type: none; list-style-position: outside; list-style-image: none; @@ -281,22 +282,22 @@ section.header { } .border-box { - box-sizing: border-box; - padding: 20px; - background-color: @lightblue; - color: white; + box-sizing: border-box; + padding: 20px; + background-color: @lightblue; + color: white; } .titlebar { - background-color: @black; - margin-top: 0px; - margin-bottom: 20px; - min-height: 40px; - color: white; + background-color: @black; + margin-top: 0px; + margin-bottom: 20px; + min-height: 40px; + color: white; // box-sizing: border-box; - padding-top: 8px; - padding-bottom: 8px; + padding-top: 8px; + padding-bottom: 8px; } @@ -318,10 +319,10 @@ section.header { /* This is the default */ .span6.with-padding { - background-color: @lightblue; - height: 200px; - color: white; - padding: 10px; + background-color: @lightblue; + height: 200px; + color: white; + padding: 10px; } #global { @@ -335,17 +336,17 @@ section.header { ======================= */ .row1 { - background-color: @grayLight; - height: 100%; - position: relative; - } + background-color: @grayLight; + height: 100%; + position: relative; +} /* ======================= Social footer ======================= */ -#footer .twitter, #footer .github, #footer .googleplus { +.social .twitter, .social .github, .social .googleplus { background: url("../img/footer-links.png") no-repeat transparent; display: inline-block; height: 35px; @@ -355,11 +356,11 @@ section.header { margin-right: 10px; } -#footer .twitter { +.social .twitter { background-position: 0px 2px; } -#footer .github { +.social .github { background-position: -59px 2px; } @@ -369,51 +370,51 @@ section.header { ======================= */ /* Large desktop */ -@media (min-width: 1200px) { - .span6.with-padding { - background-color: @red; +@media (min-width: 1200px) { + .span6.with-padding { + background-color: @red; - width: (@gridColumnWidth1200 * 6) + (@gridGutterWidth1200 * 5) - @gridGutterWidth1200; - padding: @gridGutterWidth1200/2; - } + width: (@gridColumnWidth1200 * 6) + (@gridGutterWidth1200 * 5) - @gridGutterWidth1200; + padding: @gridGutterWidth1200/2; + } } /* Normal desktop */ @media (min-width: 980px) and (max-width: 1199px) { - .span6.with-padding { - background-color: @lightred; + .span6.with-padding { + background-color: @lightred; - width: (@gridColumnWidth * 6) + (@gridGutterWidth * 5) - @gridGutterWidth; - padding: @gridGutterWidth/2; - } + width: (@gridColumnWidth * 6) + (@gridGutterWidth * 5) - @gridGutterWidth; + padding: @gridGutterWidth/2; + } } /* Portrait tablet to landscape and desktop */ @media (min-width: 768px) and (max-width: 979px) { - body { - padding-top: 0px; - } + body { + padding-top: 0px; + } - .span6.with-padding { - background-color: @darkblue; + .span6.with-padding { + background-color: @darkblue; - width: (@gridColumnWidth768 * 6) + (@gridGutterWidth768 * 5) - @gridGutterWidth768; - padding: @gridGutterWidth768/2; - - } + width: (@gridColumnWidth768 * 6) + (@gridGutterWidth768 * 5) - @gridGutterWidth768; + padding: @gridGutterWidth768/2; + + } } - + /* Landscape phone to portrait tablet */ @media (max-width: 767px) { - body { - padding-top: 0px; - } - #global { - /* TODO: Fix this to be relative to the navigation size */ - padding-top: 600px; - } + body { + padding-top: 0px; + } + #global { + /* TODO: Fix this to be relative to the navigation size */ + padding-top: 600px; + } } @@ -422,6 +423,4 @@ section.header { @media (max-width: 480px) { -} - - +} \ No newline at end of file