Skip to content

Commit 63d8e06

Browse files
taiontaion
committed
Merge branch 'master' into react-14
2 parents c912084 + b8e8615 commit 63d8e06

111 files changed

Lines changed: 3629 additions & 3324 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ackrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--ignore-dir=.coverage
12
--ignore-dir=lib
23
--ignore-dir=dist
34
--ignore-dir=amd
@@ -7,3 +8,4 @@
78
--ignore-dir=tmp-bower-repo
89
--ignore-file=match:test_bundle.js
910
--ignore-file=match:components.html
11+
--ignore-file=match:.orig

‎.eslintrc‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["defaults"],
2+
"extends": ["eslint-config-airbnb"],
33
"env": {
44
"browser": true,
55
"node": true
@@ -13,31 +13,54 @@
1313
"babel"
1414
],
1515
"rules": {
16+
"brace-style": 0,
1617
"constructor-super": 2,
18+
"comma-dangle": 0,
1719
"comma-spacing": 2,
1820
"comma-style": [2, "last"],
21+
"default-case": 0,
22+
"func-names": 0,
23+
"guard-for-in": 0,
24+
"indent": 0,
1925
"one-var": [2, { "initialized": "never" }],
26+
"padded-blocks": 0,
27+
"prefer-const": 0,
2028
"key-spacing": 0,
29+
"no-eq-null": 0,
30+
"no-else-return": 0,
31+
"no-multiple-empty-lines": 0,
32+
"no-nested-ternary": 0,
33+
"no-param-reassign": 0,
2134
"no-this-before-super": 2,
35+
"no-throw-literal": 0,
2236
"no-underscore-dangle": 0,
37+
"no-undef": 2,
2338
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
39+
"no-use-before-define": 0,
2440
"no-var": 2,
2541
"babel/object-shorthand": 2,
2642
"quotes": [2, "single", "avoid-escape"],
2743
"react/display-name": 0,
2844
"react/jsx-boolean-value": [2, "never"],
45+
"react/jsx-quotes": 0,
2946
"react/jsx-no-duplicate-props": 2,
3047
"react/jsx-no-undef": 2,
3148
"react/jsx-uses-react": 2,
3249
"react/no-did-mount-set-state": 2,
3350
"react/no-did-update-set-state": 2,
3451
"react/no-multi-comp": 2,
35-
"react/prop-types": [2, { "ignore": [ "children", "className" ] }],
52+
"react/prop-types": [2, { "ignore": [ "children", "className", "style" ] }],
3653
"react/react-in-jsx-scope": 2,
3754
"react/self-closing-comp": 2,
55+
"react/sort-comp": 0,
3856
"react/wrap-multilines": 2,
3957
"react/jsx-uses-vars": 2,
58+
"space-after-keywords": 0,
59+
"space-before-blocks": 0,
60+
"space-before-function-paren": 0,
4061
"space-infix-ops": 2,
41-
"strict": [2, "never"]
62+
"spaced-comment": 0,
63+
"strict": [2, "never"],
64+
"vars-on-top": 0
4265
}
4366
}

‎.projections.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"src/*.js": { "alternate": "test/{}Spec.js" },
3+
"test/*Spec.js": { "alternate": "src/{}.js" }
4+
}

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
v0.25.0 - Tue, 25 Aug 2015 18:56:33 GMT
2+
---------------------------------------
3+
4+
- [8776128](../../commit/8776128) [fixed] Affix in IE10 - scrollHeight #1073
5+
- [adad32e](../../commit/adad32e) [added] PropType validation for headerRole and panelRole
6+
- [346501e](../../commit/346501e) [changed] DropdownButton, SplitButton, DropdownMenu, MenuItem completely rewritten
7+
- [653d2ff](../../commit/653d2ff) [changed] deprecate domUtils as a public API
8+
- [769781d](../../commit/769781d) [added] accessibility props for PanelGroup and Panels.
9+
- [5f0ac64](../../commit/5f0ac64) [added] Implements a generalized left-aligned version of tabs
10+
- [628d586](../../commit/628d586) [changed] deprecated Position, Transition, Portal
11+
- [03a6a61](../../commit/03a6a61) [changed] deprecated the Transition duration prop
12+
- [459ab0c](../../commit/459ab0c) [added] #460 ListGroupItem outputs <button> when an onClick handler is set.
13+
- [e482ede](../../commit/e482ede) [fixed] wrong tabs switching animation for 'Tabs' component
14+
- [b62e1f5](../../commit/b62e1f5) [fixed] wrong tabs switching animation for 'TabbedArea' component
15+
- [d0ff625](../../commit/d0ff625) [added] aria role "tablist" to the Nav on Tabs
16+
- [e7cf455](../../commit/e7cf455) [changed] New Tabs API
17+
- [f6d32c4](../../commit/f6d32c4) [changed] deprecate 'utils/CustomPropTypes' exporting
18+
- [caff9a0](../../commit/caff9a0) [removed] Factory support
19+
20+
21+
122
v0.24.5 - Fri, 14 Aug 2015 18:02:13 GMT
223
---------------------------------------
324

