Skip to content

Commit 6109f7b

Browse files
author
vikasrohit
authored
Merge pull request #1148 from appirio-tech/feature/misc-changes
Feature/misc changes
2 parents ed99787 + a9d254d commit 6109f7b

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

src/components/Footer/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const Footer = () => {
2121

2222
return (
2323
<div className="Footer">
24-
<p className="copyright-notice">Created by © Topcoder, All Rights Reserved {currentYear}</p>
24+
<p className="copyright-notice">© Topcoder { currentYear }</p>
2525
<div className="footer-menu">
2626
<MenuBar items={otherNavigationItems} orientation="horizontal" mobileBreakPoint={767} />
2727
</div>

src/projects/create/components/FillProjectDetails.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ import _ from 'lodash'
22
import React, { PropTypes as PT, Component } from 'react'
33
import Sticky from 'react-stickynode'
44

5-
import { Icons } from 'appirio-tech-react-components'
65
import config from '../../../config/projectWizard'
76
import SVGIconImage from '../../../components/SVGIconImage'
87
import './FillProjectDetails.scss'
98
import ProjectBasicDetailsForm from '../components/ProjectBasicDetailsForm'
109
import ProjectOutline from '../components/ProjectOutline'
1110
import typeToSpecification from '../../../config/projectSpecification/typeToSpecification'
1211

13-
const { ConnectLogo } = Icons
14-
1512
class FillProjectDetails extends Component {
1613
constructor(props) {
1714
super(props)
@@ -51,7 +48,7 @@ class FillProjectDetails extends Component {
5148
return (
5249
<div className="FillProjectDetailsWrapper">
5350
<div className="header headerFillProjectDetails">
54-
{ (!userRoles || !userRoles.length) && <ConnectLogo />}
51+
{ (!userRoles || !userRoles.length) && <SVGIconImage filePath="connect-logo-mono" />}
5552
{ (!userRoles || !userRoles.length) && <button className="tc-btn tc-btn-default tc-btn-sm" onClick={ this.props.onChangeProjectType }><SVGIconImage filePath="arrows-undo" />Change project type</button> }
5653
</div>
5754
<div className="FillProjectDetails">

src/projects/create/components/FillProjectDetails.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,21 @@
1515
flex: $number;
1616
}
1717
.headerFillProjectDetails {
18-
margin-top: -28px;
1918
display: flex;
2019
justify-content: space-between;
20+
position: absolute;
21+
top: 25px;
22+
left: 20px;
23+
width: calc(100% - 40px);// 20px for left absolute position, 20px for padding around button in the header
2124
.tc-btn-default img {
2225
margin-right: 10px;
2326
}
2427
}
2528

29+
.FillProjectDetailsWrapper {
30+
margin-top: -20px;// to align top with bottom of the header
31+
}
32+
2633
.FillProjectDetails {
2734

2835
.header {

src/projects/create/components/IncompleteProjectConfirmation.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
display: flex;
88
flex-direction: column;
99
align-items: center;
10-
margin-top: -60px;
10+
margin-top: -60px;// to align top with bottom of the header
1111
padding: 20px;
1212
.header {
1313
position: absolute;
@@ -16,7 +16,8 @@
1616
}
1717
h3 {
1818
@include roboto-light;
19-
margin-bottom: 12 * $base_unit;
19+
margin-top: 8 * $base_unit;
20+
margin-bottom: 12 * $base_unit;
2021
color: $tc-black;
2122
line-height: 40px;
2223
font-size: 36px;

src/projects/create/components/SelectProduct.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import React, { PropTypes as PT } from 'react'
2-
import { Icons } from 'appirio-tech-react-components'
32
import config from '../../../config/projectWizard'
43
import ProductCard from './ProductCard'
54
import SVGIconImage from '../../../components/SVGIconImage'
65
import './SelectProduct.scss'
76

8-
const { ConnectLogo } = Icons
9-
107
function SelectProduct(props) {
118
const cards = []
129
for (const key in config) {
@@ -32,7 +29,7 @@ function SelectProduct(props) {
3229
return (
3330
<div>
3431
<div className="header headerSelectProduct">
35-
<ConnectLogo />
32+
<SVGIconImage filePath="connect-logo-mono" />
3633
</div>
3734
<div className="SelectProduct">
3835
<h1>Select your project type</h1>

src/projects/create/components/SelectProduct.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@import 'tc-includes';
22

33
.headerSelectProduct {
4-
position: absolute;
5-
top: 25px;
6-
left: 20px;
4+
position: absolute;
5+
top: 25px;
6+
left: 20px;
77
}
88

99
.SelectProduct {
@@ -12,6 +12,7 @@
1212
text-align: center;
1313
max-width: 1000px;
1414
margin: 0 auto;
15+
margin-top: -20px;// to align top with bottom of the header
1516
a, a:visited, a:hover, a:active{
1617
color: $tc-dark-blue;
1718
cursor: pointer;

0 commit comments

Comments
 (0)