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

Merge branch 'master' into v3.3.0

Browse Source 
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
This commit is contained in:
Mark Otto 2014-10-29 11:56:48 -07:00
commit 16dbdbd7a2
9 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/css/bootstrap-theme.css vendored
View File

@ -386,6 +386,11 @@
background-repeat: repeat-x;
border-color: #3278b3;
}
.list-group-item.active .badge,
.list-group-item.active:hover .badge,
.list-group-item.active:focus .badge {
text-shadow: none;
}
.panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
box-shadow: 0 1px 2px rgba(0, 0, 0, .05);

2
dist/css/bootstrap-theme.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap-theme.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
docs/dist/css/bootstrap-theme.css vendored
View File

@ -386,6 +386,11 @@
background-repeat: repeat-x;
border-color: #3278b3;
}
.list-group-item.active .badge,
.list-group-item.active:hover .badge,
.list-group-item.active:focus .badge {
text-shadow: none;
}
.panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
box-shadow: 0 1px 2px rgba(0, 0, 0, .05);

2
docs/dist/css/bootstrap-theme.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap-theme.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
less/theme.less
View File

@ -218,6 +218,10 @@
text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
#gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
border-color: darken(@list-group-active-border, 7.5%);
.badge {
text-shadow: none;
}
}

50
test-infra/npm-shrinkwrap.json generated
View File

@ -129,6 +129,10 @@
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
"dependencies": {
"colors": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
},
"lodash": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
@ -141,7 +145,21 @@
},
"grunt-legacy-util": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
"dependencies": {
"async": {
"version": "0.1.22",
"resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
},
"lodash": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
},
"underscore.string": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
}
}
},
"hooker": {
"version": "0.2.3",
@ -2133,6 +2151,10 @@
}
}
},
"vow": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
},
"vow-fs": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.2.tgz",
@ -2151,6 +2173,10 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"
},
"vow": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
},
"vow-queue": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz"
@ -2537,7 +2563,13 @@
},
"vow-queue": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.1.tgz"
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.1.tgz",
"dependencies": {
"vow": {
"version": "0.4.6",
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.6.tgz"
}
}
}
}
},
@ -3849,6 +3881,20 @@
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz",
"dependencies": {
"argparse": {
"version": "0.1.15",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz",
"dependencies": {
"underscore": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
},
"underscore.string": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
}
}
},
"esprima": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"