rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source
This commit is contained in:
Mark Otto 2013-10-13 15:24:48 -07:00
commit 857e697d72
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
less/code.less
View File

@ -42,7 +42,7 @@ pre {
color: inherit; color: inherit;
white-space: pre-wrap; white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border: 0; border-radius: 0;
} }
} }

15
less/type.less
View File

@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6,
line-height: @headings-line-height; line-height: @headings-line-height;
color: @headings-color; color: @headings-color;
small { small,
.small {
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;
color: @headings-small-color; color: @headings-small-color;
@ -95,7 +96,8 @@ h3 {
margin-top: @line-height-computed; margin-top: @line-height-computed;
margin-bottom: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2);
small { small,
.small {
font-size: 65%; font-size: 65%;
} }
} }
@ -105,7 +107,8 @@ h6 {
margin-top: (@line-height-computed / 2); margin-top: (@line-height-computed / 2);
margin-bottom: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2);
small { small,
.small {
font-size: 75%; font-size: 75%;
} }
} }
@ -240,10 +243,12 @@ blockquote {
border-right: 5px solid @blockquote-border-color; border-right: 5px solid @blockquote-border-color;
border-left: 0; border-left: 0;
p, p,
small { small,
.small {
text-align: right; text-align: right;
} }
small { small,
.small {
&:before { &:before {
content: ''; content: '';
} }

4
package.json
View File

@ -20,7 +20,8 @@
} }
] ]
, "devDependencies": { , "devDependencies": {
"btoa": "~1.1.1" "browserstack-runner": "~0.0.12"
, "btoa": "~1.1.1"
, "grunt": "~0.4.1" , "grunt": "~0.4.1"
, "grunt-contrib-clean": "~0.5.0" , "grunt-contrib-clean": "~0.5.0"
, "grunt-contrib-concat": "~0.3.0" , "grunt-contrib-concat": "~0.3.0"
@ -33,6 +34,5 @@
, "grunt-html-validation": "~0.1.5" , "grunt-html-validation": "~0.1.5"
, "grunt-jekyll": "~0.4.0" , "grunt-jekyll": "~0.4.0"
, "grunt-recess": "~0.4.0" , "grunt-recess": "~0.4.0"
, "browserstack-runner": "~0.0.12"
} }
} }