0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

94 Commits

Author SHA1 Message Date
Mark Otto
bd93ed2cb6 Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
	dist/css/bootstrap.min.css
2013-08-13 13:48:33 -07:00
Mark Otto
270af4dda3 fixes #9431: specify font-size in dropdown menus to avoid inheritance issues 2013-08-13 13:16:56 -07:00
Mark Otto
8bb7def26c Navbar refactor
* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs
2013-08-12 21:23:28 -07:00
Mark Otto
55cfa8d38f Drop background-clip and background-size mixins since they have no prefixes anyway 2013-08-12 10:01:13 -07:00
Mark Otto
58b90dae15 addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) 2013-08-11 17:47:30 -07:00
Mark Otto
3f3dfc54e7 update use of mixins and add bg-colors where necessary 2013-08-06 18:05:37 -07:00
Mark Otto
04dc221037 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
2013-08-05 16:03:10 -07:00
Guillermo González de Agüero
824d5d5de4 Fix #8944 2013-08-01 20:07:34 +02:00
liuyl
7e9532dabe set cursor to not-allowed for disabled elements 2013-07-24 17:10:27 +08:00
Mark Otto
398038c798 Update dropdown vars
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00
syed
1683e6767a moving code and dropdowns to variables.less 2013-07-20 13:17:56 +05:00
Mark Otto
e57758cbb4 Drop .nav-header for .dropdown-header
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
Chris Rebert
7e154740f3 use LESS nesting more in dropdowns.less 2013-07-07 19:54:07 -07:00
liuyl
e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
Mark Otto
bf3c5e070e remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s 2013-06-27 20:49:29 -07:00
Mark Otto
60575dfb46 Gradients refactor
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
fat
92245e8bc7 change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click 2013-05-16 12:50:06 -07:00
Mark Otto
2d10d61fde Restore commented out dropdown styles, get open dropdown state working again 2013-05-12 16:03:56 -07:00
Mark Otto
92adcfabb5 Start some nav and dropdown cleanup
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place  on all
* Use  on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
2013-05-12 15:47:18 -07:00
Mark Otto
e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto
f226463b05 Restore on links in dropdowns as they are randomly breaking onto new lines 2013-04-13 23:54:51 -07:00
Mark Otto
0441bbba42 more consisten dropdown vars 2013-03-31 17:36:23 -07:00
Mark Otto
7c3c5ed7cc Merge branch 'pickypg-patch-1' into 3.0.0-wip
Conflicts:
	less/dropdowns.less
2013-03-30 12:54:16 -07:00
pickypg
812b99263f Fix dropdown (and therefore typeahead) wrap
I have recently been experimenting with a lot of Typeahead controls, and I ran into a situation where my Typeahead was too wide for my screen, particularly on mobile devices, and it was not wrapping as I had expected it to do.

http://jsfiddle.net/Mtxkn/3/

Changing the CSS for `.dropdown-menu > li > a` to `white-space: normal` causes it to wrap in every scenario that I have seen, whereas leaving it as `nowrap` never does what I want when the text is too long for a given row.

It's possible that this has ramifications for other dropdown menus, but honestly I expect that even those would prefer to wrap than to extend the screen horizontally.  If that is not the case, then it would work to change the typeahead version of this only:

```css
.typeahead > li > a {
    white-space: normal;
}
```
2013-03-15 02:54:24 -03:00
Mark Otto
6ccf588a8e Restore submenu support 2013-02-17 13:35:14 -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
9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
Mark Otto
1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -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
a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
2012-12-20 13:47:36 -08:00
Mark Otto
cc6974b74e Remove dropdown submenu CSS 2012-12-20 00:27:05 -08:00
Mark Otto
7449e2e5a1 Remove @black and just use #000 2012-12-19 22:02:57 -08:00
Mark Otto
26b999b76a no need for margin-top on .typeahead, it's set on .dropdown-menu 2012-12-19 19:46:44 -08:00
Blake Embrey
c105906780 Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 2012-12-10 16:42:58 +10: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
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
f1349a2450 Fixes #5533: Remove filter gradient from disabled links on dropdowns 2012-11-28 02:22:37 -08:00
Mark Otto
ee93541421 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
2012-11-04 19:59:07 -08:00
Mark Otto
fb51efcbd4 Fixes #5113: increase .typeahead z-index for proper use with modals 2012-11-04 13:01:31 -08: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
Ninir
be03a53086 Replaced hardcoded CSS rules with mixins 2012-10-31 11:09:44 -07:00
Mark Otto
709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto
31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto
7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto
7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto
dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto
4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00