Skip to content

Commit

Permalink
Merge branch 'master' of github.com:palantir/blueprint into feature/d…
Browse files Browse the repository at this point in the history 
…ocumentalist

Conflicts:
	packages/docs/package.json
	packages/docs/src/styles/_sections.scss
  • Loading branch information
Gilad Gray committed Mar 31, 2017
2 parents 3290f79 + 8ddb5f4 commit 260de5a
Show file tree
Hide file tree
Showing 67 changed files with 1,391 additions and 679 deletions.
34 changes: 17 additions & 17 deletions docs/blueprint-landing.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,7 @@ span.pt-icon {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-button.pt-minimal:disabled, .pt-button.pt-minimal:disabled:hover, .pt-button.pt-minimal.pt-disabled, .pt-button.pt-minimal.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-button.pt-minimal {
Expand All @@ -1825,7 +1825,7 @@ span.pt-icon {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-button.pt-minimal:disabled, .pt-dark .pt-button.pt-minimal:disabled:hover, .pt-dark .pt-button.pt-minimal.pt-disabled, .pt-dark .pt-button.pt-minimal.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-button.pt-minimal.pt-intent-primary {
Expand Down Expand Up @@ -2024,7 +2024,7 @@ a.pt-button {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-select.pt-minimal select:disabled, .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-select.pt-minimal select, .pt-select.pt-minimal .pt-dark select {
Expand All @@ -2040,7 +2040,7 @@ a.pt-button {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-select.pt-minimal select:disabled, .pt-select.pt-minimal .pt-dark select:disabled, .pt-dark .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal .pt-dark select:disabled:hover, .pt-dark .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal .pt-dark select.pt-disabled, .pt-dark .pt-select.pt-minimal select.pt-disabled:hover, .pt-select.pt-minimal .pt-dark select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-select.pt-minimal select.pt-intent-primary {
Expand Down Expand Up @@ -2264,7 +2264,7 @@ a.pt-button {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-button-group.pt-minimal .pt-button:disabled, .pt-button-group.pt-minimal .pt-button:disabled:hover, .pt-button-group.pt-minimal .pt-button.pt-disabled, .pt-button-group.pt-minimal .pt-button.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-button-group.pt-minimal .pt-button {
Expand All @@ -2280,7 +2280,7 @@ a.pt-button {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-button-group.pt-minimal .pt-button:disabled, .pt-dark .pt-button-group.pt-minimal .pt-button:disabled:hover, .pt-dark .pt-button-group.pt-minimal .pt-button.pt-disabled, .pt-dark .pt-button-group.pt-minimal .pt-button.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-button-group.pt-minimal .pt-button.pt-intent-primary {
Expand Down Expand Up @@ -2781,7 +2781,7 @@ a.pt-button {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-select.pt-minimal select:disabled, .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-select.pt-minimal select, .pt-select.pt-minimal .pt-dark select {
Expand All @@ -2797,7 +2797,7 @@ a.pt-button {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-select.pt-minimal select:disabled, .pt-select.pt-minimal .pt-dark select:disabled, .pt-dark .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal .pt-dark select:disabled:hover, .pt-dark .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal .pt-dark select.pt-disabled, .pt-dark .pt-select.pt-minimal select.pt-disabled:hover, .pt-select.pt-minimal .pt-dark select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-select.pt-minimal select.pt-intent-primary {
Expand Down Expand Up @@ -3145,7 +3145,7 @@ a.pt-button {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-select.pt-minimal select:disabled, .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-select.pt-minimal select, .pt-select.pt-minimal .pt-dark select {
Expand All @@ -3161,7 +3161,7 @@ a.pt-button {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-select.pt-minimal select:disabled, .pt-select.pt-minimal .pt-dark select:disabled, .pt-dark .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal .pt-dark select:disabled:hover, .pt-dark .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal .pt-dark select.pt-disabled, .pt-dark .pt-select.pt-minimal select.pt-disabled:hover, .pt-select.pt-minimal .pt-dark select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-select.pt-minimal select.pt-intent-primary {
Expand Down Expand Up @@ -3381,7 +3381,7 @@ a.pt-button {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-select.pt-minimal select:disabled, .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-select.pt-minimal select, .pt-select.pt-minimal .pt-dark select {
Expand All @@ -3397,7 +3397,7 @@ a.pt-button {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-select.pt-minimal select:disabled, .pt-select.pt-minimal .pt-dark select:disabled, .pt-dark .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal .pt-dark select:disabled:hover, .pt-dark .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal .pt-dark select.pt-disabled, .pt-dark .pt-select.pt-minimal select.pt-disabled:hover, .pt-select.pt-minimal .pt-dark select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-select.pt-minimal select.pt-intent-primary {
Expand Down Expand Up @@ -4590,7 +4590,7 @@ label.pt-label {
background: rgba(115, 134, 148, 0.3);
color: #182026; }
.pt-select.pt-minimal select:disabled, .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(92, 112, 128, 0.5); }
.pt-dark .pt-select.pt-minimal select, .pt-select.pt-minimal .pt-dark select {
Expand All @@ -4606,7 +4606,7 @@ label.pt-label {
background: rgba(138, 155, 168, 0.3);
color: #f5f8fa; }
.pt-dark .pt-select.pt-minimal select:disabled, .pt-select.pt-minimal .pt-dark select:disabled, .pt-dark .pt-select.pt-minimal select:disabled:hover, .pt-select.pt-minimal .pt-dark select:disabled:hover, .pt-dark .pt-select.pt-minimal select.pt-disabled, .pt-select.pt-minimal .pt-dark select.pt-disabled, .pt-dark .pt-select.pt-minimal select.pt-disabled:hover, .pt-select.pt-minimal .pt-dark select.pt-disabled:hover {
background: inherit;
background: none;
cursor: not-allowed;
color: rgba(191, 204, 214, 0.5); }
.pt-select.pt-minimal select.pt-intent-primary {
Expand Down Expand Up @@ -6045,9 +6045,6 @@ table.pt-table {
border: none;
padding: 0;
list-style: none; }
.pt-tab-list.pt-large .pt-tab {
line-height: 40px;
font-size: 16px; }
.pt-tab-list > *:not(:last-child) {
margin-right: 20px; }

Expand Down Expand Up @@ -6077,6 +6074,9 @@ table.pt-table {
color: #106ba3; }
.pt-tab:focus {
-moz-outline-radius: 0; }
.pt-large .pt-tab {
line-height: 40px;
font-size: 16px; }

.pt-tab-panel {
margin-top: 20px; }
Expand Down
7 changes: 4 additions & 3 deletions docs/blueprint-landing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32693,6 +32693,7 @@
}
};
Tabs2.prototype.getInitialSelectedTabId = function () {
// NOTE: providing an unknown ID will hide the selection
var _a = this.props, defaultSelectedTabId = _a.defaultSelectedTabId, selectedTabId = _a.selectedTabId;
if (selectedTabId !== undefined) {
return selectedTabId;
Expand All @@ -32702,8 +32703,8 @@
}
else {
// select first tab in absence of user input
// NOTE: providing an unknown ID will hide the selection
return this.getTabChildren()[0].props.id;
var tabs = this.getTabChildren();
return tabs.length === 0 ? undefined : tabs[0].props.id;
}
};
Tabs2.prototype.getKeyCodeDirection = function (e) {
Expand Down Expand Up @@ -32771,7 +32772,7 @@
return codes.indexOf(e.which) >= 0;
}
function isTab(child) {
return child.type === tab2_1.Tab2;
return child != null && child.type === tab2_1.Tab2;
}

//# sourceMappingURL=tabs2.js.map
Expand Down
Loading

0 comments on commit 260de5a

Please sign in to comment.