Mark Otto
4bba2d0e0c
fix more broke shit, run grunt
2014-11-30 20:29:47 -08:00
Mark Otto
b648a77ed3
Merge branch 'master' into v4
...
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.eot
dist/fonts/glyphicons-halflings-regular.svg
dist/fonts/glyphicons-halflings-regular.ttf
dist/fonts/glyphicons-halflings-regular.woff
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/labels.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/responsive-utilities.html
docs/_includes/css/sass.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/tabs.html
docs/_includes/nav/components.html
docs/_includes/nav/css.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.eot
docs/dist/fonts/glyphicons-halflings-regular.svg
docs/dist/fonts/glyphicons-halflings-regular.ttf
docs/dist/fonts/glyphicons-halflings-regular.woff
docs/examples/carousel/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/sticky-footer-navbar/index.html
docs/examples/theme/index.html
fonts/glyphicons-halflings-regular.eot
fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.ttf
fonts/glyphicons-halflings-regular.woff
less/_carousel.less
less/_forms.less
less/glyphicons.less
2014-11-30 20:17:45 -08:00
Mark Otto
ced63b0a02
Merge pull request #15244 from zalog/patch-2
...
Center .icon-prev and .icon-next in carousel
2014-11-30 14:20:21 -08:00
Mark Otto
bcb90ef3a0
Bump Glyphicons to v1.9
2014-11-30 01:31:49 -08:00
Mark Otto
7e27e749d1
Fixes #15140 : Restore more missing .media styles from shipping #14801
2014-11-29 21:36:57 -08:00
Mark Otto
7c71b4874b
Fixes #15074 : Fix the nesting problem with form control size variants
2014-11-29 20:57:04 -08:00
Mark Otto
c2d868cfbe
Fixes #15124 : Restore .media-object
2014-11-29 18:33:20 -08:00
Mark Otto
c22b8dca14
Fixes #15148 : make the dropdown and dropup menus have the same margins
2014-11-29 18:31:09 -08:00
Catalin Zalog
8770f55f1e
Center .icon-prev and .icon-next
...
Center .icon-prev and .icon-next the same way .glyphicon icon are.
And this is the html markup:
<a class="left carousel-control" href="#carousel-main-menu" role="button" data-slide="prev">
<span class="icon-prev" aria-hidden="true"></span>
</a>
2014-11-27 13:06:42 +02:00
Mark Otto
12be9044f4
fix a bunch of padding and alignment things for forms
2014-11-25 18:00:52 -08:00
Mark Otto
15d98dc6b7
disable shadows on buttons for now
2014-11-25 17:47:32 -08:00
Heinrich Fenkart
c2abfc0a44
grunt
2014-11-17 18:57:02 +01:00
Heinrich Fenkart
6503cb0822
Revert "Follow-up to #13074 : use spec syntax instead of deprecated mixins"
...
This reverts commit b10b373c6019666dbe1152245c9efdf214ceaa6a.
Resolves #14937 .
2014-11-17 18:54:55 +01:00
Mark Otto
857aab0a1c
Fixes #14939 : Don't remove focus outline from buttons in button groups
2014-11-11 15:43:00 -08:00
Mark Otto
eb74a8cbf3
darken primary blue for accessibility contrast on link colors
2014-11-09 23:11:28 -08:00
Mark Otto
f17b636bce
color contrast for links, gets us to 4.63:1
2014-11-09 23:01:50 -08:00
Mark Otto
e020d50838
fix variable, run grunt
2014-11-09 22:05:09 -08:00
Mark Otto
86af1f39ab
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
2014-11-09 22:02:53 -08:00
Mark Otto
99148166c5
Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item
...
Badges: fix active styles when in non-anchor `.list-group-item`
2014-11-09 15:05:40 -08:00
Mark Otto
5670dd8930
comment and formatting
2014-11-09 15:04:32 -08:00
Mark Otto
46d1bf8eef
Fixes #14234 again
...
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
2014-11-09 15:03:33 -08:00
Heinrich Fenkart
a05f07528a
Badges: fix active styles when in non-anchor .list-group-item
2014-11-08 11:00:37 +01:00
Mark Otto
df28b7e25f
Fixes #14965 : Reset top border-radii on dropdown menus in fixed bottom navbars
2014-11-08 00:13:19 -08:00
Mark Otto
39f8c8183b
Merge pull request #15018 from twbs/fix-theme-active-items
...
Theme: Correctly override active dropdown items in collapsed navbars
2014-11-08 00:07:39 -08:00
Mark Otto
8fbb2bbbd1
Fixes #14979 : Override .jumbotron padding within .container-fluid to match .container
2014-11-07 23:01:20 -08:00
Mark Otto
2862c30320
Fixes #15046 : Add full font overrides for popovers and tooltips
2014-11-07 22:17:39 -08:00
Heinrich Fenkart
0d851e8b8a
Theme: Correctly override active dropdown items in collapsed navbars
2014-11-05 18:36:53 +01:00
Heinrich Fenkart
00fa64650a
Merge pull request #14921 from bassjobsen/patch-3
...
Update grid-framework.less
2014-11-05 01:54:13 +01:00
Julian Thilo
0018723cce
Merge pull request #15019 from twbs/whoomp_there_it_was
...
Deprecate diagonal tooltip classes
2014-11-05 00:33:04 +01:00
Heinrich Fenkart
e62a1264b9
Merge pull request #14927 from twbs/fix-modal-backdrop-above-scrollbar
...
Fix modal backdrop overlaying the modal's scrollbar
2014-11-05 00:15:52 +01:00
Julian Thilo
da3870feac
Deprecate diagonal tooltip classes
2014-11-05 00:09:56 +01:00
Heinrich Fenkart
14e5fb04e9
Fix modal backdrop overlaying the modal's scrollbar
...
Fixes #14916 .
2014-11-04 23:17:55 +01:00
Julian Thilo
87edaf295c
Fix #14936 : Use correct left/right and margin on tooltip arrows
2014-10-30 16:33:14 +01:00
Bass Jobsen
b8dbb545ac
Update grid-framework.less
...
The `when (@index = 1)` guards are not needed cause the mixins already only match on arity.
2014-10-30 01:20:35 +01:00
Mark Otto
5429e71401
fixes #14913 : badges in list group shouldn't have text shadow
2014-10-29 10:27:18 -07:00
Mark Otto
e528daf6d0
change back to not allowed cursor
2014-10-28 22:57:56 -07:00
Mark Otto
bf3be5a456
swap cursor not-allow for default, and use a variable for all disabled elements
2014-10-27 20:45:46 -07:00
Mark Otto
c15aa36798
switch to max-width on containers
2014-10-27 03:07:34 -07:00
Mark Otto
f07477d290
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/progress-bars.less
less/theme.less
2014-10-26 22:59:02 -07:00
Mark Otto
72a92f556d
no more mixin, use regular property
2014-10-26 22:34:08 -07:00
Baraa
f0fd6df63a
Removed unnecessary new lines that were inconsistent with current style.
2014-10-26 22:33:55 -07:00
Mark Otto
d664ceaac8
rename that variable
2014-10-26 22:33:35 -07:00
Mark Otto
57ac8f6863
nuked that variable
2014-10-26 22:33:10 -07:00
Mark Otto
dd584e81f8
fix syntax
2014-10-26 22:32:39 -07:00
Mark Otto
d6b0f45fb7
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/components.html
docs/components/navbar.md
docs/css.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
2014-10-26 22:31:59 -07:00
Mark Otto
783eced7ab
follow up fix for #14837 /cc @hnrch02
2014-10-25 20:20:24 -07:00
Mark Otto
2c2564faef
Fixes #14736 : Reverts the remaining progress bar min value overrides from #12848
2014-10-25 19:10:03 -07:00
Mark Otto
3fcd65af41
Fixes #14806 : reset the text-shadow in the themed buttons
2014-10-25 18:57:27 -07:00
Mark Otto
41a26ced24
Fixes #14814 : Use the link active bg variables for theme navbar gradients
2014-10-25 18:27:40 -07:00
Mark Otto
38217ee405
Merge branch 'pr/14801'
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-10-25 18:16:40 -07:00
