Mark Otto
747e108e0b
Merge pull request #7670 from DarDar/3.0.0-wip
...
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-03 15:05:29 -07:00
Mark Otto
e1c67b149f
More navbar CSS and docs cleanup
...
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
2013-05-02 23:13:43 -07:00
Mark Otto
94792b9dae
Improve buttons in navbars
...
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
2013-05-02 23:05:09 -07:00
Mark Otto
23ae6405f5
delete lingering navbar dividers code since we nuked that awhile back
2013-05-02 22:58:30 -07:00
Mark Otto
bec8c90fd7
Cleanup .navbar-form styles
...
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
DarDar
9cd3a92713
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-02 08:05:00 +02:00
Mark Otto
0780faad45
make that left/right padding, not top/bottom on navbar
2013-04-30 19:20:41 -07:00
Mark Otto
69f5447afa
add back bottom margin to navbars
2013-04-30 19:12:48 -07:00
Mark Otto
e8b7318646
no need for zero padding on navbar top/bottom; better comment
2013-04-30 19:07:28 -07:00
Mark Otto
6dd4cbd20b
no units on 0 values
2013-04-30 19:06:30 -07:00
Robert Burns
c087e383ed
Fix navbar-toggle after commit bbee78b30b
...
The following commit introduced an issue with the navbar toggle placement:
bbee78b30b
2013-04-28 20:45:42 -04:00
Mark Otto
5edfdc02f2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 14:27:58 -07:00
Mark Otto
bbee78b30b
derp on navbar toggle and docs positions
2013-04-28 14:27:48 -07:00
Robert Burns
3326e1b21e
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 10:09:57 -04:00
Mark Otto
8b3a1702d4
Overhaul navbar navs
...
* Switch from to to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Kevin
9ce7f22e99
Adding media queries breakpoints variables
2013-04-27 18:47:47 +02:00
Tom Pietschker
c4d8aa2b0f
rename the navbar-inverse-brand variables for consistency
2013-04-07 17:47:53 -04:00
Mark Otto
db284a97d6
more consistent navbar vars
2013-03-31 17:56:31 -07:00
Mark Otto
aee25786a7
fuck everything about .clear_float() -- restore .clearfix() as mixin
2013-03-30 13:23:18 -07:00
Mark Otto
ba46d859e3
none of that
2013-03-28 01:12:07 -07:00
Mark Otto
fe414d8566
turn docs navbar into left navbar
2013-03-27 23:33:45 -07:00
Luke Page
5054c17ab8
make less files compile with strict maths in 1.4.0
2013-03-06 16:38:20 +00:00
Mark Otto
77e8e2aee9
Fix alignment of .navbar-brand
2013-03-01 00:50:08 -08:00
Mark Otto
492c249537
improve navbar toggle and hide code snippets on mobile devices for now
2013-03-01 00:18:10 -08:00
Mark Otto
5a30e52aac
Fixes #6995 : Add disabled navbar nav link support
2013-02-28 23:20:58 -08:00
Mark Otto
023568fe3d
Navbar realignment:
...
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto
36aec5e484
decrease top/bottom padding a bit in mobile fixed navbars
2013-02-17 18:47:44 -08:00
Mark Otto
c0ea077fb4
Revert the statis navbar in mobile views--they're back to being fixed all the time
2013-02-17 18:33:55 -08:00
Mark Otto
f38e50cdf1
Don't affix the fixed navbars in mobile views
2013-02-16 00:19:17 -08:00
Mark Otto
43da258bd9
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
c97d304c0c
derp, fix broke css and recompile
2013-02-05 19:43:49 -08:00
Mark Otto
15c7e73abd
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
94e256c016
Refactor navbar dividers
...
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto
b02a0fe768
Button up navbar form which was adding 2px padding to .navbar
2013-01-31 18:09:49 -08:00
Mark Otto
5075f4973b
Semibold dat .navbar .brand
2013-01-17 20:30:40 -08:00
Mark Otto
26f9f4e3a5
Remove navbar search
2013-01-17 12:02:17 -08:00
Mark Otto
32ebe2efd1
mo betta navbar dropdowns
2013-01-17 11:55:37 -08:00
Mark Otto
597a248d4a
Rearrange navbar.less and improve vertical divider support
2013-01-17 11:34:46 -08:00
Mark Otto
360f0c5359
Fix floats in navbar
2013-01-17 11:20:19 -08:00
Mark Otto
630005687d
Remove ported navbar css that was already commented out
2013-01-17 00:13:12 -08:00
Mark Otto
f535201781
improve navbar vars and fix side nav alignment
2013-01-16 23:33:26 -08:00
Mark Otto
6b193dc22d
More navbar tweaks, including making fixed navbars work in the docs by adding padding to body
2013-01-16 16:20:29 -08:00
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
a67c86e40f
Fixes #6586 : remove top 5px margin from navbar input group button groups
2013-01-15 10:27:30 -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
Patrick H. Lauke
848ca6e315
Basic keyboard accessibility CSS tweaks
...
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00: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
Mark Otto
ded21ebc91
fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements
2012-08-17 11:22:45 -07:00
Mark Otto
61a8ef2feb
Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar
2012-08-14 16:27:01 -07:00
Mark Otto
9c72246d49
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946
2012-08-14 16:24:58 -07:00
Mickael Perraud
41093a328e
Center text in navbar with change to @baseLineHeight (18 -> 20px)
2012-08-15 00:11:57 +02:00
Mark Otto
50df524ba1
remove borders entirely from fixed navbars
2012-08-14 14:53:45 -07:00
Mark Otto
0b0d7f104c
fixes #4396 : pull right dropdown menus no longer overlaid by submenus
2012-08-14 14:32:03 -07:00
