0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

Merge pull request #12568 from XhmikosR/examples-csscomb

Add examples in csscomb
This commit is contained in:
Mark Otto 2014-02-04 00:55:54 -08:00
commit 9a01aa2c44
15 changed files with 71 additions and 67 deletions

View File

@ -220,14 +220,20 @@ module.exports = function (grunt) {
},
csscomb: {
sort: {
options: {
config: 'less/.csscomb.json'
},
options: {
config: 'less/.csscomb.json'
},
dist: {
files: {
'dist/css/<%= pkg.name %>.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.css': 'dist/css/<%= pkg.name %>-theme.css'
}
},
examples: {
expand: true,
cwd: 'docs/examples/',
src: ['**/*.css'],
dest: 'docs/examples/'
}
},

View File

@ -13,10 +13,10 @@ h3, .h3,
h4, .h4,
h5, .h5,
h6, .h6 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;;
margin-top: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal;
color: #333;
margin-top: 0;
}
@ -62,14 +62,14 @@ h6, .h6 {
position: absolute;
bottom: 0;
left: 50%;
content: " ";
width: 0;
height: 0;
margin-left: -5px;
vertical-align: middle;
content: " ";
border-right: 5px solid transparent;
border-left: 5px solid transparent;
border-bottom: 5px solid;
border-left: 5px solid transparent;
}
@ -161,4 +161,3 @@ h6, .h6 {
background-color: #f9f9f9;
border-top: 1px solid #e5e5e5;
}

View File

