File tree Expand file tree Collapse file tree 4 files changed +18
-11
lines changed Expand file tree Collapse file tree 4 files changed +18
-11
lines changed Original file line number Diff line number Diff line change @@ -2,11 +2,12 @@ import styled from 'styled-components';
2
2
import { prop } from '../theme' ;
3
3
4
4
const RootPage = styled . div `
5
- height: 100%;
5
+ min- height: 100%;
6
6
display: flex;
7
7
flex-direction: column;
8
8
color: ${ prop ( 'primaryTextColor' ) } ;
9
9
background-color: ${ prop ( 'backgroundColor' ) } ;
10
+ height: ${ ( { fixedHeight } ) => fixedHeight || 'initial' } ;
10
11
` ;
11
12
12
13
export default RootPage ;
Original file line number Diff line number Diff line change @@ -17,10 +17,13 @@ const StyledTabList = styled(TabList)`
17
17
border-bottom: 1px solid ${ prop ( 'Modal.separator' ) } ;
18
18
` ;
19
19
20
- const StyledTab = styled ( Tab ) `
20
+ const TabTitle = styled . p `
21
+ padding: 0 ${ remSize ( 5 ) } ${ remSize ( 5 ) } ${ remSize ( 5 ) } ;
21
22
cursor: pointer;
22
- & p {
23
- padding: 0 ${ remSize ( 5 ) } ${ remSize ( 5 ) } ${ remSize ( 5 ) } ;
23
+ color: ${ prop ( 'inactiveTextColor' ) } ;
24
+ &:hover,
25
+ &:focus {
26
+ color: ${ prop ( 'primaryTextColor' ) } ;
24
27
}
25
28
` ;
26
29
@@ -50,12 +53,12 @@ function Legal({ location }) {
50
53
< Nav layout = "dashboard" />
51
54
< Tabs selectedIndex = { selectedIndex } onSelect = { onSelect } >
52
55
< StyledTabList >
53
- < StyledTab className = "react-tabs__tab" >
54
- < p > Privacy Policy</ p >
55
- </ StyledTab >
56
- < StyledTab className = "react-tabs__tab" >
57
- < p > Terms of Use</ p >
58
- </ StyledTab >
56
+ < Tab >
57
+ < TabTitle > Privacy Policy</ TabTitle >
58
+ </ Tab >
59
+ < Tab >
60
+ < TabTitle > Terms of Use</ TabTitle >
61
+ </ Tab >
59
62
</ StyledTabList >
60
63
< TabPanel >
61
64
< PrivacyPolicy />
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ class DashboardView extends React.Component {
134
134
const actions = this . renderActionButton ( currentTab , username , this . props . t ) ;
135
135
136
136
return (
137
- < RootPage >
137
+ < RootPage fixedHeight = "100%" >
138
138
< Nav layout = "dashboard" />
139
139
140
140
< main className = "dashboard-header" >
Original file line number Diff line number Diff line change @@ -65,6 +65,7 @@ export default {
65
65
colors,
66
66
...common ,
67
67
primaryTextColor : grays . dark ,
68
+ inactiveTextColor : grays . middleDark ,
68
69
backgroundColor : grays . lighter ,
69
70
70
71
Button : {
@@ -146,6 +147,7 @@ export default {
146
147
colors,
147
148
...common ,
148
149
primaryTextColor : grays . lightest ,
150
+ inactiveTextColor : grays . middleLight ,
149
151
backgroundColor : grays . darker ,
150
152
151
153
Button : {
@@ -227,6 +229,7 @@ export default {
227
229
colors,
228
230
...common ,
229
231
primaryTextColor : grays . lightest ,
232
+ inactiveTextColor : grays . light ,
230
233
backgroundColor : grays . darker ,
231
234
232
235
Button : {
You can’t perform that action at this time.
0 commit comments