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
Mark Otto
2a6deb92b1
fixes #4395 : scope dropdown menu caret in navbar to first level dropdown only
2012-08-14 14:29:31 -07:00
Mark Otto
97a23ef2e6
fixes #4342 : navbar vars not in use, render navbar dividers
2012-08-13 22:57:40 -07:00
Mark Otto
7fa99fb1fe
fix navbar form alignment, and update examples to show these cases
2012-07-30 12:15:08 -07:00
Mark Otto
b63543181a
fix examples collapse classes, rename navbar-redux to navbar and delete the old one
2012-07-30 10:08:27 -07:00
Mark Otto
a30045daef
reverse navbar styles to save code
2012-07-29 00:30:15 -07:00
Mark Otto
7590e65f6f
fix search form, mostly in navbar
2012-07-24 01:44:12 -07:00
Mark Otto
5cb116beb8
cleanup subnav example
2012-07-13 10:58:20 -07:00
Mark Otto
c884d6eaa6
clean up docs for subnav
2012-07-12 13:50:27 -07:00
Mark Otto
f495a8d0cc
fixes #3210 : add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form
2012-07-09 21:01:29 -07:00
Mark Otto
3c07eaa251
updates to type scale
2012-07-05 15:11:54 -07:00
Mark Otto
c6ee96c025
fix up subnav styles, add subnav search form styles, add some basic docs for subnav
2012-07-05 10:37:23 -07:00
Mark Otto
62c386259b
rewrite docs homepage, new graphics
2012-07-04 23:31:30 -07:00
Mark Otto
cd2d82150c
standardize top level file comments
2012-06-28 21:46:45 -07:00
Mark Otto
98ebd54800
address issues with fixed subnav like borders, corners, etc
2012-06-28 21:20:40 -07:00
Mark Otto
c31a4e5131
remove responsive subnav from docs and place in navbar-responsive.less
2012-06-28 20:59:16 -07:00
Mark Otto
6662f62236
remove subnav file, instead add an optional class for .navbar
2012-06-24 21:03:39 -07:00
Mark Otto
87af5d3bbe
more subnav optimizations
2012-06-24 20:42:31 -07:00
Mark Otto
71669dda63
tons of docs cleanup in css, adding subnav to official components
2012-06-24 20:26:48 -07:00
Ross Laird
626b45d691
Corrected spelling error
2012-06-15 13:07:44 -07:00
Jacob Thornton
5e5965ca6f
Merge branch 'accessibility' into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Corey Innis
8a06339501
fixes .placeholder to work as a "grouped selector"
...
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`
the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Jacob Thornton
a7b49a7d92
nearly everything working with activedescendant... then decide it's wrong.
2012-05-17 00:23:11 -07:00
Allen Bargi
99c3b7810b
No need to specify units when a value is 0, thanks to RECESS
2012-04-25 18:16:59 +03:00
Bryan Petty
5b85ed181a
Fixed extra margin on Navbar buttons.
2012-04-10 15:22:17 -06:00
Bryan Petty
030265eaec
Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.
2012-04-02 02:52:06 -06:00
Mark Otto
2355fd224d
remove @shadow instances and replace with escaped values, update mixins to not use a default value at all
2012-03-31 21:06:16 -07:00
Jacob Thornton
a62810918f
fix responsive navbar
2012-03-25 13:33:36 -07:00
Mark Otto
a5552a1d70
revert bart's mixin fix
2012-03-25 12:42:47 -07:00
Mark Otto
b81a082cd1
add navbarheight support to .brand and .nav links in navbar
2012-03-25 12:32:29 -07:00
Mark Otto
6c5c29ada2
introduce .navbar-link to resolve issue with buttons in .navbar-text
2012-03-25 01:21:47 -07:00
Mark Otto
ac64d9405b
Dropdowns overhaul:
...
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
2012-03-22 23:09:31 -07:00
ctalkington
bf09c979ca
make brand links follow navbarLinkColor but also be customizable in advanced cases.
2012-03-15 14:21:27 -05:00
Mark Otto
e12c66aabe
adding border variable for dropdowns, making dropdown carets use dropdown vars
2012-03-12 09:57:10 -07:00
Mark Otto
0f23883283
fix broken dropdowns in ie7 per #2333
2012-03-11 20:16:39 -07:00
Mark Otto
7154e378b2
use variable for navbar text line-height
2012-03-11 17:53:17 -07:00
Mark Otto
5de8b277c6
add vars for navbar search
2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c
clean up search form in navbar, add new variable for placeholder text color
2012-03-10 16:15:54 -08:00
Mark Otto
305374ab1a
clear up nav variables
2012-03-10 11:23:05 -08:00
Mark Otto
9c2b2c589d
fix comment on bottom-up, should be dropup
2012-03-05 20:20:42 -08:00
Mark Otto
fbebb046f7
fix navbar container for default 940px grid per #2194
2012-02-27 22:34:25 -08:00
Mark Otto
a139167489
set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins)
2012-02-21 23:15:43 -08:00
Mark Otto
8bd67bb124
clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups
2012-02-21 22:09:51 -08:00
Mark Otto
20221a67c2
Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/navbar.less
2012-02-21 22:01:39 -08:00
Mark Otto
b4cc6c74f5
add support and docs for .navbar-fixed-bottom
2012-02-21 21:12:16 -08:00
Mark Otto
d2630ff84e
introduce new mixin to do navbar vertical centering
2012-02-20 19:14:26 -08:00
Mark Otto
16d12396d0
simplify text color in navbar by placing the color on global .navbar component
2012-02-19 14:53:07 -08:00
Mark Otto
bbb2fb3395
fix right aligned dropdowns
2012-02-18 20:06:38 -08:00
Mark Otto
3e00c1261f
allow .input-prepend/.input-append to work in .navbar per #1681
2012-02-12 20:28:22 -08:00
Mark Otto
a9e469e75a
add navbar background hover variable and fix uneditable-input with append/prepend controls
2012-02-12 14:01:58 -08:00
Mark Otto
b9d5ceb14b
edit comment on IE7-8 support of :focus in navbar-search
2012-02-12 11:17:46 -08:00
Mark Otto
87a8c9b677
#1707 : remove rgba() background override on navbar active items for customization
2012-02-04 22:40:50 -08:00
Mark Otto
b7713b83fa
chance icon class
2012-01-31 00:11:19 -08:00
Mark Otto
3722c34b50
account for floated inputs in the .navbar-form
2012-01-30 08:20:37 -08:00
Mark Otto
8f448610a9
rename vertical-divider to divider-vertical, add more space around the divider
2012-01-30 01:09:34 -08:00
Burak Tuyan
918a17a30b
Adding dropup support to split buttons and navbar
...
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
2012-01-30 00:50:47 +02:00
Mark Otto
9e7f5025b4
update collapsible nav in navbar
2012-01-29 14:07:58 -08:00
Mark Otto
bca269299b
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section
2012-01-28 23:40:52 -08:00
Mark Otto
59d9983ebc
updates to responsive and docs for responsive navbar
2012-01-28 22:03:14 -08:00
Mark Otto
4fa931e403
fix the navbar click and a few jank responsive problems
2012-01-28 18:11:31 -08:00
Jacob Thornton
b8a683d7f2
turn off brand hover for now + get nav toggling in mobile
2012-01-28 15:42:07 -08:00
Mark Otto
23e076c1bb
add in a navbar button for toggling the nav items
2012-01-28 15:09:23 -08:00
Mark Otto
7843a665fd
vertical align inline checkboxes/radios to improve rendering in topbar
2012-01-28 14:50:56 -08:00
Mark Otto
ad78caa726
fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment
2012-01-27 21:25:35 -08:00
Mark Otto
997fc33af9
clean up use of mixins to highlight them appropriately in your fav editor
2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963
overhaul navbar behavior in responsive css
2012-01-27 16:26:55 -08:00
Mark Otto
003da1e089
fix inputs in navbar
2012-01-27 14:21:17 -08:00
Pete Hopkins
a1fc352cc2
Changes non-transparent navbar search box color to match transparent one better
2012-01-27 16:35:40 -05:00
Mark Otto
e8647c1b11
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff
2012-01-27 13:20:02 -08:00
Jacob Thornton
dc2deb9a1b
moving structure around + more work on builder...
2012-01-26 21:48:46 -08:00