Commit Graph

126 Commits

Author SHA1 Message Date
Mark Otto 9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto 960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto 85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto 8670021935 fixed navbars fixings 2013-01-12 19:44:51 -08:00
Mark Otto 1ea647ce98 Remove shadows from active links in navbar 2013-01-12 19:02:58 -08:00
Mark Otto ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Mark Otto 6f894c62a5 Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active 2013-01-11 23:35:22 -08:00
Mark Otto c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto 72f13e2870 Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
Mark Otto 165729254b squash new line 2012-12-10 10:13:04 -08:00
Mark Otto adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto 62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto 01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto 0ef347706c more vars changing 2012-11-30 15:09:57 -08:00
Mark Otto 9239bfbc7b more vars changed, remove @white var 2012-11-30 15:05:23 -08:00
Mark Otto b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto 7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37:24 -08:00
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto 74f51105e9 Fixes #6010: Navbar dropdown caret should match link hover color 2012-11-28 00:42:17 -08:00
Mark Otto 7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto a367fd4938 Fixes #5925: Adjust top margin of input group in navbar 2012-11-16 01:19:15 -08:00
Mark Otto a43bf14ea5 Merge branch '2.2.2-wip' into exploratory 2012-11-15 09:15:37 -08:00
Drew Goodwin c8856eeff3 fixes #5873: @navbarInverseBrandColor not used 2012-11-10 17:58:00 -08:00
Mark Otto c0bbe1692c Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
2012-11-05 18:27:25 -08:00
Mark Otto d38bda1480 Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading 2012-11-04 22:50:07 -08:00
Mark Otto 25fded1ff4 responsive images, updated shadows on navbars, remove responsive file from docs 2012-11-04 00:31:43 -07:00
Mark Otto 1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto 3bb9e0d753 increase border radius on navbar 2012-10-01 23:42:21 -07:00
Mark Otto 7c9597f4e7 remove double border effect: instead of inset shadow and border on fixed navbars, only border 2012-10-01 23:34:03 -07:00
Mark Otto 9872902e47 remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions 2012-09-30 23:11:54 -07:00
Mark Otto d1affe6154 restore gradient to navbars 2012-09-25 22:53:41 -07:00
Mark Otto c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto 0220015edd remove all ie7 conditionals and mixins 2012-09-25 22:07:53 -07:00
Mark Otto 443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto 03a406d920 fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top 2012-09-17 15:49:22 -07:00
Mark Otto 38303dd997 revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows 2012-09-12 15:53:29 -07:00
Mark Otto bbadd429a8 change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation 2012-09-12 15:48:56 -07:00
Luis Aleman 2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Luis Aleman 67eae2a503 Do not need to write box-shadow in full 2012-08-27 19:13:37 -04:00
Mark Otto a2b9a5e1fe fixes #4680: proper margin on buttons in navbar forms 2012-08-27 10:52:11 -07:00
Mark Otto fcd08fce8f fixes #4578: add clearfix to .navbar-inner to clear floats 2012-08-27 10:32:07 -07:00
Mark Otto 96542f14ab fixes #4540: adjust vertical alignment of .btn-group in .navbar 2012-08-27 10:04:58 -07:00
Mark Otto 1b8f4f5bc5 fixes #4512: improved borders on navbars 2012-08-26 23:23:47 -07:00
Mark Otto d9593e217d avoid top margin on input-append/prepend in .navbar-form 2012-08-24 14:45:02 -07:00
Mark Otto be64955e25 nuke 10px right margin on .navbar .nav 2012-08-23 09:38:56 -07:00
Mark Otto 4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto 077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto b86e1fb62a additional navbar contrast: add inset shadow since we nuked the border 2012-08-17 11:31:21 -07:00