rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

clean up comments in reset, remove ie7 css hacks

Browse Source
This commit is contained in:
Mark Otto 2012-09-30 23:19:55 -07:00
parent 443b605246
commit 08446563b9
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/css/bootstrap.css vendored
View File

@ -25,8 +25,6 @@ audio,
canvas, canvas,
video { video {
display: inline-block; display: inline-block;
*display: inline;
*zoom: 1;
} }
audio:not([controls]) { audio:not([controls]) {
@ -90,7 +88,6 @@ textarea {
button, button,
input { input {
*overflow: visible;
line-height: normal; line-height: normal;
} }

10
less/reset.less
View File

@ -4,7 +4,7 @@
// -------------------------------------------------- // --------------------------------------------------
// Display in IE6-9 and FF3 // HTML elements <IE9
// ------------------------- // -------------------------
article, article,
@ -20,15 +20,10 @@ section {
display: block; display: block;
} }
// Display block in IE6-9 and FF3
// -------------------------
audio, audio,
canvas, canvas,
video { video {
display: inline-block; display: inline-block;
*display: inline;
*zoom: 1;
} }
// Prevents modern browsers from displaying 'audio' without controls // Prevents modern browsers from displaying 'audio' without controls
@ -106,8 +101,7 @@ textarea {
} }
button, button,
input { input {
*overflow: visible; // Inner spacing ie IE6/7 line-height: normal;
line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
} }
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 input::-moz-focus-inner { // Inner padding and border oddities in FF3/4