Skip to content

Feature/misc changes #1148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 2 commits into from
Aug 28, 2017
Merged

Feature/misc changes #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06e2331
Github issue#1134, Update copyright year on spec footer
Aug 28, 2017
a9d254d
Github issue#1143, Update logos to be monochrome (consistent with oth…
Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const Footer = () => {

return (
<div className="Footer">
<p className="copyright-notice">Created by © Topcoder, All Rights Reserved {currentYear}</p>
<p className="copyright-notice">© Topcoder { currentYear }</p>
<div className="footer-menu">
<MenuBar items={otherNavigationItems} orientation="horizontal" mobileBreakPoint={767} />
</div>
Expand Down
5 changes: 1 addition & 4 deletions src/projects/create/components/FillProjectDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ import _ from 'lodash'
import React, { PropTypes as PT, Component } from 'react'
import Sticky from 'react-stickynode'

import { Icons } from 'appirio-tech-react-components'
import config from '../../../config/projectWizard'
import SVGIconImage from '../../../components/SVGIconImage'
import './FillProjectDetails.scss'
import ProjectBasicDetailsForm from '../components/ProjectBasicDetailsForm'
import ProjectOutline from '../components/ProjectOutline'
import typeToSpecification from '../../../config/projectSpecification/typeToSpecification'

const { ConnectLogo } = Icons

class FillProjectDetails extends Component {
constructor(props) {
super(props)
Expand Down Expand Up @@ -51,7 +48,7 @@ class FillProjectDetails extends Component {
return (
<div className="FillProjectDetailsWrapper">
<div className="header headerFillProjectDetails">
{ (!userRoles || !userRoles.length) && <ConnectLogo />}
{ (!userRoles || !userRoles.length) && <SVGIconImage filePath="connect-logo-mono" />}
{ (!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> }
</div>
<div className="FillProjectDetails">
Expand Down
9 changes: 8 additions & 1 deletion src/projects/create/components/FillProjectDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@
flex: $number;
}
.headerFillProjectDetails {
margin-top: -28px;
display: flex;
justify-content: space-between;
position: absolute;
top: 25px;
left: 20px;
width: calc(100% - 40px);// 20px for left absolute position, 20px for padding around button in the header
.tc-btn-default img {
margin-right: 10px;
}
}

.FillProjectDetailsWrapper {
margin-top: -20px;// to align top with bottom of the header
}

.FillProjectDetails {

.header {
Expand Down
5 changes: 3 additions & 2 deletions src/projects/create/components/IncompleteProjectConfirmation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
display: flex;
flex-direction: column;
align-items: center;
margin-top: -60px;
margin-top: -60px;// to align top with bottom of the header
padding: 20px;
.header {
position: absolute;
Expand All @@ -16,7 +16,8 @@
}
h3 {
@include roboto-light;
margin-bottom: 12 * $base_unit;
margin-top: 8 * $base_unit;
margin-bottom: 12 * $base_unit;
color: $tc-black;
line-height: 40px;
font-size: 36px;
Expand Down
5 changes: 1 addition & 4 deletions src/projects/create/components/SelectProduct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import React, { PropTypes as PT } from 'react'
import { Icons } from 'appirio-tech-react-components'
import config from '../../../config/projectWizard'
import ProductCard from './ProductCard'
import SVGIconImage from '../../../components/SVGIconImage'
import './SelectProduct.scss'

const { ConnectLogo } = Icons

function SelectProduct(props) {
const cards = []
for (const key in config) {
Expand All @@ -32,7 +29,7 @@ function SelectProduct(props) {
return (
<div>
<div className="header headerSelectProduct">
<ConnectLogo />
<SVGIconImage filePath="connect-logo-mono" />
</div>
<div className="SelectProduct">
<h1>Select your project type</h1>
Expand Down
7 changes: 4 additions & 3 deletions src/projects/create/components/SelectProduct.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import 'tc-includes';

.headerSelectProduct {
position: absolute;
top: 25px;
left: 20px;
position: absolute;
top: 25px;
left: 20px;
}

.SelectProduct {
Expand All @@ -12,6 +12,7 @@
text-align: center;
max-width: 1000px;
margin: 0 auto;
margin-top: -20px;// to align top with bottom of the header
a, a:visited, a:hover, a:active{
color: $tc-dark-blue;
cursor: pointer;
Expand Down