1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 08:10:47 +02:00

More reboot work, commenting out things that have been moved over

This commit is contained in:
Mark Otto
2015-04-17 00:22:35 -07:00
parent af9ab7b1a7
commit 7049a07444
11 changed files with 170 additions and 332 deletions

View File

@@ -31,13 +31,13 @@ label {
// box-sizing: border-box;
// }
// Position radios and checkboxes better
input[type="radio"],
input[type="checkbox"] {
margin: 4px 0 0;
margin-top: 1px \9; // IE9
line-height: normal;
}
// // Position radios and checkboxes better
// input[type="radio"],
// input[type="checkbox"] {
// margin: 4px 0 0;
// margin-top: 1px \9; // IE9
// line-height: normal;
// }
// // Set the height of file controls to match text inputs
// input[type="file"] {
@@ -57,20 +57,20 @@ input[type="checkbox"] {
// }
// Focus for file, radio, and checkbox
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
@include tab-focus();
}
// input[type="file"]:focus,
// input[type="radio"]:focus,
// input[type="checkbox"]:focus {
// @include tab-focus();
// }
// Adjust output element
output {
// output {
// display: block;
padding-top: ($padding-base-vertical + 1);
font-size: $font-size-base;
line-height: $line-height-base;
color: $input-color;
}
// padding-top: ($padding-base-vertical + 1);
// font-size: $font-size-base;
// line-height: $line-height-base;
// color: $input-color;
// }
//
@@ -166,24 +166,24 @@ input[type="search"] {
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
line-height: $input-height-base;
// @media screen and (-webkit-min-device-pixel-ratio: 0) {
// input[type="date"],
// input[type="time"],
// input[type="datetime-local"],
// input[type="month"] {
// line-height: $input-height-base;
&.input-sm,
.input-group-sm & {
line-height: $input-height-sm;
}
// &.input-sm,
// .input-group-sm & {
// line-height: $input-height-sm;
// }
&.input-lg,
.input-group-lg & {
line-height: $input-height-lg;
}
}
}
// &.input-lg,
// .input-group-lg & {
// line-height: $input-height-lg;
// }
// }
// }
// Form groups

View File

@@ -271,13 +271,16 @@ legend {
}
input[type="search"] {
// Under the `content-box` in Normalize as `*` isn't specific enough.
box-sizing: border-box;
// This overrides the extra rounded corners on search inputs in iOS so that our
// `.form-control` class can properly style them. Note that this cannot simply
// be added to `.form-control` as it's not specific enough. For details, see
// https://github.com/twbs/bootstrap/issues/11586.
-webkit-appearance: none;
}
// todo: needed?
output {
display: block;
display: inline-block;
// font-size: $font-size-base;
// line-height: $line-height-base;
// color: $input-color;

View File

@@ -176,49 +176,49 @@ mark,
text-transform: uppercase;
}
// Blockquotes
blockquote {
padding: ($spacer / 2) $spacer;
margin-bottom: $spacer;
font-size: $blockquote-font-size;
border-left: .25rem solid $blockquote-border-color;
// // Blockquotes
// blockquote {
// padding: ($spacer / 2) $spacer;
// margin-bottom: $spacer;
// font-size: $blockquote-font-size;
// border-left: .25rem solid $blockquote-border-color;
p,
ul,
ol {
&:last-child {
margin-bottom: 0;
}
}
// p,
// ul,
// ol {
// &:last-child {
// margin-bottom: 0;
// }
// }
footer {
display: block;
font-size: 80%; // back to default font-size
line-height: $line-height-base;
color: $blockquote-small-color;
// footer {
// display: block;
// font-size: 80%; // back to default font-size
// line-height: $line-height-base;
// color: $blockquote-small-color;
&:before {
content: "\2014 \00A0"; // em dash, nbsp
}
}
}
// &:before {
// content: "\2014 \00A0"; // em dash, nbsp
// }
// }
// }
// Opposite alignment of blockquote
.blockquote-reverse {
padding-right: $spacer;
padding-left: 0;
text-align: right;
border-right: .25rem solid $blockquote-border-color;
border-left: 0;
// // Opposite alignment of blockquote
// .blockquote-reverse {
// padding-right: $spacer;
// padding-left: 0;
// text-align: right;
// border-right: .25rem solid $blockquote-border-color;
// border-left: 0;
// Account for citation
footer {
&:before { content: ""; }
&:after {
content: "\00A0 \2014"; // nbsp, em dash
}
}
}
// // Account for citation
// footer {
// &:before { content: ""; }
// &:after {
// content: "\00A0 \2014"; // nbsp, em dash
// }
// }
// }
// // Addresses
// address {