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
f82db4b9
Commit
f82db4b9
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
separate code from type css files
parent
7a673751
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
bootstrap.css
+7
-7
bootstrap.css
bootstrap.min.css
+2
-2
bootstrap.min.css
lib/bootstrap.less
+1
-0
lib/bootstrap.less
lib/code.less
+44
-0
lib/code.less
lib/scaffolding.less
+0
-1
lib/scaffolding.less
lib/type.less
+1
-42
lib/type.less
with
55 additions
and
52 deletions
+55
-52
bootstrap.css
+
7
-
7
View file @
f82db4b9
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Jan 26 14:5
0:3
4 PST 2012
* Date: Thu Jan 26 14:5
2:2
4 PST 2012
*/
article
,
aside
,
...
...
@@ -414,6 +414,12 @@ address {
line-height
:
18px
;
font-style
:
normal
;
}
small
{
font-size
:
100%
;
}
cite
{
font-style
:
normal
;
}
code
,
pre
{
padding
:
0
3px
2px
;
font-family
:
Menlo
,
Monaco
,
"Courier New"
,
monospace
;
...
...
@@ -452,12 +458,6 @@ pre code {
padding
:
0
;
background-color
:
transparent
;
}
small
{
font-size
:
100%
;
}
cite
{
font-style
:
normal
;
}
form
{
margin
:
0
0
18px
;
}
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
2
-
2
View file @
f82db4b9
...
...
@@ -83,12 +83,12 @@ blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:
blockquote
.pull-right
{
float
:
right
;
padding-left
:
0
;
padding-right
:
15px
;
border-left
:
0
;
border-right
:
5px
solid
#eeeeee
;}
blockquote
.pull-right
p
,
blockquote
.pull-right
small
{
text-align
:
right
;}
q
:before
,
q
:after
,
blockquote
:before
,
blockquote
:after
{
content
:
""
;}
address
{
display
:
block
;
margin-bottom
:
18px
;
line-height
:
18px
;
font-style
:
normal
;}
small
{
font-size
:
100%
;}
cite
{
font-style
:
normal
;}
code
,
pre
{
padding
:
0
3px
2px
;
font-family
:
Menlo
,
Monaco
,
"Courier New"
,
monospace
;
font-size
:
12px
;
color
:
#333333
;
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;}
code
{
padding
:
3px
4px
;
color
:
#d14
;
background-color
:
#f7f7f9
;
border
:
1px
solid
#e1e1e8
;}
pre
{
display
:
block
;
padding
:
8.5px
;
margin
:
0
0
9px
;
font-size
:
12px
;
line-height
:
18px
;
background-color
:
#f5f5f5
;
border
:
1px
solid
#ccc
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
white-space
:
pre
;
white-space
:
pre-wrap
;
word-break
:
break-all
;}
pre
.prettyprint
{
margin-bottom
:
18px
;}
pre
code
{
padding
:
0
;
background-color
:
transparent
;}
small
{
font-size
:
100%
;}
cite
{
font-style
:
normal
;}
form
{
margin
:
0
0
18px
;}
fieldset
{
padding
:
0
;
margin
:
0
;
border
:
0
;}
legend
{
display
:
block
;
width
:
100%
;
padding
:
0
;
margin-bottom
:
27px
;
font-size
:
19.5px
;
line-height
:
36px
;
color
:
#333333
;
border
:
0
;
border-bottom
:
1px
solid
#eee
;
-webkit-margin-collapse
:
separate
;}
...
...
This diff is collapsed.
Click to expand it.
lib/bootstrap.less
+
1
-
0
View file @
f82db4b9
...
...
@@ -23,6 +23,7 @@
// Base CSS
@import "type.less";
@import "code.less";
@import "forms.less";
@import "tables.less";
...
...
This diff is collapsed.
Click to expand it.
lib/code.less
0 → 100644
+
44
-
0
View file @
f82db4b9
// Code.less
// Code typography styles for the <code> and <pre> elements
// --------------------------------------------------------
// Inline and block code styles
code,
pre {
padding: 0 3px 2px;
#font > #family > .monospace;
font-size: @baseFontSize - 1;
color: @grayDark;
.border-radius(3px);
}
code {
padding: 3px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
pre {
display: block;
padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseLineHeight / 2;
font-size: 12px;
line-height: @baseLineHeight;
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid rgba(0,0,0,.15);
.border-radius(4px);
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
margin-bottom: @baseLineHeight;
}
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;
background-color: transparent;
}
}
This diff is collapsed.
Click to expand it.
lib/scaffolding.less
+
0
-
1
View file @
f82db4b9
//
// Scaffolding
// Basic and global styles for generating a grid system, structural layout, and page templates
// -------------------------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
lib/type.less
+
1
-
42
View file @
f82db4b9
...
...
@@ -197,51 +197,10 @@ address {
font-style: normal;
}
// Inline and block code styles
code,
pre {
padding: 0 3px 2px;
#font > #family > .monospace;
font-size: @baseFontSize - 1;
color: @grayDark;
.border-radius(3px);
}
code {
padding: 3px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
pre {
display: block;
padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseLineHeight / 2;
font-size: 12px;
line-height: @baseLineHeight;
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid rgba(0,0,0,.15);
.border-radius(4px);
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
margin-bottom: @baseLineHeight;
}
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;
background-color: transparent;
}
}
// Misc
small {
font-size: 100%;
}
cite {
font-style: normal;
}
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