1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

brand guidelines cleanup

This commit is contained in:
Mark Otto 2014-01-11 19:42:10 -08:00
parent 79c18da452
commit 613a95d838
2 changed files with 23 additions and 18 deletions

View file

@ -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;
}
}
/*

File diff suppressed because one or more lines are too long