Skip to content
This repository was archived by the owner on Jun 6, 2019. It is now read-only.

Commit b92e9c4

Browse files
committed
prevent scrollbar in the extension container
- fix brave/brave-browser#222
1 parent 266ceff commit b92e9c4

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

app/components/braveShields/braveShieldsHeader.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import * as React from 'react'
66
import { Grid, Column } from 'brave-ui/gridSystem'
7-
import Separator from 'brave-ui/separator'
87
import SwitchButton from 'brave-ui/switchButton'
98
import UnstyledButton from 'brave-ui/unstyledButton'
109
import TextLabel from 'brave-ui/textLabel'
@@ -65,7 +64,7 @@ export default class BraveShieldsHeader extends React.PureComponent<BraveShields
6564
/>
6665
</Column>
6766
<Column>
68-
<Separator />
67+
<hr style={theme.separator} />
6968
</Column>
7069
<Column theme={theme.hostnameContent}>
7170
<TextLabel text={getMessage('shieldsHeaderForSite')} />

app/components/noScript/noScript.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import * as React from 'react'
66
import PushButton from 'brave-ui/pushButton'
77
import TextLabel from 'brave-ui/textLabel'
88
import { Column, Grid } from 'brave-ui/gridSystem'
9-
import Separator from 'brave-ui/separator'
109
import SwitchButton from 'brave-ui/switchButton'
1110
import { getMessage } from '../../background/api/localeAPI'
1211
import { NoScriptInfo } from '../../types/other/noScriptInfo'
@@ -52,7 +51,7 @@ export default class NoScript extends React.PureComponent<NoScriptProps, {}> {
5251
?
5352
(
5453
<div>
55-
<Separator />
54+
<hr style={theme.separator} />
5655
<Grid id='noScript' theme={theme.noScript}>
5756
<Column>
5857
<TextLabel text={getMessage('noScriptSwitches')} />

app/theme.ts

+17-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
const theme = {
66
braveShieldsHeader: {
77
backgroundColor: '#808080',
8-
padding: '10px',
8+
padding: '8px',
99
gridGap: '0',
1010
color: '#fafafa'
1111
},
@@ -30,19 +30,19 @@ const theme = {
3030
},
3131
braveShieldsControls: {
3232
backgroundColor: '#eee',
33-
padding: '10px 10px 0',
34-
gridGap: '10px 5px'
33+
padding: '8px 8px 0',
34+
gridGap: '8px 5px'
3535
},
3636
braveShieldsControlsContent: {
3737
margin: '0 5px'
3838
},
3939
braveShieldsControlsSwitches: {
40-
gridGap: '10px 5px',
40+
gridGap: '8px 5px',
4141
padding: '5px 0'
4242
},
4343
braveShieldsFooter: {
44-
gridGap: '10px',
45-
padding: '0 10px 10px',
44+
gridGap: '8px',
45+
padding: '0 8px 8px',
4646
backgroundColor: '#eee'
4747
},
4848
columnStart: {
@@ -56,7 +56,7 @@ const theme = {
5656
userSelect: 'none'
5757
},
5858
braveShieldsStats: {
59-
padding: '10px 15px',
59+
padding: '8px 15px',
6060
gridGap: '10px',
6161
backgroundColor: '#f7f7f7'
6262
},
@@ -108,8 +108,8 @@ const theme = {
108108
cursor: 'pointer'
109109
},
110110
noScript: {
111-
padding: '10px 0',
112-
gridGap: '10px 5px'
111+
padding: '8px 0',
112+
gridGap: '8px 5px'
113113
},
114114
blockedResourcesStats: {
115115
flexDirection: 'column',
@@ -122,6 +122,14 @@ const theme = {
122122
},
123123
noUserSelect: {
124124
userSelect: 'none'
125+
},
126+
separator: {
127+
background: '#ccc',
128+
border: '0px',
129+
height: '1px',
130+
width: '100%',
131+
marginTop: '8px',
132+
marginBottom: '8px'
125133
}
126134
}
127135

0 commit comments

Comments
 (0)