‎docs/.eslintrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
2+
"plugins": [
3+
"lodash"
4+
],
25
"rules": {
36
"comma-spacing": 0,
7+
"lodash/import": 2,
48
"react/no-multi-comp": 0,
59
"react/prop-types": 0
610
},

‎docs/assets/style.css‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ body {
3636
}
3737
}
3838

39-
.navbar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand {
39+
.bs-docs-nav .navbar-brand {
4040
color: #00d8ff;
4141
}
4242

@@ -173,6 +173,29 @@ body {
173173

174174
}
175175

176+
.bs-example .super-colors {
177+
background: -moz-linear-gradient( top ,
178+
rgba(255, 0, 0, 1) 0%,
179+
rgba(255, 255, 0, 1) 15%,
180+
rgba(0, 255, 0, 1) 30%,
181+
rgba(0, 255, 255, 1) 50%,
182+
rgba(0, 0, 255, 1) 65%,
183+
rgba(255, 0, 255, 1) 80%,
184+
rgba(255, 0, 0, 1) 100%);
185+
background: -webkit-gradient(linear, left top, left bottom,
186+
color-stop(0%, rgba(255, 0, 0, 1)),
187+
color-stop(15%, rgba(255, 255, 0, 1)),
188+
color-stop(30%, rgba(0, 255, 0, 1)),
189+
color-stop(50%, rgba(0, 255, 255, 1)),
190+
color-stop(65%, rgba(0, 0, 255, 1)),
191+
color-stop(80%, rgba(255, 0, 255, 1)),
192+
color-stop(100%, rgba(255, 0, 0, 1)));
193+
}
194+
195+
/*.bs-example .custom-menu > ul > li {
196+
padding: 0 20px;
197+
}*/
198+
176199
.anchor,
177200
.anchor:hover,
178201
.anchor:active,
@@ -199,3 +222,13 @@ h4:hover .anchor-icon,
199222
h4 a:focus .anchor-icon {
200223
opacity: 0.5;
201224
}
225+
226+
.prop-desc pre {
227+
border-radius: 0;
228+
border-width: 0;
229+
border-left-width: 3px;
230+
}
231+
232+
.prop-desc-heading {
233+
margin-bottom: 10px;
234+
}

‎docs/dev-run‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ portfinder.getPorts(2, {}, (portFinderErr, [docsPort, webpackPort]) => {
6565
process.exit(1);
6666
}
6767

68-
runCmd('webpack-dev-server', `nodemon --watch webpack --watch webpack.docs.js --watch node_modules --exec webpack-dev-server -- --config webpack.docs.js --color --port ${webpackPort} --debug --hot --host ${ip.address()}`);
68+
runCmd('webpack-dev-server', `nodemon --watch webpack --watch webpack.docs.js --exec webpack-dev-server -- --config webpack.docs.js --color --port ${webpackPort} --debug --hot --host ${ip.address()}`);
6969

70-
runCmd('docs-server', 'nodemon --watch docs --watch src --watch node_modules --exec babel-node docs/server.js', {
70+
runCmd('docs-server', 'nodemon --watch docs --watch src --exec babel-node docs/server.js', {
7171
env: {
7272
PORT: docsPort,
7373
WEBPACK_DEV_PORT: webpackPort,

‎docs/examples/.eslintrc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
"Carousel",
2121
"CarouselItem",
2222
"Col",
23+
"Dropdown",
2324
"DropdownButton",
25+
"DropdownMenu",
2426
"FormControls",
2527
"Glyphicon",
2628
"Grid",
@@ -31,12 +33,11 @@
3133
"ListGroupItem",
3234
"Nav",
3335
"Navbar",
36+
"NavDropdown",
3437
"NavItem",
3538
"MenuItem",
3639
"Modal",
37-
"ModalTrigger",
3840
"OverlayTrigger",
39-
"OverlayMixin",
4041
"Overlay",
4142
"PageHeader",
4243
"PageItem",
@@ -48,9 +49,9 @@
4849
"ProgressBar",
4950
"Row",
5051
"SplitButton",
51-
"TabbedArea",
52+
"Tab",
5253
"Table",
53-
"TabPane",
54+
"Tabs",
5455
"Tooltip",
5556
"Well",
5657
"Thumbnail",

‎docs/examples/ButtonGroupJustified.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const buttonGroupInstance = (
22
<ButtonGroup justified>
33
<Button href='#'>Left</Button>
44
<Button href='#'>Middle</Button>
5-
<DropdownButton title='Dropdown'>
5+
<DropdownButton title='Dropdown' id='bg-justified-dropdown'>
66
<MenuItem eventKey='1'>Dropdown link</MenuItem>
77
<MenuItem eventKey='2'>Dropdown link</MenuItem>
88
</DropdownButton>

‎docs/examples/ButtonGroupNested.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const buttonGroupInstance = (
22
<ButtonGroup>
33
<Button>1</Button>
44
<Button>2</Button>
5-
<DropdownButton title='Dropdown'>
5+
<DropdownButton title='Dropdown' id='bg-nested-dropdown'>
66
<MenuItem eventKey='1'>Dropdown link</MenuItem>
77
<MenuItem eventKey='2'>Dropdown link</MenuItem>
88
</DropdownButton>

0 commit comments

Comments
 (0)