From 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 9 Jan 2014 18:05:04 -0800 Subject: more derp --- docs/assets/css/docs.css | 58 +++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e12983807..e2b026edf 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -42,7 +42,7 @@ body { position: relative; /* For scrollyspy */ - padding-top: 50px; /* Account for fixed navbar */ + /*padding-top: 50px; Account for fixed navbar */ } /* Keep code small in tables on account of limited space */ @@ -67,7 +67,7 @@ body { /* Inverted outline button (white on dark) */ .btn-outline-inverse { - color: #563d7c; + color: #fff; background-color: transparent; border-color: #cdbfe3; } @@ -106,6 +106,10 @@ body { color: #563d7c; background-color: #fff; } +.bs-booticon-outline { + background-color: transparent; + border: 1px solid #fff; +} /* @@ -115,9 +119,16 @@ body { */ .bs-docs-nav { + margin-bottom: 0; background-color: #fff; - border-color: #e5e5e5; - box-shadow: 0 0 10px rgba(0,0,0,.05); + border-bottom-color: rgba(0,0,0,.1); + /*box-shadow: 0 0 10px rgba(0,0,0,.05);*/ + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.bs-home-nav .bs-nav-b { + display: none; } .bs-docs-nav .navbar-brand, .bs-docs-nav .navbar-nav > li > a { @@ -217,16 +228,24 @@ body { * Tweaks to the custom homepage and the masthead (main jumbotron). */ -.bs-docs-home { - background-color: #f9f9f9; -} - /* Masthead (headings and download button) */ .bs-masthead { position: relative; padding: 30px 15px; + color: #cdbfe3; text-align: center; - border-bottom: 1px solid #e5e5e5; + background-color: #563d7c; + background: #563d7c; + background: -moz-linear-gradient(top, #563d7c 0%, #654b8d 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#563d7c), color-stop(100%,#654b8d)); + background: -webkit-linear-gradient(top, #563d7c 0%,#654b8d 100%); + background: -o-linear-gradient(top, #563d7c 0%,#654b8d 100%); + background: -ms-linear-gradient(top, #563d7c 0%,#654b8d 100%); + background: linear-gradient(to bottom, #563d7c 0%,#654b8d 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#563d7c', endColorstr='#654b8d',GradientType=0 ); + + /*654B8D*/ + /*border-bottom: 1px solid #e5e5e5;*/ } .bs-masthead .bs-booticon { margin: 0 auto 30px; @@ -234,20 +253,21 @@ body { .bs-masthead h1 { font-weight: 300; line-height: 1; + color: #fff; } .bs-masthead .lead { - margin-bottom: 30px; + margin: 0 auto 30px; font-size: 20px; - color: #555; + color: #fff; } -.bs-masthead .btn-outline { +.bs-masthead .btn { width: 100%; - padding: 14px 24px; + padding: 15px 30px; font-size: 20px; } @media (min-width: 480px) { - .bs-masthead .btn-outline { + .bs-masthead .btn { width: auto; } } @@ -267,11 +287,9 @@ body { @media (min-width: 992px) { .bs-masthead .lead { + width: 80%; font-size: 30px; } - .bs-masthead .btn-outline { - padding: 18px 24px; - } } @@ -514,8 +532,8 @@ body { /* First level of nav */ .bs-sidenav { - margin-top: 30px; - margin-bottom: 30px; + margin-top: 20px; + margin-bottom: 20px; padding-top: 5px; padding-bottom: 5px; } @@ -581,7 +599,7 @@ body { } .bs-sidebar.affix { position: fixed; /* Undo the static from mobile first approach */ - top: 80px; + top: 20px; } .bs-sidebar.affix-bottom { position: absolute; /* Undo the static from mobile first approach */ -- cgit v1.2.3 From 79c18da4525b00c0fd8692d31c774b1f1c92f324 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Jan 2014 19:35:40 -0800 Subject: homepage improvements --- docs/assets/css/docs.css | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 4269e94f0..4a03fd6f1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -109,7 +109,7 @@ body { } .bs-booticon-outline { background-color: transparent; - border: 1px solid #fff; + border: 1px solid #cdbfe3; } @@ -122,11 +122,7 @@ body { .bs-docs-nav { margin-bottom: 0; background-color: #fff; - border-bottom-color: rgba(0,0,0,.1); - /*box-shadow: 0 0 10px rgba(0,0,0,.05);*/ - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-bottom: 0; } .bs-home-nav .bs-nav-b { display: none; @@ -235,18 +231,12 @@ body { padding: 30px 15px; color: #cdbfe3; text-align: center; - background-color: #563d7c; - background: #563d7c; - background: -moz-linear-gradient(top, #563d7c 0%, #654b8d 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#563d7c), color-stop(100%,#654b8d)); - background: -webkit-linear-gradient(top, #563d7c 0%,#654b8d 100%); - background: -o-linear-gradient(top, #563d7c 0%,#654b8d 100%); - background: -ms-linear-gradient(top, #563d7c 0%,#654b8d 100%); - background: linear-gradient(to bottom, #563d7c 0%,#654b8d 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#563d7c', endColorstr='#654b8d',GradientType=0 ); - - /*654B8D*/ - /*border-bottom: 1px solid #e5e5e5;*/ + text-shadow: 0 1px 0 rgba(0,0,0,.1); + background-color: #6f5499; + background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%); + background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0); } .bs-masthead .bs-booticon { margin: 0 auto 30px; @@ -306,6 +296,7 @@ body { font-size: 20px; text-align: center; background-color: #f9f9f9; + border-top: 1px solid #eee; border-bottom: 1px solid #eee; } .bs-header h1 { @@ -386,8 +377,18 @@ body { /* Homepage variation */ .bs-docs-home .carbonad { + background-color: transparent !important; margin: 0 -30px -31px !important; + border-color: #866ab3 !important; +} +.bs-docs-home .carbonad-tag { + color: inherit !important; } +.bs-docs-home .carbonad-text a, +.bs-docs-home .carbonad-tag a { + color: #fff !important; +} + @media (min-width: 480px) { .carbonad { -- cgit v1.2.3 From 613a95d8388ffa625e2a4a4451b2425beca6c5df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Jan 2014 19:42:10 -0800 Subject: brand guidelines cleanup --- docs/assets/css/docs.css | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 4a03fd6f1..323510e8b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,4 +1,4 @@ -/*csslint ids: false, overqualified-elements: false*/ +/*csslint ids: false, overqualified-elements: false, fallback-colors: false*/ /*! * Copyright 2011-2014 Twitter, Inc. * @@ -33,7 +33,6 @@ * Miscellaneous */ -/*csslint ids: false, fallback-colors: false*/ /* * Scaffolding @@ -43,7 +42,6 @@ body { position: relative; /* For scrollyspy */ - /*padding-top: 50px; Account for fixed navbar */ } /* Keep code small in tables on account of limited space */ @@ -700,12 +698,19 @@ h1[id] { } .color-swatch { float: left; - width: 100px; - height: 100px; + width: 60px; + height: 60px; margin: 0 5px; border-radius: 3px; } +@media (min-width: 768px) { + .color-swatch { + width: 100px; + height: 100px; + } +} + /* Framework colors */ .color-swatches .gray-darker { background-color: #222; } .color-swatches .gray-dark { background-color: #333; } @@ -1320,13 +1325,11 @@ h1[id] { /* Individual items */ .bs-brand-item { - display: table-cell; - width: 1%; padding: 60px 0; text-align: center; } .bs-brand-item + .bs-brand-item { - border-left: 1px solid #fff; + border-top: 1px solid #fff; } .bs-brand-logos .inverse { color: #fff; @@ -1339,9 +1342,6 @@ h1[id] { margin-top: 0; margin-bottom: 0; } -.bs-brand-item h1 { - font-size: 60px; -} .bs-brand-item .bs-booticon { margin-left: auto; margin-right: auto; @@ -1359,14 +1359,19 @@ h1[id] { .bs-brand-item .glyphicon-ok { background-color: #5cb85c; } .bs-brand-item .glyphicon-remove { background-color: #d9534f; } - @media (min-width: 768px) { -/* .bs-brand-logos .default, - .bs-brand-logos .inverse { - float: left; - width: 50%; + .bs-brand-item { + display: table-cell; + width: 1%; + } + .bs-brand-item + .bs-brand-item { + border-top: 0; + border-left: 1px solid #fff; } -*/} + .bs-brand-item h1 { + font-size: 60px; + } +} /* -- cgit v1.2.3 From 36aa3afb4f18a6a4a4a0c04f8494ee0673879517 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Jan 2014 23:15:37 -0800 Subject: Improve spacing and alignment of sections and their headings --- docs/assets/css/docs.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 323510e8b..91e34d2bd 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -626,14 +626,13 @@ body { */ /* Space things out */ -.bs-docs-section + .bs-docs-section { - padding-top: 40px; +.bs-docs-section { + margin-bottom: 60px; } /* Janky fix for preventing navbar from overlapping */ h1[id] { - padding-top: 80px; - margin-top: -45px; + padding-top: 20px; } -- cgit v1.2.3 From 4b1ff7fa49361fd4a13341767d53231fc9ecef21 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Jan 2014 00:04:24 -0800 Subject: Formatting and docs changes --- docs/assets/css/docs.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 91e34d2bd..772a0ebcf 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -290,6 +290,7 @@ body { /* Page headers */ .bs-header { + margin-bottom: 40px; padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */ font-size: 20px; text-align: center; @@ -534,8 +535,6 @@ body { .bs-sidenav { margin-top: 20px; margin-bottom: 20px; - padding-top: 5px; - padding-bottom: 5px; } /* All levels of nav */ @@ -630,8 +629,8 @@ body { margin-bottom: 60px; } -/* Janky fix for preventing navbar from overlapping */ h1[id] { + margin-top: 0; padding-top: 20px; } -- cgit v1.2.3 From aff64cffce549fc4c33c09b85c5cbe8b88df7dd7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 13 Jan 2014 21:31:40 -0800 Subject: avoid redundant banner in minified docs CSS --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 072f39b04..00d0be9ab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,7 +1,7 @@ /*csslint ids: false, overqualified-elements: false*/ /*! + * Bootstrap Docs (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. - * * Licensed under the Creative Commons Attribution 3.0 Unported License. For * details, see http://creativecommons.org/licenses/by/3.0/. */ -- cgit v1.2.3 From b77674950721a749f4a6213b4b6d3a4bae2bbad6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Jan 2014 22:54:22 -0800 Subject: make page headers like masthead --- docs/assets/css/docs.css | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index edfabcd33..6a2b091c3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -223,10 +223,9 @@ body { * Tweaks to the custom homepage and the masthead (main jumbotron). */ - /* Masthead (headings and download button) */ -.bs-masthead { - position: relative; - padding: 30px 15px; +/* Share masthead with page headers */ +.bs-masthead, +.bs-header { color: #cdbfe3; text-align: center; text-shadow: 0 1px 0 rgba(0,0,0,.1); @@ -236,6 +235,12 @@ body { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0); } + + /* Masthead (headings and download button) */ +.bs-masthead { + position: relative; + padding: 30px 15px; +} .bs-masthead .bs-booticon { margin: 0 auto 30px; } @@ -293,17 +298,13 @@ body { margin-bottom: 40px; padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */ font-size: 20px; - text-align: center; - background-color: #f9f9f9; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; } .bs-header h1 { - color: #563d7c; + color: #fff; } .bs-header p { font-weight: 300; - line-height: 1.5; + line-height: 1.4; } .bs-header .container { position: relative; @@ -311,6 +312,7 @@ body { @media (min-width: 768px) { .bs-header { + font-size: 24px; text-align: left; } .bs-header h1 { @@ -343,8 +345,8 @@ body { font-size: 13px !important; line-height: 16px !important; text-align: left; - background: #fff !important; - border: solid #e5e5e5 !important; + background: transparent !important; + border: solid #866ab3 !important; border-width: 1px 0 !important; } .carbonad-img { @@ -363,12 +365,12 @@ body { padding-top: 0 !important; } .carbonad-tag { - color: #999 !important; + color: inherit !important; text-align: left !important; } .carbonad-text a, .carbonad-tag a { - color: #563d7c !important; + color: #fff !important; } .carbonad #azcarbon > img { display: none; /* hide what I assume are tracking images */ @@ -376,23 +378,13 @@ body { /* Homepage variation */ .bs-docs-home .carbonad { - background-color: transparent !important; margin: 0 -30px -31px !important; - border-color: #866ab3 !important; -} -.bs-docs-home .carbonad-tag { - color: inherit !important; } -.bs-docs-home .carbonad-text a, -.bs-docs-home .carbonad-tag a { - color: #fff !important; -} - @media (min-width: 480px) { .carbonad { width: 330px !important; - margin: 20px auto 0 !important; + margin: 20px auto !important; border-radius: 4px; border-width: 1px !important; } -- cgit v1.2.3 From c4b41ceae3cdcb3b02b354922833ec826fff70b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Jan 2014 22:59:09 -0800 Subject: header masthead changes --- docs/assets/css/docs.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6a2b091c3..29abaed12 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -296,13 +296,14 @@ body { /* Page headers */ .bs-header { margin-bottom: 40px; - padding: 30px 15px 40px; /* side padding builds on .container 15px, so 30px */ font-size: 20px; } .bs-header h1 { + margin-top: 0; color: #fff; } .bs-header p { + margin-bottom: 0; font-weight: 300; line-height: 1.4; } @@ -312,6 +313,8 @@ body { @media (min-width: 768px) { .bs-header { + padding-top: 60px; + padding-bottom: 60px; font-size: 24px; text-align: left; } @@ -402,7 +405,7 @@ body { @media (min-width: 992px) { .carbonad { position: absolute; - top: 20px; + top: 0; right: 15px; /* 15px instead of 0 since box-sizing */ padding: 15px !important; width: 330px !important; -- cgit v1.2.3 From 6986bdb2a7a0e4b98d905e9de029ffac141c6b8d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 15 Jan 2014 15:01:41 -0800 Subject: Fix page headers --- docs/assets/css/docs.css | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 29abaed12..24834ea06 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -226,6 +226,8 @@ body { /* Share masthead with page headers */ .bs-masthead, .bs-header { + position: relative; + padding: 30px 15px; color: #cdbfe3; text-align: center; text-shadow: 0 1px 0 rgba(0,0,0,.1); @@ -237,10 +239,6 @@ body { } /* Masthead (headings and download button) */ -.bs-masthead { - position: relative; - padding: 30px 15px; -} .bs-masthead .bs-booticon { margin: 0 auto 30px; } @@ -341,7 +339,7 @@ body { .carbonad { width: auto !important; - margin: 20px -30px -41px !important; + margin: 30px -30px -31px !important; padding: 20px !important; overflow: hidden; /* clearfix */ height: auto !important; @@ -379,11 +377,6 @@ body { display: none; /* hide what I assume are tracking images */ } -/* Homepage variation */ -.bs-docs-home .carbonad { - margin: 0 -30px -31px !important; -} - @media (min-width: 480px) { .carbonad { width: 330px !important; -- cgit v1.2.3 From 95f24dca9aab5cfdd56d87d3ad8c6d3faa7d2928 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 16 Jan 2014 01:19:00 +0100 Subject: Fix customizer's toggle buttons' margin --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 24834ea06..229d96ebe 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1209,7 +1209,7 @@ h1[id] { .bs-customizer .toggle { float: right; - margin-top: 85px; /* On account of ghetto navbar fix */ + margin-top: 25px; } /* Headings and form contrls */ -- cgit v1.2.3 From 7e7264e22495ba1b85ec4dc95366f7abd146d4f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 15 Jan 2014 16:25:04 -0800 Subject: fix ad placement --- docs/assets/css/docs.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 24834ea06..89c205f95 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -391,7 +391,8 @@ body { @media (min-width: 768px) { .carbonad { - margin: 0 !important; + margin-left: 0 !important; + margin-right: 0 !important; } } @@ -400,6 +401,7 @@ body { position: absolute; top: 0; right: 15px; /* 15px instead of 0 since box-sizing */ + margin: 0 !important; padding: 15px !important; width: 330px !important; } -- cgit v1.2.3 From 7b42103df6aa207c4d6cc1d977ab0cd2bc04dc65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Jan 2014 11:33:50 -0800 Subject: kill bottom margin on last docs section --- docs/assets/css/docs.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 329dc62a3..3af419e7c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -618,6 +618,9 @@ body { .bs-docs-section { margin-bottom: 60px; } +.bs-docs-section:last-child { + margin-bottom: 0; +} h1[id] { margin-top: 0; -- cgit v1.2.3 From 317aa8092dcbf182ef3bdcc8d0222096fc6a51ea Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Jan 2014 22:11:51 -0600 Subject: spacing --- docs/assets/css/docs.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3af419e7c..5a96f891d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,4 +1,5 @@ /*csslint ids: false, overqualified-elements: false, fallback-colors: false*/ + /*! * Bootstrap Docs (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. -- cgit v1.2.3 From d1f69d4a7e23abbe8cdbc6ff7e642c0f8d51e624 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Jan 2014 15:37:05 -0600 Subject: scope styles to masthead, not homepage --- docs/assets/css/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5a96f891d..64cda346a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -385,7 +385,7 @@ body { border-radius: 4px; border-width: 1px !important; } - .bs-docs-home .carbonad { + .bs-masthead .carbonad { margin: 50px auto 0 !important; } } @@ -406,7 +406,7 @@ body { padding: 15px !important; width: 330px !important; } - .bs-docs-home .carbonad { + .bs-masthead .carbonad { position: static; } } -- cgit v1.2.3 From ec6c9d28240aa4ef32b13be51943f98c00f3437e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Feb 2014 00:18:34 -0800 Subject: Don't offset customizer alert, grunt dist --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 64cda346a..7cde54f66 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1269,7 +1269,7 @@ h1[id] { /* Error handling */ .bs-customizer-alert { position: fixed; - top: 51px; + top: 0; left: 0; right: 0; z-index: 1030; -- cgit v1.2.3 From f16a2376c11ac8946c4aee102ff141117815e2de Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 5 Feb 2014 13:46:24 -0800 Subject: add basic back to top link to docs sidenavs, fixes #12589 --- docs/assets/css/docs.css | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7cde54f66..ce8ef6131 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -560,8 +560,8 @@ body { padding-bottom: 10px; } .bs-sidebar .nav .nav > li > a { - padding-top: 2px; - padding-bottom: 2px; + padding-top: 1px; + padding-bottom: 1px; padding-left: 30px; font-size: 12px; font-weight: normal; @@ -577,6 +577,27 @@ body { padding-left: 28px; } +/* Back to top (hidden on mobile) */ +.back-to-top { + display: none; + margin-top: 10px; + margin-left: 10px; + padding: 4px 10px; + font-size: 12px; + font-weight: 500; + color: #999; +} +.back-to-top:hover { + text-decoration: none; + color: #563d7c; +} + +@media (min-width: 768px) { + .back-to-top { + display: block; + } +} + /* Show and affix the side nav when space allows it */ @media (min-width: 992px) { .bs-sidebar .nav > .active > ul { -- cgit v1.2.3 From 0d49920e0dd08643238aabad11783d58ee72798d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Feb 2014 23:24:16 -0800 Subject: Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs- --- docs/assets/css/docs.css | 156 +++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 78 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ce8ef6131..7b1052851 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -81,7 +81,7 @@ body { } /* Bootstrap "B" icon */ -.bs-booticon { +.bs-docs-booticon { display: block; font-weight: 500; color: #fff; @@ -90,23 +90,23 @@ body { cursor: default; text-align: center; } -.bs-booticon-sm { +.bs-docs-booticon-sm { width: 30px; height: 30px; font-size: 20px; line-height: 28px; } -.bs-booticon-lg { +.bs-docs-booticon-lg { width: 144px; height: 144px; font-size: 108px; line-height: 140px; } -.bs-booticon-inverse { +.bs-docs-booticon-inverse { color: #563d7c; background-color: #fff; } -.bs-booticon-outline { +.bs-docs-booticon-outline { background-color: transparent; border: 1px solid #cdbfe3; } @@ -156,7 +156,7 @@ body { * Separated section of content at the bottom of all pages, save the homepage. */ -.bs-footer { +.bs-docs-footer { padding-top: 40px; padding-bottom: 40px; margin-top: 100px; @@ -164,21 +164,21 @@ body { text-align: center; border-top: 1px solid #e5e5e5; } -.footer-links { +.bs-docs-footer-links { margin-top: 20px; padding-left: 0; color: #999; } -.footer-links li { +.bs-docs-footer-links li { display: inline; padding: 0 2px; } -.footer-links li:first-child { +.bs-docs-footer-links li:first-child { padding-left: 0; } @media (min-width: 768px) { - .bs-footer p { + .bs-docs-footer p { margin-bottom: 0; } } @@ -190,25 +190,25 @@ body { * Twitter and GitHub social action buttons (for homepage and footer). */ -.bs-social { +.bs-docs-social { margin-bottom: 20px; text-align: center; } -.bs-social-buttons { +.bs-docs-social-buttons { display: inline-block; margin-bottom: 0; padding-left: 0; list-style: none; } -.bs-social-buttons li { +.bs-docs-social-buttons li { display: inline-block; line-height: 1; padding: 5px 8px; } -.bs-social-buttons .twitter-follow-button { +.bs-docs-social-buttons .twitter-follow-button { width: 225px !important; } -.bs-social-buttons .twitter-share-button { +.bs-docs-social-buttons .twitter-share-button { width: 98px !important; } /* Style the GitHub buttons via CSS instead of inline attributes */ @@ -225,8 +225,8 @@ body { */ /* Share masthead with page headers */ -.bs-masthead, -.bs-header { +.bs-docs-masthead, +.bs-docs-header { position: relative; padding: 30px 15px; color: #cdbfe3; @@ -240,46 +240,46 @@ body { } /* Masthead (headings and download button) */ -.bs-masthead .bs-booticon { +.bs-docs-masthead .bs-docs-booticon { margin: 0 auto 30px; } -.bs-masthead h1 { +.bs-docs-masthead h1 { font-weight: 300; line-height: 1; color: #fff; } -.bs-masthead .lead { +.bs-docs-masthead .lead { margin: 0 auto 30px; font-size: 20px; color: #fff; } -.bs-masthead .btn { +.bs-docs-masthead .btn { width: 100%; padding: 15px 30px; font-size: 20px; } @media (min-width: 480px) { - .bs-masthead .btn { + .bs-docs-masthead .btn { width: auto; } } @media (min-width: 768px) { - .bs-masthead { + .bs-docs-masthead { padding-top: 80px; padding-bottom: 80px; } - .bs-masthead h1 { + .bs-docs-masthead h1 { font-size: 60px; } - .bs-masthead .lead { + .bs-docs-masthead .lead { font-size: 24px; } } @media (min-width: 992px) { - .bs-masthead .lead { + .bs-docs-masthead .lead { width: 80%; font-size: 30px; } @@ -293,39 +293,39 @@ body { */ /* Page headers */ -.bs-header { +.bs-docs-header { margin-bottom: 40px; font-size: 20px; } -.bs-header h1 { +.bs-docs-header h1 { margin-top: 0; color: #fff; } -.bs-header p { +.bs-docs-header p { margin-bottom: 0; font-weight: 300; line-height: 1.4; } -.bs-header .container { +.bs-docs-header .container { position: relative; } @media (min-width: 768px) { - .bs-header { + .bs-docs-header { padding-top: 60px; padding-bottom: 60px; font-size: 24px; text-align: left; } - .bs-header h1 { + .bs-docs-header h1 { font-size: 60px; line-height: 1; } } @media (min-width: 992px) { - .bs-header h1, - .bs-header p { + .bs-docs-header h1, + .bs-docs-header p { margin-right: 380px; } } @@ -385,7 +385,7 @@ body { border-radius: 4px; border-width: 1px !important; } - .bs-masthead .carbonad { + .bs-docs-masthead .carbonad { margin: 50px auto 0 !important; } } @@ -406,7 +406,7 @@ body { padding: 15px !important; width: 330px !important; } - .bs-masthead .carbonad { + .bs-docs-masthead .carbonad { position: static; } } @@ -418,7 +418,7 @@ body { * Reasons to use Bootstrap, entries from the Expo, and more. */ -.bs-featurette { +.bs-docs-featurette { padding-top: 40px; padding-bottom: 40px; font-size: 16px; @@ -428,12 +428,12 @@ body { background-color: #fff; border-bottom: 1px solid #e5e5e5; } -.bs-featurette + .bs-footer { +.bs-docs-featurette + .bs-docs-footer { margin-top: 0; border-top: 0; } -.bs-featurette-title { +.bs-docs-featurette-title { font-size: 30px; font-weight: normal; color: #333; @@ -443,63 +443,63 @@ body { width: 100px; margin: 40px auto; } -.bs-featurette h3 { +.bs-docs-featurette h3 { font-weight: normal; color: #333; margin-bottom: 5px; } -.bs-featurette-img { +.bs-docs-featurette-img { display: block; margin-bottom: 20px; color: #333; } -.bs-featurette-img:hover { +.bs-docs-featurette-img:hover { text-decoration: none; color: #428bca; } -.bs-featurette-img img { +.bs-docs-featurette-img img { display: block; margin-bottom: 15px; } /* Featured sites */ -.bs-featured-sites { +.bs-docs-featured-sites { margin-left: -1px; margin-right: -1px; } -.bs-featured-sites .col-sm-3 { +.bs-docs-featured-sites .col-sm-3 { padding-left: 1px; padding-right: 1px; } @media (min-width: 480px) { - .bs-featurette .img-responsive { + .bs-docs-featurette .img-responsive { margin-top: 30px; } } @media (min-width: 768px) { - .bs-featurette { + .bs-docs-featurette { padding-top: 100px; padding-bottom: 100px; } - .bs-featurette-title { + .bs-docs-featurette-title { font-size: 40px; } - .bs-featurette .lead { + .bs-docs-featurette .lead { margin-left: auto; margin-right: auto; max-width: 80%; } - .bs-featured-sites .col-sm-3:first-child img { + .bs-docs-featured-sites .col-sm-3:first-child img { border-top-left-radius: 4px; border-bottom-left-radius: 4px; } - .bs-featured-sites .col-sm-3:last-child img { + .bs-docs-featured-sites .col-sm-3:last-child img { border-top-right-radius: 4px; border-bottom-right-radius: 4px; } - .bs-featurette .img-responsive { + .bs-docs-featurette .img-responsive { margin-top: 0; } } @@ -513,40 +513,40 @@ body { */ /* By default it's not affixed in mobile views, so undo that */ -.bs-sidebar.affix { +.bs-docs-sidebar.affix { position: static; } @media (min-width: 768px) { - .bs-sidebar { + .bs-docs-sidebar { padding-left: 20px; } } /* First level of nav */ -.bs-sidenav { +.bs-docs-sidenav { margin-top: 20px; margin-bottom: 20px; } /* All levels of nav */ -.bs-sidebar .nav > li > a { +.bs-docs-sidebar .nav > li > a { display: block; font-size: 13px; font-weight: 500; color: #999; padding: 4px 20px; } -.bs-sidebar .nav > li > a:hover, -.bs-sidebar .nav > li > a:focus { +.bs-docs-sidebar .nav > li > a:hover, +.bs-docs-sidebar .nav > li > a:focus { padding-left: 19px; color: #563d7c; text-decoration: none; background-color: transparent; border-left: 1px solid #563d7c; } -.bs-sidebar .nav > .active > a, -.bs-sidebar .nav > .active:hover > a, -.bs-sidebar .nav > .active:focus > a { +.bs-docs-sidebar .nav > .active > a, +.bs-docs-sidebar .nav > .active:hover > a, +.bs-docs-sidebar .nav > .active:focus > a { padding-left: 18px; font-weight: bold; color: #563d7c; @@ -555,24 +555,24 @@ body { } /* Nav: second level (shown on .active) */ -.bs-sidebar .nav .nav { +.bs-docs-sidebar .nav .nav { display: none; /* Hide by default, but at >768px, show it */ padding-bottom: 10px; } -.bs-sidebar .nav .nav > li > a { +.bs-docs-sidebar .nav .nav > li > a { padding-top: 1px; padding-bottom: 1px; padding-left: 30px; font-size: 12px; font-weight: normal; } -.bs-sidebar .nav .nav > li > a:hover, -.bs-sidebar .nav .nav > li > a:focus { +.bs-docs-sidebar .nav .nav > li > a:hover, +.bs-docs-sidebar .nav .nav > li > a:focus { padding-left: 29px; } -.bs-sidebar .nav .nav > .active > a, -.bs-sidebar .nav .nav > .active:hover > a, -.bs-sidebar .nav .nav > .active:focus > a { +.bs-docs-sidebar .nav .nav > .active > a, +.bs-docs-sidebar .nav .nav > .active:hover > a, +.bs-docs-sidebar .nav .nav > .active:focus > a { font-weight: 500; padding-left: 28px; } @@ -600,31 +600,31 @@ body { /* Show and affix the side nav when space allows it */ @media (min-width: 992px) { - .bs-sidebar .nav > .active > ul { + .bs-docs-sidebar .nav > .active > ul { display: block; } /* Widen the fixed sidebar */ - .bs-sidebar.affix, - .bs-sidebar.affix-bottom { + .bs-docs-sidebar.affix, + .bs-docs-sidebar.affix-bottom { width: 213px; } - .bs-sidebar.affix { + .bs-docs-sidebar.affix { position: fixed; /* Undo the static from mobile first approach */ top: 20px; } - .bs-sidebar.affix-bottom { + .bs-docs-sidebar.affix-bottom { position: absolute; /* Undo the static from mobile first approach */ } - .bs-sidebar.affix-bottom .bs-sidenav, - .bs-sidebar.affix .bs-sidenav { + .bs-docs-sidebar.affix-bottom .bs-docs-sidenav, + .bs-docs-sidebar.affix .bs-docs-sidenav { margin-top: 0; margin-bottom: 0; } } @media (min-width: 1200px) { /* Widen the fixed sidebar again */ - .bs-sidebar.affix-bottom, - .bs-sidebar.affix { + .bs-docs-sidebar.affix-bottom, + .bs-docs-sidebar.affix { width: 263px; } } @@ -1355,7 +1355,7 @@ h1[id] { margin-top: 0; margin-bottom: 0; } -.bs-brand-item .bs-booticon { +.bs-brand-item .bs-docs-booticon { margin-left: auto; margin-right: auto; } -- cgit v1.2.3 From 4973bfd5d777f8a92d7d95eee6bd3231242af3eb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Feb 2014 20:23:29 -0800 Subject: Fixes #12685: Display current version under download button on homepage --- docs/assets/css/docs.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7b1052851..3003e4f06 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -253,6 +253,11 @@ body { font-size: 20px; color: #fff; } +.bs-docs-masthead .version { + margin-top: -15px; + margin-bottom: 30px; + color: #9783b9; +} .bs-docs-masthead .btn { width: 100%; padding: 15px 30px; -- cgit v1.2.3 From f3735d5b122007063653a923b7bc2ef547ac35f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 12 Feb 2014 21:01:37 +0100 Subject: Fix scrollspy typo in docs.css --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3003e4f06..30daae5a2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -42,7 +42,7 @@ */ body { - position: relative; /* For scrollyspy */ + position: relative; /* For scrollspy */ } /* Keep code small in tables on account of limited space */ -- cgit v1.2.3 From 8ff7e64359c5a45fb8fe2fb87ca01f8561bdf213 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 10:12:52 +0200 Subject: Add docs.css in the CSSComb task. --- docs/assets/css/docs.css | 166 ++++++++++++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 67 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 30daae5a2..a554a59aa 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -85,10 +85,10 @@ body { display: block; font-weight: 500; color: #fff; + text-align: center; + cursor: default; background-color: #563d7c; border-radius: 15%; - cursor: default; - text-align: center; } .bs-docs-booticon-sm { width: 30px; @@ -128,8 +128,8 @@ body { } .bs-docs-nav .navbar-brand, .bs-docs-nav .navbar-nav > li > a { - color: #563d7c; font-weight: 500; + color: #563d7c; } .bs-docs-nav .navbar-nav > li > a:hover, .bs-docs-nav .navbar-nav > .active > a, @@ -165,8 +165,8 @@ body { border-top: 1px solid #e5e5e5; } .bs-docs-footer-links { - margin-top: 20px; padding-left: 0; + margin-top: 20px; color: #999; } .bs-docs-footer-links li { @@ -196,14 +196,14 @@ body { } .bs-docs-social-buttons { display: inline-block; - margin-bottom: 0; padding-left: 0; + margin-bottom: 0; list-style: none; } .bs-docs-social-buttons li { display: inline-block; - line-height: 1; padding: 5px 8px; + line-height: 1; } .bs-docs-social-buttons .twitter-follow-button { width: 225px !important; @@ -213,8 +213,8 @@ body { } /* Style the GitHub buttons via CSS instead of inline attributes */ .github-btn { - border: 0; overflow: hidden; + border: 0; } @@ -234,9 +234,9 @@ body { text-shadow: 0 1px 0 rgba(0,0,0,.1); background-color: #6f5499; background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%); - background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%); - background-repeat: repeat-x; + background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0); + background-repeat: repeat-x; } /* Masthead (headings and download button) */ @@ -345,10 +345,10 @@ body { .carbonad { width: auto !important; - margin: 30px -30px -31px !important; + height: auto !important; padding: 20px !important; + margin: 30px -30px -31px !important; overflow: hidden; /* clearfix */ - height: auto !important; font-size: 13px !important; line-height: 16px !important; text-align: left; @@ -361,8 +361,8 @@ body { } .carbonad-text, .carbonad-tag { - float: none !important; display: block !important; + float: none !important; width: auto !important; height: auto !important; margin-left: 145px !important; @@ -387,8 +387,8 @@ body { .carbonad { width: 330px !important; margin: 20px auto !important; - border-radius: 4px; border-width: 1px !important; + border-radius: 4px; } .bs-docs-masthead .carbonad { margin: 50px auto 0 !important; @@ -397,8 +397,8 @@ body { @media (min-width: 768px) { .carbonad { - margin-left: 0 !important; margin-right: 0 !important; + margin-left: 0 !important; } } @@ -407,9 +407,9 @@ body { position: absolute; top: 0; right: 15px; /* 15px instead of 0 since box-sizing */ - margin: 0 !important; - padding: 15px !important; width: 330px !important; + padding: 15px !important; + margin: 0 !important; } .bs-docs-masthead .carbonad { position: static; @@ -439,19 +439,19 @@ body { } .bs-docs-featurette-title { + margin-bottom: 5px; font-size: 30px; font-weight: normal; color: #333; - margin-bottom: 5px; } .half-rule { width: 100px; margin: 40px auto; } .bs-docs-featurette h3 { + margin-bottom: 5px; font-weight: normal; color: #333; - margin-bottom: 5px; } .bs-docs-featurette-img { display: block; @@ -459,8 +459,8 @@ body { color: #333; } .bs-docs-featurette-img:hover { - text-decoration: none; color: #428bca; + text-decoration: none; } .bs-docs-featurette-img img { display: block; @@ -469,12 +469,12 @@ body { /* Featured sites */ .bs-docs-featured-sites { - margin-left: -1px; margin-right: -1px; + margin-left: -1px; } .bs-docs-featured-sites .col-sm-3 { - padding-left: 1px; padding-right: 1px; + padding-left: 1px; } @media (min-width: 480px) { @@ -491,9 +491,9 @@ body { font-size: 40px; } .bs-docs-featurette .lead { - margin-left: auto; - margin-right: auto; max-width: 80%; + margin-right: auto; + margin-left: auto; } .bs-docs-featured-sites .col-sm-3:first-child img { border-top-left-radius: 4px; @@ -536,10 +536,10 @@ body { /* All levels of nav */ .bs-docs-sidebar .nav > li > a { display: block; + padding: 4px 20px; font-size: 13px; font-weight: 500; color: #999; - padding: 4px 20px; } .bs-docs-sidebar .nav > li > a:hover, .bs-docs-sidebar .nav > li > a:focus { @@ -578,23 +578,23 @@ body { .bs-docs-sidebar .nav .nav > .active > a, .bs-docs-sidebar .nav .nav > .active:hover > a, .bs-docs-sidebar .nav .nav > .active:focus > a { - font-weight: 500; padding-left: 28px; + font-weight: 500; } /* Back to top (hidden on mobile) */ .back-to-top { display: none; + padding: 4px 10px; margin-top: 10px; margin-left: 10px; - padding: 4px 10px; font-size: 12px; font-weight: 500; color: #999; } .back-to-top:hover { - text-decoration: none; color: #563d7c; + text-decoration: none; } @media (min-width: 768px) { @@ -650,8 +650,8 @@ body { } h1[id] { - margin-top: 0; padding-top: 20px; + margin-top: 0; } @@ -664,8 +664,8 @@ h1[id] { /* Common styles for all types */ .bs-callout { - margin: 20px 0; padding: 20px; + margin: 20px 0; border-left: 3px solid #eee; } .bs-callout h4 { @@ -730,22 +730,50 @@ h1[id] { } /* Framework colors */ -.color-swatches .gray-darker { background-color: #222; } -.color-swatches .gray-dark { background-color: #333; } -.color-swatches .gray { background-color: #555; } -.color-swatches .gray-light { background-color: #999; } -.color-swatches .gray-lighter { background-color: #eee; } -.color-swatches .brand-primary { background-color: #428bca; } -.color-swatches .brand-success { background-color: #5cb85c; } -.color-swatches .brand-warning { background-color: #f0ad4e; } -.color-swatches .brand-danger { background-color: #d9534f; } -.color-swatches .brand-info { background-color: #5bc0de; } +.color-swatches .gray-darker { + background-color: #222; +} +.color-swatches .gray-dark { + background-color: #333; +} +.color-swatches .gray { + background-color: #555; +} +.color-swatches .gray-light { + background-color: #999; +} +.color-swatches .gray-lighter { + background-color: #eee; +} +.color-swatches .brand-primary { + background-color: #428bca; +} +.color-swatches .brand-success { + background-color: #5cb85c; +} +.color-swatches .brand-warning { + background-color: #f0ad4e; +} +.color-swatches .brand-danger { + background-color: #d9534f; +} +.color-swatches .brand-info { + background-color: #5bc0de; +} /* Docs colors */ -.color-swatches .bs-purple { background-color: #563d7c; } -.color-swatches .bs-purple-light { background-color: #c7bfd3; } -.color-swatches .bs-purple-lighter { background-color: #e5e1ea; } -.color-swatches .bs-gray { background-color: #f9f9f9; } +.color-swatches .bs-purple { + background-color: #563d7c; +} +.color-swatches .bs-purple-light { + background-color: #c7bfd3; +} +.color-swatches .bs-purple-lighter { + background-color: #e5e1ea; +} +.color-swatches .bs-gray { + background-color: #f9f9f9; +} /* @@ -755,8 +783,8 @@ h1[id] { */ .bs-team .team-member { - color: #555; line-height: 32px; + color: #555; } .bs-team .team-member:hover { color: #333; @@ -764,9 +792,9 @@ h1[id] { } .bs-team .github-btn { float: right; - margin-top: 6px; width: 180px; height: 20px; + margin-top: 6px; } .bs-team img { float: left; @@ -808,14 +836,13 @@ h1[id] { padding: 45px 15px 15px; margin: 0 -15px 15px; background-color: #fafafa; - box-shadow: inset 0 3px 6px rgba(0,0,0,.05); border-color: #e5e5e5 #eee #eee; border-style: solid; border-width: 1px 0; + box-shadow: inset 0 3px 6px rgba(0,0,0,.05); } /* Echo out a label for the example */ .bs-example:after { - content: "Example"; position: absolute; top: 15px; left: 15px; @@ -824,33 +851,34 @@ h1[id] { color: #bbb; text-transform: uppercase; letter-spacing: 1px; + content: "Example"; } /* Tweak display of the code snippets when following an example */ .bs-example + .highlight { margin: -15px -15px 15px; - border-radius: 0; border-width: 0 0 1px; + border-radius: 0; } /* Make the examples and snippets not full-width */ @media (min-width: 768px) { .bs-example { - margin-left: 0; margin-right: 0; + margin-left: 0; background-color: #fff; - border-width: 1px; border-color: #ddd; + border-width: 1px; border-radius: 4px 4px 0 0; box-shadow: none; } .bs-example + .highlight { margin-top: -16px; - margin-left: 0; margin-right: 0; + margin-left: 0; border-width: 1px; - border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } } @@ -962,8 +990,8 @@ h1[id] { .bs-navbar-top-example .navbar-fixed-top, .bs-navbar-bottom-example .navbar-fixed-bottom { position: relative; - margin-left: 0; margin-right: 0; + margin-left: 0; } .bs-navbar-top-example { padding-bottom: 45px; @@ -1016,15 +1044,15 @@ h1[id] { position: relative; top: auto; right: auto; - left: auto; bottom: auto; + left: auto; z-index: 1; display: block; } .bs-example-modal .modal-dialog { left: auto; - margin-left: auto; margin-right: auto; + margin-left: auto; } /* Example dropdowns */ @@ -1087,9 +1115,9 @@ h1[id] { padding: 0; margin-top: 0; margin-bottom: 0; + white-space: nowrap; background-color: transparent; border: 0; - white-space: nowrap; } .highlight pre code { font-size: inherit; @@ -1100,8 +1128,8 @@ h1[id] { width: 22px; padding-right: 5px; margin-right: 10px; - text-align: right; color: #bebec5; + text-align: right; } @@ -1201,8 +1229,8 @@ h1[id] { font-size: 10px; line-height: 1.4; text-align: center; - border: 1px solid #fff; background-color: #f9f9f9; + border: 1px solid #fff; } .bs-glyphicons .glyphicon { margin-top: 5px; @@ -1221,8 +1249,8 @@ h1[id] { @media (min-width: 768px) { .bs-glyphicons { - margin-left: 0; margin-right: 0; + margin-left: 0; } .bs-glyphicons li { width: 12.5%; @@ -1251,9 +1279,9 @@ h1[id] { color: #555; } .bs-customizer h2 { + padding-top: 30px; margin-top: 0; margin-bottom: 5px; - padding-top: 30px; } .bs-customizer h3 { margin-bottom: 0; @@ -1271,8 +1299,8 @@ h1[id] { background-color: #fafafa; } .bs-customizer .help-block { - font-size: 12px; margin-bottom: 5px; + font-size: 12px; } /* For the variables, use regular weight */ @@ -1283,8 +1311,8 @@ h1[id] { .bs-customizer-input { float: left; width: 33.333333%; - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } /* Downloads */ @@ -1296,14 +1324,14 @@ h1[id] { .bs-customizer-alert { position: fixed; top: 0; - left: 0; right: 0; + left: 0; z-index: 1030; padding: 15px 0; color: #fff; background-color: #d9534f; - box-shadow: inset 0 1px 0 rgba(255,255,255,.25); border-bottom: 1px solid #b94441; + box-shadow: inset 0 1px 0 rgba(255,255,255,.25); } .bs-customizer-alert .close { margin-top: -4px; @@ -1361,8 +1389,8 @@ h1[id] { margin-bottom: 0; } .bs-brand-item .bs-docs-booticon { - margin-left: auto; margin-right: auto; + margin-left: auto; } /* Make the icons stand out on what is/isn't okay */ @@ -1374,8 +1402,12 @@ h1[id] { color: #fff; border-radius: 50%; } -.bs-brand-item .glyphicon-ok { background-color: #5cb85c; } -.bs-brand-item .glyphicon-remove { background-color: #d9534f; } +.bs-brand-item .glyphicon-ok { + background-color: #5cb85c; +} +.bs-brand-item .glyphicon-remove { + background-color: #d9534f; +} @media (min-width: 768px) { .bs-brand-item { -- cgit v1.2.3 From a7339a0f4c05f5b6a84cc457641a363e18ef2b85 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 11:21:52 +0200 Subject: Move csslint overrides in Gruntfile.js. This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26 --- docs/assets/css/docs.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a554a59aa..8a82ed11e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,5 +1,3 @@ -/*csslint ids: false, overqualified-elements: false, fallback-colors: false*/ - /*! * Bootstrap Docs (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. -- cgit v1.2.3 From 5193f9f607affbb5c01f5215ed19168ce3530ca5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Mar 2014 13:32:02 -0800 Subject: add svg logos to brand guidelines --- docs/assets/css/docs.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8a82ed11e..739792ba8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1379,6 +1379,10 @@ h1[id] { color: #fff; background-color: #563d7c; } +.bs-brand-item .svg { + width: 144px; + height: 144px; +} /* Heading content within */ .bs-brand-item h1, -- cgit v1.2.3 From a4df36317407fdbef1458a1c5e59b088b85d72c4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Mar 2014 14:35:23 -0800 Subject: grunt after merging #12917 --- docs/assets/css/docs.css | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'docs/assets/css/docs.css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 739792ba8..4868c0696 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -422,7 +422,7 @@ body { */ .bs-docs-featurette { - padding-top: 40px; + padding-top: 40px; padding-bottom: 40px; font-size: 16px; line-height: 1.5; @@ -482,7 +482,7 @@ body { } @media (min-width: 768px) { .bs-docs-featurette { - padding-top: 100px; + padding-top: 100px; padding-bottom: 100px; } .bs-docs-featurette-title { @@ -491,7 +491,7 @@ body { .bs-docs-featurette .lead { max-width: 80%; margin-right: auto; - margin-left: auto; + margin-left: auto; } .bs-docs-featured-sites .col-sm-3:first-child img { border-top-left-radius: 4px; @@ -563,7 +563,7 @@ body { padding-bottom: 10px; } .bs-docs-sidebar .nav .nav > li > a { - padding-top: 1px; + padding-top: 1px; padding-bottom: 1px; padding-left: 30px; font-size: 12px; @@ -714,7 +714,7 @@ h1[id] { } .color-swatch { float: left; - width: 60px; + width: 60px; height: 60px; margin: 0 5px; border-radius: 3px; @@ -722,25 +722,25 @@ h1[id] { @media (min-width: 768px) { .color-swatch { - width: 100px; + width: 100px; height: 100px; } } /* Framework colors */ -.color-swatches .gray-darker { +.color-swatches .gray-darker { background-color: #222; } -.color-swatches .gray-dark { +.color-swatches .gray-dark { background-color: #333; } -.color-swatches .gray { +.color-swatches .gray { background-color: #555; } -.color-swatches .gray-light { +.color-swatches .gray-light { background-color: #999; } -.color-swatches .gray-lighter { +.color-swatches .gray-lighter { background-color: #eee; } .color-swatches .brand-primary { @@ -752,24 +752,24 @@ h1[id] { .color-swatches .brand-warning { background-color: #f0ad4e; } -.color-swatches .brand-danger { +.color-swatches .brand-danger { background-color: #d9534f; } -.color-swatches .brand-info { +.color-swatches .brand-info { background-color: #5bc0de; } /* Docs colors */ -.color-swatches .bs-purple { +.color-swatches .bs-purple { background-color: #563d7c; } -.color-swatches .bs-purple-light { +.color-swatches .bs-purple-light { background-color: #c7bfd3; } -.color-swatches .bs-purple-lighter { +.color-swatches .bs-purple-lighter { background-color: #e5e1ea; } -.color-swatches .bs-gray { +.color-swatches .bs-gray { background-color: #f9f9f9; } @@ -842,7 +842,7 @@ h1[id] { /* Echo out a label for the example */ .bs-example:after { position: absolute; - top: 15px; + top: 15px; left: 15px; font-size: 12px; font-weight: bold; @@ -1380,7 +1380,7 @@ h1[id] { background-color: #563d7c; } .bs-brand-item .svg { - width: 144px; + width: 144px; height: 144px; } -- cgit v1.2.3