Skip to content

Commit 448236a

Browse files
committed
Additional uni-nav tweaks from QA
#4590 #4591 #4592 #4593
1 parent b597a81 commit 448236a

File tree

6 files changed

+28
-17
lines changed

6 files changed

+28
-17
lines changed

src/components/Footer/Footer.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* global tcUniNav */
22
import React, { Component } from 'react'
33

4+
import './styles.scss'
5+
46
let uniqueId = 0
57

68
class Footer extends Component {
@@ -22,7 +24,7 @@ class Footer extends Component {
2224
}
2325

2426
render() {
25-
return <div id={`footerNav-${this.footerIdRef}`} />
27+
return <div styleName="footer-conatiner" id={`footerNav-${this.footerIdRef}`} />
2628
}
2729
}
2830

src/components/Footer/styles.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@import '~tc-ui/src/styles/tc-includes';
2+
3+
.footer-conatiner {
4+
display: flex;
5+
width: 100%;
6+
7+
footer {
8+
width: 100%;
9+
}
10+
}

src/components/TopBar/ProjectToolBar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
justify-content: space-between;
1818
width: 100%;
1919
height: 60px;
20-
background-color: $tc-black;
20+
background: $tc-gray-05;
2121
padding: 0 20px;
2222

2323
@media screen and (max-width: $screen-md - 1px) {
@@ -55,7 +55,7 @@
5555

5656
span {
5757
@include tc-heading-small;
58-
color: $tc-gray-10;
58+
color: $tc-black;
5959
display: block;
6060
text-overflow: ellipsis;
6161
overflow: hidden;

src/components/TopBar/ProjectsToolBar.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,17 @@ class ProjectsToolBar extends Component {
160160
{isLoggedIn ? (<div className="primary-toolbar">
161161
{ !hasPermission(PERMISSIONS.SEARCH_PROJECTS) && <div className="projects-title-mobile">MY PROJECTS</div> }
162162
{
163-
hasPermission(PERMISSIONS.SEARCH_PROJECTS) &&
164-
<div className="search-widget">
165-
<SearchBar
166-
hideSuggestionsWhenEmpty
167-
showPopularSearchHeader={ false }
168-
searchTermKey="keyword"
169-
onTermChange={ this.handleTermChange }
170-
onSearch={ this.handleSearch }
171-
onClearSearch={ this.handleSearch }
172-
/>
173-
</div>
163+
hasPermission(PERMISSIONS.SEARCH_PROJECTS) ?
164+
(<div className="search-widget">
165+
<SearchBar
166+
hideSuggestionsWhenEmpty
167+
showPopularSearchHeader={ false }
168+
searchTermKey="keyword"
169+
onTermChange={ this.handleTermChange }
170+
onSearch={ this.handleSearch }
171+
onClearSearch={ this.handleSearch }
172+
/>
173+
</div>) : (<div />)
174174
}
175175
<div className="actions">
176176
<NewProjectNavLink link={getNewProjectLink(orgConfig)} />

src/components/TopBar/SectionToolBar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
:global {
55
.tc-header.tc-header__connect .top-bar{
6-
background-color: $tc-gray-100;
6+
background: $tc-gray-05;
77
position: relative;
88
display: flex;
99

@@ -31,7 +31,7 @@
3131
.title {
3232
@include roboto;
3333
font-size: 20px;
34-
color: $tc-gray-10;
34+
color: $tc-black;
3535
text-align: center;
3636
}
3737

src/projects/create/containers/CreateContainer.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
:global {
55
.WizardCreateProject {
6-
margin-top: -60px; // Counteract the push from the main wrapper, top of vewport
76
align-content: flex-start;
87

98
@include mobile-tablet {

0 commit comments

Comments
 (0)