Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
1c33b857
Commit
1c33b857
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Convert normalize comments to // style
parent
be74ad7e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+0
-189
docs/assets/css/bootstrap.css
less/normalize.less
+157
-157
less/normalize.less
with
157 additions
and
346 deletions
+157
-346
docs/assets/css/bootstrap.css
+
0
-
189
View file @
1c33b857
...
@@ -10,14 +10,6 @@
...
@@ -10,14 +10,6 @@
/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
/* ==========================================================================
HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined in IE 8/9.
*/
article
,
article
,
aside
,
aside
,
details
,
details
,
...
@@ -32,134 +24,62 @@ summary {
...
@@ -32,134 +24,62 @@ summary {
display
:
block
;
display
:
block
;
}
}
/**
* Correct `inline-block` display not defined in IE 8/9.
*/
audio
,
audio
,
canvas
,
canvas
,
video
{
video
{
display
:
inline-block
;
display
:
inline-block
;
}
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio
:not
([
controls
])
{
audio
:not
([
controls
])
{
display
:
none
;
display
:
none
;
height
:
0
;
height
:
0
;
}
}
/**
* Address styling not present in IE 8/9.
*/
[
hidden
]
{
[
hidden
]
{
display
:
none
;
display
:
none
;
}
}
/* ==========================================================================
Base
========================================================================== */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html
{
html
{
font-family
:
sans-serif
;
font-family
:
sans-serif
;
/* 1 */
-webkit-text-size-adjust
:
100%
;
-webkit-text-size-adjust
:
100%
;
-ms-text-size-adjust
:
100%
;
-ms-text-size-adjust
:
100%
;
/* 2 */
}
}
/**
* Remove default margin.
*/
body
{
body
{
margin
:
0
;
margin
:
0
;
}
}
/* ==========================================================================
Links
========================================================================== */
/**
* Address `outline` inconsistency between Chrome and other browsers.
*/
a
:focus
{
a
:focus
{
outline
:
thin
dotted
;
outline
:
thin
dotted
;
}
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
a
:active
,
a
:active
,
a
:hover
{
a
:hover
{
outline
:
0
;
outline
:
0
;
}
}
/* ==========================================================================
Typography
========================================================================== */
/**
* Address variable `h1` font size within `section` and `article` contexts in
* Firefox 4+, Safari 5, and Chrome.
*/
h1
{
h1
{
font-size
:
2em
;
font-size
:
2em
;
}
}
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*/
abbr
[
title
]
{
abbr
[
title
]
{
border-bottom
:
1px
dotted
;
border-bottom
:
1px
dotted
;
}
}
/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*/
b
,
b
,
strong
{
strong
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
/**
* Address styling not present in Safari 5 and Chrome.
*/
dfn
{
dfn
{
font-style
:
italic
;
font-style
:
italic
;
}
}
/**
* Address styling not present in IE 8/9.
*/
mark
{
mark
{
color
:
#000
;
color
:
#000
;
background
:
#ff0
;
background
:
#ff0
;
}
}
/**
* Correct font family set oddly in Safari 5 and Chrome.
*/
code
,
code
,
kbd
,
kbd
,
pre
,
pre
,
...
@@ -168,36 +88,20 @@ samp {
...
@@ -168,36 +88,20 @@ samp {
font-size
:
1em
;
font-size
:
1em
;
}
}
/**
* Improve readability of pre-formatted text in all browsers.
*/
pre
{
pre
{
word-wrap
:
break-word
;
word-wrap
:
break-word
;
white-space
:
pre
;
white-space
:
pre
;
white-space
:
pre-wrap
;
white-space
:
pre-wrap
;
}
}
/**
* Set consistent quote types.
*/
q
{
q
{
quotes
:
"\201C"
"\201D"
"\2018"
"\2019"
;
quotes
:
"\201C"
"\201D"
"\2018"
"\2019"
;
}
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small
{
small
{
font-size
:
80%
;
font-size
:
80%
;
}
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub
,
sub
,
sup
{
sup
{
position
:
relative
;
position
:
relative
;
...
@@ -214,68 +118,29 @@ sub {
...
@@ -214,68 +118,29 @@ sub {
bottom
:
-0.25em
;
bottom
:
-0.25em
;
}
}
/* ==========================================================================
Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9.
*/
img
{
img
{
border
:
0
;
border
:
0
;
}
}
/**
* Correct overflow displayed oddly in IE 9.
*/
svg
:not
(
:root
)
{
svg
:not
(
:root
)
{
overflow
:
hidden
;
overflow
:
hidden
;
}
}
/* ==========================================================================
Figures
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari 5.
*/
figure
{
figure
{
margin
:
0
;
margin
:
0
;
}
}
/* ==========================================================================
Forms
========================================================================== */
/**
* Define consistent border, margin, and padding.
*/
fieldset
{
fieldset
{
padding
:
0.35em
0.625em
0.75em
;
padding
:
0.35em
0.625em
0.75em
;
margin
:
0
2px
;
margin
:
0
2px
;
border
:
1px
solid
#c0c0c0
;
border
:
1px
solid
#c0c0c0
;
}
}
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend
{
legend
{
padding
:
0
;
padding
:
0
;
border
:
0
;
border
:
0
;
}
}
/**
* 1. Correct font family not being inherited in all browsers.
* 2. Correct font size not being inherited in all browsers.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/
button
,
button
,
input
,
input
,
select
,
select
,
...
@@ -285,24 +150,11 @@ textarea {
...
@@ -285,24 +150,11 @@ textarea {
font-size
:
100%
;
font-size
:
100%
;
}
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
button
,
button
,
input
{
input
{
line-height
:
normal
;
line-height
:
normal
;
}
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button
,
button
,
html
input
[
type
=
"button"
],
html
input
[
type
=
"button"
],
input
[
type
=
"reset"
],
input
[
type
=
"reset"
],
...
@@ -311,32 +163,17 @@ input[type="submit"] {
...
@@ -311,32 +163,17 @@ input[type="submit"] {
-webkit-appearance
:
button
;
-webkit-appearance
:
button
;
}
}
/**
* Re-set default cursor for disabled elements.
*/
button
[
disabled
],
button
[
disabled
],
html
input
[
disabled
]
{
html
input
[
disabled
]
{
cursor
:
default
;
cursor
:
default
;
}
}
/**
* 1. Address box sizing set to `content-box` in IE 8/9.
* 2. Remove excess padding in IE 8/9.
*/
input
[
type
=
"checkbox"
],
input
[
type
=
"checkbox"
],
input
[
type
=
"radio"
]
{
input
[
type
=
"radio"
]
{
padding
:
0
;
padding
:
0
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof).
*/
input
[
type
=
"search"
]
{
input
[
type
=
"search"
]
{
-webkit-box-sizing
:
content-box
;
-webkit-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
...
@@ -344,48 +181,22 @@ input[type="search"] {
...
@@ -344,48 +181,22 @@ input[type="search"] {
-webkit-appearance
:
textfield
;
-webkit-appearance
:
textfield
;
}
}
/**
* Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X.
*/
input
[
type
=
"search"
]
::-webkit-search-cancel-button
,
input
[
type
=
"search"
]
::-webkit-search-cancel-button
,
input
[
type
=
"search"
]
::-webkit-search-decoration
{
input
[
type
=
"search"
]
::-webkit-search-decoration
{
-webkit-appearance
:
none
;
-webkit-appearance
:
none
;
}
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button
::-moz-focus-inner
,
button
::-moz-focus-inner
,
input
::-moz-focus-inner
{
input
::-moz-focus-inner
{
padding
:
0
;
padding
:
0
;
border
:
0
;
border
:
0
;
}
}
/**
* 1. Remove default vertical scrollbar in IE 8/9.
* 2. Improve readability and alignment in all browsers.
*/
textarea
{
textarea
{
overflow
:
auto
;
overflow
:
auto
;
/* 1 */
vertical-align
:
top
;
vertical-align
:
top
;
/* 2 */
}
}
/* ==========================================================================
Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table
{
table
{
border-collapse
:
collapse
;
border-collapse
:
collapse
;
border-spacing
:
0
;
border-spacing
:
0
;
...
...
This diff is collapsed.
Click to expand it.
less/normalize.less
+
157
-
157
View file @
1c33b857
/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
/
*
==========================================================================
/
/
==========================================================================
HTML5 display definitions
//
HTML5 display definitions
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Correct `block` display not defined in IE 8/9.
//
Correct `block` display not defined in IE 8/9.
*
/
/
/
article,
article,
aside,
aside,
...
@@ -22,9 +22,9 @@ summary {
...
@@ -22,9 +22,9 @@ summary {
display: block;
display: block;
}
}
/
**
/
/
*
Correct `inline-block` display not defined in IE 8/9.
//
Correct `inline-block` display not defined in IE 8/9.
*
/
/
/
audio,
audio,
canvas,
canvas,
...
@@ -32,119 +32,119 @@ video {
...
@@ -32,119 +32,119 @@ video {
display: inline-block;
display: inline-block;
}
}
/
**
/
/
*
Prevent modern browsers from displaying `audio` without controls.
//
Prevent modern browsers from displaying `audio` without controls.
*
Remove excess height in iOS 5 devices.
//
Remove excess height in iOS 5 devices.
*
/
/
/
audio:not([controls]) {
audio:not([controls]) {
display: none;
display: none;
height: 0;
height: 0;
}
}
/
**
/
/
*
Address styling not present in IE 8/9.
//
Address styling not present in IE 8/9.
*
/
/
/
[hidden] {
[hidden] {
display: none;
display: none;
}
}
/
*
==========================================================================
/
/
==========================================================================
Base
//
Base
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
1. Set default font family to sans-serif.
//
1. Set default font family to sans-serif.
*
2. Prevent iOS text size adjust after orientation change, without disabling
//
2. Prevent iOS text size adjust after orientation change, without disabling
*
user zoom.
//
user zoom.
*
/
/
/
html {
html {
font-family: sans-serif; /
*
1
*/
font-family: sans-serif; /
/
1
-webkit-text-size-adjust: 100%; /
*
2
*/
-webkit-text-size-adjust: 100%; /
/
2
-ms-text-size-adjust: 100%; /
*
2
*/
-ms-text-size-adjust: 100%; /
/
2
}
}
/
**
/
/
*
Remove default margin.
//
Remove default margin.
*
/
/
/
body {
body {
margin: 0;
margin: 0;
}
}
/
*
==========================================================================
/
/
==========================================================================
Links
//
Links
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Address `outline` inconsistency between Chrome and other browsers.
//
Address `outline` inconsistency between Chrome and other browsers.
*
/
/
/
a:focus {
a:focus {
outline: thin dotted;
outline: thin dotted;
}
}
/
**
/
/
*
Improve readability when focused and also mouse hovered in all browsers.
//
Improve readability when focused and also mouse hovered in all browsers.
*
/
/
/
a:active,
a:active,
a:hover {
a:hover {
outline: 0;
outline: 0;
}
}
/
*
==========================================================================
/
/
==========================================================================
Typography
//
Typography
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Address variable `h1` font size within `section` and `article` contexts in
//
Address variable `h1` font size within `section` and `article` contexts in
*
Firefox 4+, Safari 5, and Chrome.
//
Firefox 4+, Safari 5, and Chrome.
*
/
/
/
h1 {
h1 {
font-size: 2em;
font-size: 2em;
}
}
/
**
/
/
*
Address styling not present in IE 8/9, Safari 5, and Chrome.
//
Address styling not present in IE 8/9, Safari 5, and Chrome.
*
/
/
/
abbr[title] {
abbr[title] {
border-bottom: 1px dotted;
border-bottom: 1px dotted;
}
}
/
**
/
/
*
Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
//
Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*
/
/
/
b,
b,
strong {
strong {
font-weight: bold;
font-weight: bold;
}
}
/
**
/
/
*
Address styling not present in Safari 5 and Chrome.
//
Address styling not present in Safari 5 and Chrome.
*
/
/
/
dfn {
dfn {
font-style: italic;
font-style: italic;
}
}
/
**
/
/
*
Address styling not present in IE 8/9.
//
Address styling not present in IE 8/9.
*
/
/
/
mark {
mark {
background: #ff0;
background: #ff0;
color: #000;
color: #000;
}
}
/
**
/
/
*
Correct font family set oddly in Safari 5 and Chrome.
//
Correct font family set oddly in Safari 5 and Chrome.
*
/
/
/
code,
code,
kbd,
kbd,
...
@@ -154,9 +154,9 @@ samp {
...
@@ -154,9 +154,9 @@ samp {
font-size: 1em;
font-size: 1em;
}
}
/
**
/
/
*
Improve readability of pre-formatted text in all browsers.
//
Improve readability of pre-formatted text in all browsers.
*
/
/
/
pre {
pre {
white-space: pre;
white-space: pre;
...
@@ -164,25 +164,25 @@ pre {
...
@@ -164,25 +164,25 @@ pre {
word-wrap: break-word;
word-wrap: break-word;
}
}
/
**
/
/
*
Set consistent quote types.
//
Set consistent quote types.
*
/
/
/
q {
q {
quotes: "\201C" "\201D" "\2018" "\2019";
quotes: "\201C" "\201D" "\2018" "\2019";
}
}
/
**
/
/
*
Address inconsistent and variable font size in all browsers.
//
Address inconsistent and variable font size in all browsers.
*
/
/
/
small {
small {
font-size: 80%;
font-size: 80%;
}
}
/
**
/
/
*
Prevent `sub` and `sup` affecting `line-height` in all browsers.
//
Prevent `sub` and `sup` affecting `line-height` in all browsers.
*
/
/
/
sub,
sub,
sup {
sup {
...
@@ -200,45 +200,45 @@ sub {
...
@@ -200,45 +200,45 @@ sub {
bottom: -0.25em;
bottom: -0.25em;
}
}
/
*
==========================================================================
/
/
==========================================================================
Embedded content
//
Embedded content
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Remove border when inside `a` element in IE 8/9.
//
Remove border when inside `a` element in IE 8/9.
*
/
/
/
img {
img {
border: 0;
border: 0;
}
}
/
**
/
/
*
Correct overflow displayed oddly in IE 9.
//
Correct overflow displayed oddly in IE 9.
*
/
/
/
svg:not(:root) {
svg:not(:root) {
overflow: hidden;
overflow: hidden;
}
}
/
*
==========================================================================
/
/
==========================================================================
Figures
//
Figures
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Address margin not present in IE 8/9 and Safari 5.
//
Address margin not present in IE 8/9 and Safari 5.
*
/
/
/
figure {
figure {
margin: 0;
margin: 0;
}
}
/
*
==========================================================================
/
/
==========================================================================
Forms
//
Forms
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Define consistent border, margin, and padding.
//
Define consistent border, margin, and padding.
*
/
/
/
fieldset {
fieldset {
border: 1px solid #c0c0c0;
border: 1px solid #c0c0c0;
...
@@ -246,103 +246,103 @@ fieldset {
...
@@ -246,103 +246,103 @@ fieldset {
padding: 0.35em 0.625em 0.75em;
padding: 0.35em 0.625em 0.75em;
}
}
/
**
/
/
*
1. Correct `color` not being inherited in IE 8/9.
//
1. Correct `color` not being inherited in IE 8/9.
*
2. Remove padding so people aren't caught out if they zero out fieldsets.
//
2. Remove padding so people aren't caught out if they zero out fieldsets.
*
/
/
/
legend {
legend {
border: 0; /
*
1
*/
border: 0; /
/
1
padding: 0; /
*
2
*/
padding: 0; /
/
2
}
}
/
**
/
/
*
1. Correct font family not being inherited in all browsers.
//
1. Correct font family not being inherited in all browsers.
*
2. Correct font size not being inherited in all browsers.
//
2. Correct font size not being inherited in all browsers.
*
3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
//
3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*
/
/
/
button,
button,
input,
input,
select,
select,
textarea {
textarea {
font-family: inherit; /
*
1
*/
font-family: inherit; /
/
1
font-size: 100%; /
*
2
*/
font-size: 100%; /
/
2
margin: 0; /
*
3
*/
margin: 0; /
/
3
}
}
/
**
/
/
*
Address Firefox 4+ setting `line-height` on `input` using `!important` in
//
Address Firefox 4+ setting `line-height` on `input` using `!important` in
*
the UA stylesheet.
//
the UA stylesheet.
*
/
/
/
button,
button,
input {
input {
line-height: normal;
line-height: normal;
}
}
/
**
/
/
*
1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
//
1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
*
and `video` controls.
//
and `video` controls.
*
2. Correct inability to style clickable `input` types in iOS.
//
2. Correct inability to style clickable `input` types in iOS.
*
3. Improve usability and consistency of cursor style between image-type
//
3. Improve usability and consistency of cursor style between image-type
*
`input` and others.
//
`input` and others.
*
/
/
/
button,
button,
html input[type="button"], /
*
1
*/
html input[type="button"], /
/
1
input[type="reset"],
input[type="reset"],
input[type="submit"] {
input[type="submit"] {
-webkit-appearance: button; /
*
2
*/
-webkit-appearance: button; /
/
2
cursor: pointer; /
*
3
*/
cursor: pointer; /
/
3
}
}
/
**
/
/
*
Re-set default cursor for disabled elements.
//
Re-set default cursor for disabled elements.
*
/
/
/
button[disabled],
button[disabled],
html input[disabled] {
html input[disabled] {
cursor: default;
cursor: default;
}
}
/
**
/
/
*
1. Address box sizing set to `content-box` in IE 8/9.
//
1. Address box sizing set to `content-box` in IE 8/9.
*
2. Remove excess padding in IE 8/9.
//
2. Remove excess padding in IE 8/9.
*
/
/
/
input[type="checkbox"],
input[type="checkbox"],
input[type="radio"] {
input[type="radio"] {
box-sizing: border-box; /
*
1
*/
box-sizing: border-box; /
/
1
padding: 0; /
*
2
*/
padding: 0; /
/
2
}
}
/
**
/
/
*
1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
//
1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
*
2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
//
2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
*
(include `-moz` to future-proof).
//
(include `-moz` to future-proof).
*
/
/
/
input[type="search"] {
input[type="search"] {
-webkit-appearance: textfield; /
*
1
*/
-webkit-appearance: textfield; /
/
1
-moz-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /
*
2
*/
-webkit-box-sizing: content-box; /
/
2
box-sizing: content-box;
box-sizing: content-box;
}
}
/
**
/
/
*
Remove inner padding and search cancel button in Safari 5 and Chrome
//
Remove inner padding and search cancel button in Safari 5 and Chrome
*
on OS X.
//
on OS X.
*
/
/
/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
-webkit-appearance: none;
}
}
/
**
/
/
*
Remove inner padding and border in Firefox 4+.
//
Remove inner padding and border in Firefox 4+.
*
/
/
/
button::-moz-focus-inner,
button::-moz-focus-inner,
input::-moz-focus-inner {
input::-moz-focus-inner {
...
@@ -350,23 +350,23 @@ input::-moz-focus-inner {
...
@@ -350,23 +350,23 @@ input::-moz-focus-inner {
padding: 0;
padding: 0;
}
}
/
**
/
/
*
1. Remove default vertical scrollbar in IE 8/9.
//
1. Remove default vertical scrollbar in IE 8/9.
*
2. Improve readability and alignment in all browsers.
//
2. Improve readability and alignment in all browsers.
*
/
/
/
textarea {
textarea {
overflow: auto; /
*
1
*/
overflow: auto; /
/
1
vertical-align: top; /
*
2
*/
vertical-align: top; /
/
2
}
}
/
*
==========================================================================
/
/
==========================================================================
Tables
//
Tables
==========================================================================
*/
//
==========================================================================
/
**
/
/
*
Remove most spacing between table cells.
//
Remove most spacing between table cells.
*
/
/
/
table {
table {
border-collapse: collapse;
border-collapse: collapse;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment