Merge pull request #9804 from PedroPovedaQ/master

Added Image type
This commit is contained in:
Mohamed Hegazy
2016-06-24 14:30:14 -07:00
committed by GitHub
2 changed files with 17 additions and 3 deletions
+5 -1
View File
@@ -7,7 +7,7 @@
// --------------------------------------------------------------------------------
import * as React from 'react';
import { Component, CSSProperties } from 'react';
import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, Form, FormGroup, ControlLabel, FormControl, HelpBlock, Radio, Checkbox } from 'react-bootstrap';
import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Image, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, Form, FormGroup, ControlLabel, FormControl, HelpBlock, Radio, Checkbox } from 'react-bootstrap';
export class ReactBootstrapTest extends Component<any, any> {
@@ -722,6 +722,10 @@ export class ReactBootstrapTest extends Component<any, any> {
</Jumbotron>
</div>
<div style={style}>
<Image src="https://placeholdit.imgix.net/~text?txtsize=33&txt=AUDIO&w=150&h=150" rounded />
</div>
<div style={style}>
<PageHeader>Example page header <small>Subtext for header</small></PageHeader>
</div>
+12 -2
View File
@@ -623,7 +623,7 @@ declare module "react-bootstrap" {
}
type Tab = TabClass;
var Tab: TabClass;
// <Tab.Container />
// ----------------------------------------
interface TabContainerProps extends React.HTMLAttributes {
@@ -632,7 +632,7 @@ declare module "react-bootstrap" {
generateChildId?: (eventKey: any, type: any) => string;
}
type TabContainer = React.ClassicComponentClass<TabContainerProps>;
// <Tab.Pane />
// ----------------------------------------
interface TabPaneProps extends React.HTMLAttributes {
@@ -847,6 +847,16 @@ declare module "react-bootstrap" {
type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
// <Image />
interface ImageProps extends React.HTMLProps<Image> {
circle?: boolean;
responsive?: boolean;
rounded?: boolean;
thumbnail?: boolean;
}
type Image = React.ClassicComponent<ImageProps, {}>;
var Image: React.ClassicComponentClass<ImageProps>;
// <PageHeader />
interface PageHeaderProps extends React.HTMLProps<PageHeader> {
}