Skip to content

Commit 60bfef6

Browse files
committed
Update Tabs on Legal, update RootPage styling
1 parent 0302f74 commit 60bfef6

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

client/components/RootPage.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import styled from 'styled-components';
22
import { prop } from '../theme';
33

44
const RootPage = styled.div`
5-
height: 100%;
5+
min-height: 100%;
66
display: flex;
77
flex-direction: column;
88
color: ${prop('primaryTextColor')};
99
background-color: ${prop('backgroundColor')};
10+
height: ${({ fixedHeight }) => fixedHeight || 'initial'};
1011
`;
1112

1213
export default RootPage;

client/modules/IDE/pages/Legal.jsx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ const StyledTabList = styled(TabList)`
1717
border-bottom: 1px solid ${prop('Modal.separator')};
1818
`;
1919

20-
const StyledTab = styled(Tab)`
20+
const TabTitle = styled.p`
21+
padding: 0 ${remSize(5)} ${remSize(5)} ${remSize(5)};
2122
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')};
2427
}
2528
`;
2629

@@ -50,12 +53,12 @@ function Legal({ location }) {
5053
<Nav layout="dashboard" />
5154
<Tabs selectedIndex={selectedIndex} onSelect={onSelect}>
5255
<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>
5962
</StyledTabList>
6063
<TabPanel>
6164
<PrivacyPolicy />

client/modules/User/pages/DashboardView.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class DashboardView extends React.Component {
134134
const actions = this.renderActionButton(currentTab, username, this.props.t);
135135

136136
return (
137-
<RootPage>
137+
<RootPage fixedHeight="100%">
138138
<Nav layout="dashboard" />
139139

140140
<main className="dashboard-header">

client/theme.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export default {
6565
colors,
6666
...common,
6767
primaryTextColor: grays.dark,
68+
inactiveTextColor: grays.middleDark,
6869
backgroundColor: grays.lighter,
6970

7071
Button: {
@@ -146,6 +147,7 @@ export default {
146147
colors,
147148
...common,
148149
primaryTextColor: grays.lightest,
150+
inactiveTextColor: grays.middleLight,
149151
backgroundColor: grays.darker,
150152

151153
Button: {
@@ -227,6 +229,7 @@ export default {
227229
colors,
228230
...common,
229231
primaryTextColor: grays.lightest,
232+
inactiveTextColor: grays.light,
230233
backgroundColor: grays.darker,
231234

232235
Button: {

0 commit comments

Comments
 (0)