Skip to content

Commit 5079296

Browse files
authored
Merge branch 'master' into qt/search_with_provider
2 parents ff9900d + 4ebae58 commit 5079296

File tree

8 files changed

+29
-9
lines changed

8 files changed

+29
-9
lines changed

src/components/ComponentList.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,9 @@ class ComponentList extends React.Component {
145145
render() {
146146
const { loadMoreRows, noRowsRenderer, list, listLength } = this.props
147147
const { sortOrder, contentSeq } = this.state
148+
const showFilterBar = false
148149
return (
149-
<div className="clearly-table-body flex-grow">
150+
<div className={`clearly-table-body flex-grow ${showFilterBar ? 'show-filter' : ''}`}>
150151
<div className="clearly-header">
151152
<div className="table-header-fcloumn">
152153
<h4>Component</h4>

src/components/Navigation/Pages/PageDefinitions/ButtonsBar.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ import ButtonWithTooltip from '../../Ui/ButtonWithTooltip'
55
import ShareButton from '../../Ui/ShareButton'
66

77
export default class ButtonsBar extends Component {
8+
constructor(props) {
9+
super(props)
10+
this.onSelect = this.onSelect.bind(this)
11+
}
12+
813
static propTypes = {
914
components: PropTypes.object,
1015
hasChanges: PropTypes.bool,

src/components/Navigation/Ui/ShareButton.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ export default class ShareButton extends Component {
1313
const disabled = !components || components.list.length === 0
1414
return (
1515
<DropdownButton disabled={disabled} id={'sharedropdown'} title="Share" bsStyle="success">
16-
<MenuItem eventKey="1" onSelect={() => onSelect('url')}>
16+
<MenuItem eventKey="1" className="dropdown-item" onSelect={() => onSelect('url')}>
1717
URL
1818
</MenuItem>
19-
<MenuItem eventKey="2" onSelect={() => onSelect('file')}>
19+
<MenuItem eventKey="2" className="dropdown-item" onSelect={() => onSelect('file')}>
2020
Coordinate list (JSON)
2121
</MenuItem>
22-
<MenuItem eventKey="2" onSelect={() => onSelect('notice')}>
22+
<MenuItem eventKey="2" className="dropdown-item" onSelect={() => onSelect('notice')}>
2323
Notice file
2424
</MenuItem>
25-
<MenuItem divider />
25+
{/* <MenuItem divider />
2626
<MenuItem disabled>Definitions (Not implemented)</MenuItem>
27-
<MenuItem disabled>SPDX (Not implemented)</MenuItem>
27+
<MenuItem disabled>SPDX (Not implemented)</MenuItem> */}
2828
</DropdownButton>
2929
)
3030
}

src/styles/_App.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ main {
240240
box-shadow: 5px 5px 20px -10px lightgrey;
241241
display: flex;
242242
min-height: 200px;
243-
padding-bottom: $height-filters-section;
244243

245244
.fa-spinner {
246245
display: none;

src/styles/_List.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,10 @@
373373
height: $height-filters-list;
374374
}
375375

376+
.show-filter.clearly-table-body {
377+
margin-bottom: $height-filters-section;
378+
}
379+
376380
.filter-list,
377381
.list-filter,
378382
.section--filter-bar {

src/styles/_ShareButton.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.open > .dropdown-menu {
2+
display: block;
3+
}
4+
5+
.dropdown.btn-group {
6+
display: inline-block;
7+
}
8+
9+
.dropdown-item > a {
10+
display: block;
11+
}

src/styles/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,6 @@ main {
7575
@import './GetInvolved.scss';
7676
@import './PageAbout.scss';
7777
@import './charter.scss';
78+
@import './ShareButton.scss';
7879

7980
@import './utils.scss';

src/styles/style.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,13 +433,12 @@ a:hover {
433433
/* min-height: 550px; */
434434
/* max-height: 700px; */
435435
overflow: hidden;
436-
height: 60vh;
437436
position: relative;
438437
width: 100%;
439438
will-change: transform; }
440439

441440
.clearly-table-body .form-group.flex-grow-column {
442-
height: 100%;
441+
height: 60vh;
443442
width: 100%; }
444443

445444
.clearly-table .form-group.flex-grow-column .checkbox {

0 commit comments

Comments
 (0)