diff --git a/docs/examples/.eslintrc b/docs/examples/.eslintrc index 87b2fe380e..ed5fd65183 100644 --- a/docs/examples/.eslintrc +++ b/docs/examples/.eslintrc @@ -13,7 +13,7 @@ "Button", "ButtonGroup", "ButtonToolbar", - "CollapsableNav", + "CollapsibleNav", "CollapsibleMixin", "Carousel", "CarouselItem", diff --git a/docs/examples/CollapsableNav.js b/docs/examples/CollapsibleNav.js similarity index 90% rename from docs/examples/CollapsableNav.js rename to docs/examples/CollapsibleNav.js index 87824bb989..2d04d65fc8 100644 --- a/docs/examples/CollapsableNav.js +++ b/docs/examples/CollapsibleNav.js @@ -1,6 +1,6 @@ const navbarInstance = ( - {/* This is the eventKey referenced */} + {/* This is the eventKey referenced */} - + ); diff --git a/docs/examples/NavbarCollapsable.js b/docs/examples/NavbarCollapsible.js similarity index 100% rename from docs/examples/NavbarCollapsable.js rename to docs/examples/NavbarCollapsible.js diff --git a/docs/src/ComponentsPage.js b/docs/src/ComponentsPage.js index a390143759..ba2dbde570 100644 --- a/docs/src/ComponentsPage.js +++ b/docs/src/ComponentsPage.js @@ -351,7 +351,7 @@ const ComponentsPage = React.createClass({

By setting the property {React.DOM.code(null, 'defaultNavExpanded={true}')} the Navbar will start expanded by default.

Scrollbar overflow

-

The height of the collapsable is slightly smaller than the real height. To hide the scroll bar, add the following css to your style files.

+

The height of the collapsible is slightly smaller than the real height. To hide the scroll bar, add the following css to your style files.

                       {React.DOM.code(null,
                         '.navbar-collapse {\n' +
@@ -360,17 +360,17 @@ const ComponentsPage = React.createClass({
                       )}
- +

Mobile Friendly (Multiple Nav Components)

-

To have a mobile friendly Navbar that handles multiple Nav components use CollapsableNav. The toggleNavKey must still be set, however, the corresponding eventKey must now be on the CollapsableNav component.

+

To have a mobile friendly Navbar that handles multiple Nav components use CollapsibleNav. The toggleNavKey must still be set, however, the corresponding eventKey must now be on the CollapsibleNav component.

Div collapse

-

The navbar-collapse div gets created as the collapsable element which follows the bootstrap collapsable navbar documentation.

+

The navbar-collapse div gets created as the collapsible element which follows the bootstrap collapsible navbar documentation.

<div class="collapse navbar-collapse"></div>
- + {/* Tabbed Areas */} diff --git a/docs/src/ReactPlayground.js b/docs/src/ReactPlayground.js index d82f605b9e..2aa45b8406 100644 --- a/docs/src/ReactPlayground.js +++ b/docs/src/ReactPlayground.js @@ -6,7 +6,7 @@ import * as modBadge from '../../src/Badge'; import * as modmodButton from '../../src/Button'; import * as modButtonGroup from '../../src/ButtonGroup'; import * as modmodButtonToolbar from '../../src/ButtonToolbar'; -import * as modCollapsableNav from '../../src/CollapsableNav'; +import * as modCollapsibleNav from '../../src/CollapsibleNav'; import * as modCollapsibleMixin from '../../src/CollapsibleMixin'; import * as modCarousel from '../../src/Carousel'; import * as modCarouselItem from '../../src/CarouselItem'; @@ -53,7 +53,7 @@ const Badge = modBadge.default; const Button = modmodButton.default; const ButtonGroup = modButtonGroup.default; const ButtonToolbar = modmodButtonToolbar.default; -const CollapsableNav = modCollapsableNav.default; +const CollapsibleNav = modCollapsibleNav.default; const CollapsibleMixin = modCollapsibleMixin.default; const Carousel = modCarousel.default; const CarouselItem = modCarouselItem.default; diff --git a/docs/src/Samples.js b/docs/src/Samples.js index 5434ef3b66..004fe581d7 100644 --- a/docs/src/Samples.js +++ b/docs/src/Samples.js @@ -52,8 +52,8 @@ export default { NavJustified: require('fs').readFileSync(__dirname + '/../examples/NavJustified.js', 'utf8'), NavbarBasic: require('fs').readFileSync(__dirname + '/../examples/NavbarBasic.js', 'utf8'), NavbarBrand: require('fs').readFileSync(__dirname + '/../examples/NavbarBrand.js', 'utf8'), - NavbarCollapsable: require('fs').readFileSync(__dirname + '/../examples/NavbarCollapsable.js', 'utf8'), - CollapsableNav: require('fs').readFileSync(__dirname + '/../examples/CollapsableNav.js', 'utf8'), + NavbarCollapsible: require('fs').readFileSync(__dirname + '/../examples/NavbarCollapsible.js', 'utf8'), + CollapsibleNav: require('fs').readFileSync(__dirname + '/../examples/CollapsibleNav.js', 'utf8'), TabbedAreaUncontrolled: require('fs').readFileSync(__dirname + '/../examples/TabbedAreaUncontrolled.js', 'utf8'), TabbedAreaControlled: require('fs').readFileSync(__dirname + '/../examples/TabbedAreaControlled.js', 'utf8'), TabbedAreaNoAnimation: require('fs').readFileSync(__dirname + '/../examples/TabbedAreaNoAnimation.js', 'utf8'), diff --git a/src/index.js b/src/index.js index ab8c3f01c2..047638f72c 100644 --- a/src/index.js +++ b/src/index.js @@ -8,6 +8,7 @@ import Button from './Button'; import ButtonGroup from './ButtonGroup'; import ButtonToolbar from './ButtonToolbar'; import CollapsableNav from './CollapsableNav'; +import CollapsibleNav from './CollapsibleNav'; import Carousel from './Carousel'; import CarouselItem from './CarouselItem'; import Col from './Col'; @@ -60,6 +61,7 @@ export default { ButtonGroup, ButtonToolbar, CollapsableNav, + CollapsibleNav, Carousel, CarouselItem, Col,