Skip to content

Commit 3325cb5

Browse files
authored
Fix: Styling changes (#3)
Fixes header row styling Removes dead css Hides upload button when canuplaod is false
1 parent 73e7d9b commit 3325cb5

12 files changed

Lines changed: 65 additions & 89 deletions

File tree

src/components/ContentExplorer/Content.scss

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@
55
flex: 1;
66
flex-direction: column;
77

8-
.bce-item-list,
9-
.bce-empty-state {
8+
.bce-item-list {
109
flex: 1;
10+
min-height: 300px;
1111
position: relative;
1212

1313
// sass-lint:disable class-name-format
1414
.ReactVirtualized__Table__Grid {
1515
outline: none;
1616
}
1717
}
18-
19-
.bce-empty-state {
20-
align-items: center;
21-
display: flex;
22-
flex: 1;
23-
justify-content: center;
24-
}
2518
}

src/components/ContentExplorer/ItemList.scss

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,19 @@
7474
.bce-item-header-row {
7575
border-bottom: 1px solid $off-white;
7676
box-shadow: 0 4px 6px -2px $transparent-black;
77-
color: $sevens;
78-
font-weight: 400;
79-
text-transform: none;
80-
}
81-
82-
.ReactVirtualized__Table__headerTruncatedText {
83-
vertical-align: middle;
84-
}
8577

86-
.ReactVirtualized__Table__sortableHeaderColumn {
87-
cursor: pointer;
88-
89-
&:active,
90-
&:hover,
91-
&:focus {
92-
color: $blue;
93-
outline: none;
78+
.ReactVirtualized__Table__sortableHeaderColumn {
79+
color: $sevens;
80+
cursor: pointer;
81+
font-weight: 400;
82+
text-transform: none;
83+
user-select: none;
84+
85+
&:active,
86+
&:hover,
87+
&:focus {
88+
color: $dark-cerulean;
89+
outline: none;
90+
}
9491
}
9592
}

src/components/ContentExplorer/ShareDialog.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import React from 'react';
88
import Modal from 'react-modal';
99
import ShareAccessSelect from '../ShareAccessSelect';
10-
import { Button } from '../Button';
10+
import { Button, PrimaryButton } from '../Button';
1111
import { CLASS_MODAL_CONTENT, CLASS_MODAL_OVERLAY, CLASS_MODAL } from '../../constants';
1212
import type { BoxItem } from '../../flowTypes';
1313
import './ShareDialog.scss';
@@ -71,9 +71,9 @@ const ShareDialog = ({
7171
}}
7272
value={url}
7373
/>
74-
<Button className='buik-modal-button-copy' onClick={copy}>
74+
<PrimaryButton className='buik-modal-button-copy' onClick={copy}>
7575
{getLocalizedMessage('buik.modal.dialog.share.button.copy')}
76-
</Button>
76+
</PrimaryButton>
7777
</span>
7878
</label>
7979
</div>

src/components/ContentExplorer/ShareDialog.scss

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,14 @@
2121
}
2222

2323
.buik-modal-button-copy {
24-
appearance: none;
25-
background-color: $blue;
26-
border: 1px solid $blue;
27-
border-left: 0 none;
2824
border-radius: 0 3px 3px 0;
29-
box-shadow: inset 0 1px 1px $lightest-black;
30-
color: $white;
3125
font-size: 10px;
3226
font-weight: bold;
3327
height: 34px;
3428
letter-spacing: 1px;
3529
line-height: 34px;
36-
margin: 0;
37-
outline: none;
3830
padding: 0 10px;
39-
text-shadow: none;
4031
text-transform: uppercase;
41-
transition: background-color .05s ease-in-out, border-color .05s ease-in-out;
4232
}
4333

4434
.buik-modal-btns {

src/components/ContentPicker/Content.scss

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@
55
flex: 1;
66
flex-direction: column;
77

8-
.bcp-item-list,
9-
.bcp-empty-state {
8+
.bcp-item-list {
109
flex: 1;
10+
min-height: 300px;
1111
position: relative;
1212

1313
// sass-lint:disable class-name-format
1414
.ReactVirtualized__Table__Grid {
1515
outline: none;
1616
}
1717
}
18-
19-
.bcp-empty-state {
20-
align-items: center;
21-
display: flex;
22-
flex: 1;
23-
justify-content: center;
24-
}
2518
}

src/components/ContentTree/Content.scss

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@
55
flex: 1;
66
flex-direction: column;
77

8-
.bct-item-list,
9-
.bct-empty-state {
8+
.bct-item-list {
109
flex: 1;
10+
min-height: 300px;
1111
position: relative;
1212

1313
// sass-lint:disable class-name-format
1414
.ReactVirtualized__Table__Grid {
1515
outline: none;
1616
}
1717
}
18-
19-
.bct-empty-state {
20-
align-items: center;
21-
display: flex;
22-
flex: 1;
23-
justify-content: center;
24-
}
2518
}

src/components/ContentUploader/DroppableContent.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
.bcu-item-list {
88
flex: 1;
9+
min-height: 300px;
910
position: relative;
1011

1112
// sass-lint:disable class-name-format

src/components/ContentUploader/UploadState.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
display: flex;
66
flex: 1;
77
justify-content: center;
8+
min-height: 300px;
89
position: relative;
910
text-align: center;
1011

src/components/EmptyState/EmptyState.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
display: flex;
44
flex: 1;
55
justify-content: center;
6+
min-height: 300px;
67
position: relative;
78
text-align: center;
89
}

src/components/Header/Header.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ const Header = ({ view, searchQuery, canUpload, onSearch, onUpload, logoUrl, get
4141
/>
4242
</div>
4343
</div>
44-
<Button onClick={onUpload} isDisabled={!canUpload || !isFolder}>
45-
{getLocalizedMessage('buik.header.button.upload')}
46-
</Button>
44+
{canUpload &&
45+
<Button onClick={onUpload} isDisabled={!isFolder}>
46+
{getLocalizedMessage('buik.header.button.upload')}
47+
</Button>}
4748
</div>
4849
);
4950
};

0 commit comments

Comments
 (0)