@ -16,19 +16,19 @@ body {
.navbar-wrapper {
position: absolute;
top: 0;
left: 0;
right: 0;
left: 0;
z-index: 20;
}
/* Flip around the padding for proper display in narrow viewports */
.navbar-wrapper .container {
padding-left: 0;
padding-right: 0;
padding-left: 0;
}
.navbar-wrapper .navbar {
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
@ -65,21 +65,21 @@ body {
/* Pad the edges of the mobile views a bit */
.marketing {
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
/* Center align the text within the three columns below the carousel */
.marketing .col-lg-4 {
text-align: center;
margin-bottom: 20px;
text-align: center;
}
.marketing h2 {
font-weight: normal;
}
.marketing .col-lg-4 p {
margin-left: 10px;
margin-right: 10px;
margin-left: 10px;
}
@ -106,8 +106,8 @@ body {
/* Remove the edge padding needed for mobile */
.marketing {
padding-left: 0;
padding-right: 0;
padding-left: 0;
}
/* Navbar positioning foo */
@ -115,12 +115,12 @@ body {
margin-top: 20px;
}
.navbar-wrapper .container {
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
.navbar-wrapper .navbar {
padding-left: 0;
padding-right: 0;
padding-left: 0;
}
/* The navbar becomes detached from the top, so we round the corners */
@ -138,7 +138,6 @@ body {
.featurette-heading {
font-size: 50px;
}
}
@media (min-width: 992px) {

View File

@ -48,8 +48,8 @@ body {
vertical-align: top;
}
.cover-container {
margin-left: auto;
margin-right: auto;
margin-left: auto;
}
/* Padding for spacing */
@ -73,8 +73,8 @@ body {
margin-left: 20px;
}
.masthead-nav > li > a {
padding-left: 0;
padding-right: 0;
padding-left: 0;
font-size: 16px;
font-weight: bold;
color: #fff; /* IE8 proofing */

View File

@ -30,8 +30,8 @@ body {
.sidebar {
position: fixed;
top: 0;
left: 0;
bottom: 0;
left: 0;
z-index: 1000;
display: block;
padding: 70px 20px 20px;
@ -42,13 +42,13 @@ body {
/* Sidebar navigation */
.nav-sidebar {
margin-left: -20px;
margin-right: -21px; /* 20px padding + 1px border */
margin-bottom: 20px;
margin-left: -20px;
}
.nav-sidebar > li > a {
padding-left: 20px;
padding-right: 20px;
padding-left: 20px;
}
.nav-sidebar > .active > a {
color: #fff;
@ -65,8 +65,8 @@ body {
}
@media (min-width: 768px) {
.main {
padding-left: 40px;
padding-right: 40px;
padding-left: 40px;
}
}
.main .page-header {

View File

@ -1,6 +1,6 @@
.container {
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
h4 {
@ -25,4 +25,4 @@ h4 {
hr {
margin-top: 40px;
margin-bottom: 40px;
}
}

View File

@ -8,8 +8,8 @@ body {
.header,
.marketing,
.footer {
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
/* Custom page header */
@ -18,10 +18,10 @@ body {
}
/* Make the masthead heading the same height as the navigation */
.header h3 {
padding-bottom: 19px;
margin-top: 0;
margin-bottom: 0;
line-height: 40px;
padding-bottom: 19px;
}
/* Custom page footer */
@ -47,8 +47,8 @@ body {
border-bottom: 1px solid #e5e5e5;
}
.jumbotron .btn {
font-size: 21px;
padding: 14px 24px;
font-size: 21px;
}
/* Supporting marketing content */
@ -65,8 +65,8 @@ body {
.header,
.marketing,
.footer {
padding-left: 0;
padding-right: 0;
padding-left: 0;
}
/* Space out the masthead */
.header {

View File

@ -3,10 +3,10 @@ body {
}
.footer {
border-top: 1px solid #eee;
margin-top: 40px;
padding-top: 40px;
padding-bottom: 40px;
margin-top: 40px;
border-top: 1px solid #eee;
}
/* Main marketing message and sign up button */
@ -15,33 +15,33 @@ body {
background-color: transparent;
}
.jumbotron .btn {
font-size: 21px;
padding: 14px 24px;
font-size: 21px;
}
/* Customize the nav-justified links to be fill the entire space of the .navbar */
.nav-justified {
background-color: #eee;
border-radius: 5px;
border: 1px solid #ccc;
border-radius: 5px;
}
.nav-justified > li > a {
margin-bottom: 0;
padding-top: 15px;
padding-bottom: 15px;
color: #777;
margin-bottom: 0;
font-weight: bold;
color: #777;
text-align: center;
border-bottom: 1px solid #d5d5d5;
background-color: #e5e5e5; /* Old browsers */
background-repeat: repeat-x; /* Repeat the gradient */
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Chrome 10+,Safari 5.1+ */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */
background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */
background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
background-repeat: repeat-x; /* Repeat the gradient */
border-bottom: 1px solid #d5d5d5;
}
.nav-justified > .active > a,
.nav-justified > .active > a:hover,
@ -63,16 +63,16 @@ body {
max-height: 52px;
}
.nav-justified > li > a {
border-left: 1px solid #fff;
border-right: 1px solid #d5d5d5;
border-left: 1px solid #fff;
}
.nav-justified > li:first-child > a {
border-left: 0;
border-radius: 5px 0 0 5px;
}
.nav-justified > li:last-child > a {
border-radius: 0 5px 5px 0;
border-right: 0;
border-radius: 0 5px 5px 0;
}
}
@ -82,7 +82,7 @@ body {
.masthead,
.marketing,
.footer {
padding-left: 0;
padding-right: 0;
padding-left: 0;
}
}

View File

@ -4,4 +4,4 @@ body {
.navbar-static-top {
margin-bottom: 19px;
}
}

View File

@ -6,9 +6,9 @@
/* Account for fixed navbar */
body {
min-width: 970px;
padding-top: 70px;
padding-bottom: 30px;
min-width: 970px;
}
/* Finesse the page header spacing */
@ -28,8 +28,8 @@ body {
/* Reset the container */
.container {
max-width: none !important;
width: 970px;
max-width: none !important;
}
/* Demonstrate the grids */
@ -94,12 +94,12 @@ body {
position: absolute;
float: left;
background-color: #fff;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .15);
border-width: 0 1px 1px;
border-radius: 0 0 4px 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
}
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #333;

View File

@ -20,9 +20,9 @@ footer {
@media screen and (max-width: 767px) {
.row-offcanvas {
position: relative;
-webkit-transition: all 0.25s ease-out;
-moz-transition: all 0.25s ease-out;
transition: all 0.25s ease-out;
-webkit-transition: all .25s ease-out;
-moz-transition: all .25s ease-out;
transition: all .25s ease-out;
}
.row-offcanvas-right

View File

@ -18,20 +18,20 @@ body {
}
.form-signin .form-control {
position: relative;
font-size: 16px;
height: auto;
padding: 10px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
.form-signin .form-control:focus {
z-index: 2;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;

View File

@ -9,12 +9,12 @@ body {
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
height: auto;
/* Negative indent footer by its height */
margin: 0 auto -60px;
min-height: 100%;
/* Pad bottom by footer height */
padding: 0 0 60px;
/* Negative indent footer by its height */
margin: 0 auto -60px;
}
/* Set the fixed height of the footer here */
@ -36,8 +36,8 @@ body {
}
#footer > .container {
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
code {

View File

@ -9,12 +9,12 @@ body {
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
height: auto;
/* Negative indent footer by its height */
margin: 0 auto -60px;
min-height: 100%;
/* Pad bottom by footer height */
padding: 0 0 60px;
/* Negative indent footer by its height */
margin: 0 auto -60px;
}
/* Set the fixed height of the footer here */

View File

@ -4,11 +4,11 @@ body {
}
.theme-dropdown .dropdown-menu {
display: block;
position: static;
display: block;
margin-bottom: 20px;
}
.theme-showcase > p > .btn {
margin: 5px 0;
}
}