You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* upstream/master: (987 commits)
add Bower badge to README
Don't re-set indent style for [*.py]
grunt after last commits
Use scss option instead of css for better highlighting
fixtwbs#12484
most of Bootstrap's components are pure CSS and thus don't require jQuery
Downgrade holder.js to v2.2.0.
fix "pading-right" [sic] typo in dashboard.css; fixestwbs#12455
use correct+newer name for retina mixin in docs; fixestwbs#12450
Fix issue causing .navbar-brand element height to be shorter than .navbar height
update to browserstack-runner v0.1.0
update to grunt-saucelabs v5.0.0
rm duplicate warning callouts in Input Groups docs
Apply eaa2b83 to master as well
Update jQuery to v1.11.0.
rm outdated note about lack of .col-{xs,sm}-offset-0; fixestwbs#12439
note specific versions of IE where progress bar animation supported; fixestwbs#12437
Bump versions, run grunt
grunt
its an email input
...
Conflicts:
.gitignore
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
less/panels.less
less/variables.less
@@ File: examples/dashboard/dashboard.css
@@ Line: 69 // pading- => padding-
@media (min-width: 768px) {
.main {
padding-left: 40px;
}
}
The text was updated successfully, but these errors were encountered: