Skip to content
GitLab
Commit 4d527f92 authored by XhmikosR's avatar XhmikosR
Browse files

Merge pull request #12861 from twbs/docs-csscomb 

Add docs.css in the CSSComb task.
parents 1e06cdff 2ef9f9b2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 106 additions and 69 deletions
+106 -69
Gruntfile.js
+ 6
- 1
View file @ 4d527f92
......@@ -237,6 +237,11 @@ module.exports = function (grunt) {
cwd: 'docs/examples/',
src: ['**/*.css'],
dest: 'docs/examples/'
},
docs: {
files: {
'docs/assets/css/docs.css': 'docs/assets/css/docs.css'
}
}
},
......@@ -389,7 +394,7 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task.
grunt.registerTask('dist-css', ['less', 'cssmin', 'csscomb', 'usebanner']);
grunt.registerTask('dist-css', ['less', 'csscomb', 'cssmin', 'usebanner']);
// Docs distribution task.
grunt.registerTask('dist-docs', 'copy:docs');
......
docs/assets/css/docs.css
+ 99
- 67
View file @ 4d527f92
......@@ -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 {
......
docs/assets/css/docs.min.css
+ 1
- 1
View file @ 4d527f92
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment