From 4a63dc62bfb5cbc41002a77df6acb68bcf7a3bfb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2016 22:38:08 -0700 Subject: Update ads code and styles (also fixes #20477 in different way) --- docs/assets/css/docs.min.css | 76 +++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 43 deletions(-) (limited to 'docs/assets/css/docs.min.css') diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css index 3d4f5a396..5daf17102 100644 --- a/docs/assets/css/docs.min.css +++ b/docs/assets/css/docs.min.css @@ -281,64 +281,54 @@ } } -.carbonad { - width: auto !important; - height: auto !important; - padding: 1.25rem !important; - margin: 2rem -30px -2rem !important; +#carbonads { + display: block; + padding: 15px 15px 15px 160px; + margin: 50px -15px 0; overflow: hidden; - font-family: inherit !important; - font-size: .8rem !important; - line-height: 1rem !important; - color: #cdbfe3 !important; + font-size: 13px; + line-height: 1.5; text-align: left; - background: #3e2c5a !important; - border: 0 !important; + border: solid #866ab3; + border-width: 1px 0 0; } -.carbonad-img { - margin: 0 !important; +#carbonads a { + color: #fff; + text-decoration: none; } -.carbonad-text, -.carbonad-tag { - display: block !important; - float: none !important; - width: auto !important; - height: auto !important; - margin-left: 145px !important; - font-family: inherit !important; +@media (min-width: 544px) { + #carbonads { + max-width: 330px; + margin: 50px auto 0; + border-width: 1px; + border-radius: 4px; + } } -.carbonad-text { - padding-top: 0 !important; +@media (min-width: 992px) { + #carbonads { + position: absolute; + top: 0; + right: 15px; + margin-top: 0; + } + .bd-masthead #carbonads { + position: static; + } } -.carbonad-tag { - color: inherit !important; - text-align: left !important; +.carbon-img { + float: left; + margin-left: -145px; } -.carbonad-text a, -.carbonad-tag a { +.carbon-poweredby { + display: block; color: #cdbfe3 !important; } -.carbonad-text a:hover, -.carbonad-tag a:hover { - color: #fff !important; -} - -@media (min-width: 544px) { - .carbonad { - width: 330px !important; - padding: 1rem !important; - margin-right: auto !important; - margin-left: auto !important; - border-radius: .25rem; - } -} - .bd-content > table { display: block; width: 100%; -- cgit v1.2.3 From a2a53cb8c5174ef713b7dc7633fc6f2d7a468ee5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 12:39:56 -0700 Subject: grunt --- docs/assets/css/docs.min.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/docs.min.css') diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css index 5daf17102..95190073e 100644 --- a/docs/assets/css/docs.min.css +++ b/docs/assets/css/docs.min.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Docs (http://getbootstrap.com) + * Bootstrap Docs (https://getbootstrap.com) * Copyright 2011-2016 The Bootstrap Authors * Copyright 2011-2016 Twitter, Inc. * Licensed under the Creative Commons Attribution 3.0 Unported License. For -- cgit v1.2.3 From 8d162553fa7fe499a72569d42debed18dfc5791b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Oct 2016 15:02:49 -0700 Subject: grunt --- docs/assets/css/docs.min.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/assets/css/docs.min.css') diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css index 95190073e..6d6f135df 100644 --- a/docs/assets/css/docs.min.css +++ b/docs/assets/css/docs.min.css @@ -113,7 +113,7 @@ margin-bottom: -2rem !important; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-masthead { padding-top: 8rem; padding-bottom: 2rem; @@ -174,7 +174,7 @@ text-align: center; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-featurette { text-align: left; } @@ -202,7 +202,7 @@ margin: 2.5rem auto; } -@media (min-width: 544px) { +@media (min-width: 576px) { .half-rule { margin-right: 0; margin-left: 0; @@ -298,7 +298,7 @@ text-decoration: none; } -@media (min-width: 544px) { +@media (min-width: 576px) { #carbonads { max-width: 330px; margin: 50px auto 0; @@ -374,7 +374,7 @@ margin-bottom: .25rem; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-title { font-size: 3rem; } @@ -418,7 +418,7 @@ font-weight: 300; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-pageheader { padding-top: 4rem; padding-bottom: 4rem; @@ -600,7 +600,7 @@ margin-bottom: 0; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-footer { text-align: left; } @@ -690,7 +690,7 @@ clear: both; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-example { padding: 1.5rem; margin-right: 0; @@ -809,7 +809,7 @@ margin: 1rem -1rem -1rem; } -@media (min-width: 544px) { +@media (min-width: 576px) { .bd-example .navbar-fixed-top { margin: -1.5rem -1.5rem 1rem; } @@ -915,7 +915,7 @@ background-color: #f7f7f9; } -@media (min-width: 544px) { +@media (min-width: 576px) { .highlight { padding: 1.5rem; margin-right: 0; @@ -997,13 +997,13 @@ border: 1px solid #d6e9c6; } -@media (max-width: 543px) { +@media (max-width: 575px) { .hidden-xs-only { display: none !important; } } -@media (min-width: 544px) and (max-width: 767px) { +@media (min-width: 576px) and (max-width: 767px) { .hidden-sm-only { display: none !important; } -- cgit v1.2.3 From 6d6538fc81ebdb9e29ca5a5a4e8e5768b9358fe9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2016 19:44:11 -0700 Subject: grunt --- docs/assets/css/docs.min.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'docs/assets/css/docs.min.css') diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css index 6d6f135df..e2c4402b9 100644 --- a/docs/assets/css/docs.min.css +++ b/docs/assets/css/docs.min.css @@ -1515,6 +1515,24 @@ color: #999; } +.language-bash::before { + color: #009; + content: "$ "; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.language-powershell::before { + color: #009; + content: "PM> "; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + .anchorjs-link { color: inherit; } -- cgit v1.2.3