r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

fix merge conflicts

This commit is contained in:
Cassie Tarakajian 2019-09-25 12:14:52 -04:00
parent 0f3ce8e3a2 52e98723f5
commit e2f8fe7e81
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/modules/User/pages/AccountView.jsx
View File

@ -40,7 +40,7 @@ class AccountView extends React.Component {
<TabList> <TabList>
<div className="tabs__titles"> <div className="tabs__titles">
<Tab><h4 className="tabs__title">Account</h4></Tab> <Tab><h4 className="tabs__title">Account</h4></Tab>
<Tab><h4 className="tabs__title">Access Tokens</h4></Tab> {accessTokensUIEnabled && <Tab><h4 className="tabs__title">Access Tokens</h4></Tab>}
</div> </div>
</TabList> </TabList>
<TabPanel> <TabPanel>

4
client/styles/components/_dashboard-header.scss
View File

@ -11,6 +11,10 @@
padding: 0 66px; padding: 0 66px;
} }
.dashboard-header--no-vertical-padding {
padding: 0 66px;
}
.dashboard-header__tabs { .dashboard-header__tabs {
display: flex; display: flex;
padding-top: #{24 / $base-font-size}rem; padding-top: #{24 / $base-font-size}rem;