Skip to content

Commit

Permalink
✏️ Changed styling to reflect the look changes requested by UVA
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick committed Jan 28, 2018
1 parent 316f074 commit 8e4280f
Show file tree
Hide file tree
Showing 38 changed files with 526 additions and 212 deletions.
177 changes: 109 additions & 68 deletions src/assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/white/arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/addButton/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}

img {
opacity: .6;
opacity: .8;
}
}
3 changes: 1 addition & 2 deletions src/components/editLink/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ export default class EditLink extends Component {
render() {
return (
<Link class={style.edit} href={this.props.to}>
Edit {this.props.type} <i class="material-icons">mode_edit</i>
Edit <i class="material-icons">mode_edit</i>
</Link>
);
}
}

EditLink.propTypes = {
type: PropTypes.string.isRequired,
to: PropTypes.string.isRequired,
};
8 changes: 7 additions & 1 deletion src/components/editLink/style.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
.edit {
align-items: center;
color: var(--main-color);
background: var(--main-color);
border: 0;
color: var(--main-bg-color);
display: flex;
float: right;
font-size: 12px;
font-weight: 700;
margin: 0 0 10px 5px;
padding: 2.5px 2px 2.5px 7px;
text-align: right;
text-decoration: none;
text-transform: uppercase;

i {
font-size: .98em;
Expand Down
2 changes: 1 addition & 1 deletion src/components/footer/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
}

.active {
color: var(--main-blue);
color: var(--main-purple);
}
}
85 changes: 73 additions & 12 deletions src/components/formItem/style.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,91 @@
.customFormfieldWrap {
border-bottom: .5px solid var(--main-color);
border-top: .5px solid var(--main-color);
background: var(--main-light-color);
// border-bottom: .5px solid var(--main-color);
// border-top: .5px solid var(--main-color);
border: 0;
display: flex;
flex-direction: column;
margin: 10px 0;
padding: 14px 16px;

label {
color: var(--main-color);
color: var(--main-blue);
font-size: 16px;
font-weight: 700;
margin: 5px 0 4px;
}
}

.select {
background: var(--input-color);
border: 1px solid var(--main-color);
border-radius: 0;
font-size: 15px;
margin-bottom: 5px;
padding: 10px 5px;
select {
background: var(--input-color);
// border: 1px solid var(--main-color);
border: 0;
border-radius: 0;
display: inline-block;
font-size: 15px;
line-height: 1.5em;
padding: 0.5em 3.5em 0.5em 1em;
margin-top: 5px;
margin-bottom: 5px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-appearance: none;
-moz-appearance: none;
}

.select {
background-image:
linear-gradient(45deg, transparent 50%, var(--main-color) 50%),
linear-gradient(135deg, var(--main-color) 50%, transparent 50%),
linear-gradient(to right, var(--main-color), var(--main-color));
background-position:
calc(100% - 20px) calc(1em + 2px),
calc(100% - 15px) calc(1em + 2px),
calc(100% - 2.5em) 0.5em;
background-size:
5px 5px,
5px 5px,
1px 1.5em;
background-repeat: no-repeat;
}

.select:focus {
background-image:
linear-gradient(45deg, var(--main-color) 50%, transparent 50%),
linear-gradient(135deg, transparent 50%, var(--main-color) 50%),
linear-gradient(to right, var(--main-color), var(--main-color));
background-position:
calc(100% - 15px) 1em,
calc(100% - 20px) 1em,
calc(100% - 2.5em) 0.5em;
background-size:
5px 5px,
5px 5px,
1px 1.5em;
background-repeat: no-repeat;
border-color: var(--main-color);
outline: 0;
}

select:-moz-focusring {
color: transparent;
text-shadow: 0 0 0 var(--main-color);
}
}

// .select {
// background: var(--input-color);
// // border: 1px solid var(--main-color);
// border: 0;
// border-radius: 0;
// font-size: 15px;
// margin-bottom: 5px;
// padding: 10px 5px;
// }

.addedInputField {
border: 1px solid var(--main-color);
// border: 1px solid var(--main-color);
border: 0;
border-radius: 0;
font-size: 15px;
margin-top: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Link } from 'preact-router/match';
import { PropTypes } from 'preact-compat';
import style from './style';

import arrow from '../../assets/black/arrow.svg';
import arrow from '../../assets/white/arrow.svg';

export default class Header extends Component {
render() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/item/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Link } from 'preact-router/match';
import style from './style';

// Import images
import mediaIcon from '../../assets/black/media.png';
import mediaIcon from '../../assets/black/media.svg';
import measurementIcon from '../../assets/black/measurements.svg';

function defineImgSrc(details) {
Expand Down
11 changes: 7 additions & 4 deletions src/components/item/style.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.itemLinkWrap {
align-items: center;
background-color: var(--main-bg-color);
border: .5px solid var(--main-color);
background-color: var(--main-light-color);
border: 0;
display: flex;
height: 50px;
margin: 2.5px 0;
Expand All @@ -12,12 +12,13 @@
.icon {
display: inline-block;
opacity: .6;
padding: 0 15px 0 10px;
padding: 0 25px 0 10px;
}

.date {
display: inline-block;
font-size: 13px;
font-weight: 700;
width: 30%;
}

Expand All @@ -38,10 +39,12 @@
}

.uploadStatText {
color: var(--main-blue);
font-size: 13px;
}

.uploadStat {
font-size: 13px;
color: var(--main-blue);
font-size: 15px;
padding: 0 7.5px;
}
15 changes: 15 additions & 0 deletions src/components/license/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component } from 'preact';
import style from './style';

export default class LicenseInfo extends Component {
render() {
return (
<div class={style.licenseWrapper}>
<p class={style.license}>
The code of this project is licensed under the terms of the GNU AGPLv3 license.
<a href="https://github.com/webgem-xyz/UVA-React#license-information">More info.</a>
</p>
</div>
);
}
}
18 changes: 18 additions & 0 deletions src/components/license/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.licenseWrapper {
background: var(--input-color);
bottom: 0;
display: block;
left: 0;
position: absolute;
}

.license {
font-size: 13px;
text-align: center;

a {
color: var(--main-blue);
font-size: 13px;
text-decoration: none;
}
}
8 changes: 4 additions & 4 deletions src/components/linkRequestButton/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
justify-content: flex-end;
}
.linkRequest {
background: none;
border: 1px solid var(--main-color);
background: var(--main-color);
border: 0;
border-radius: 0;
color: var(--main-color);
font-size: 16px;
color: var(--main-bg-color);
font-size: 14px;
font-weight: 700;
margin: 15px 0;
outline: 0;
Expand Down
10 changes: 5 additions & 5 deletions src/components/locationPopup/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
justify-content: space-between;

input {
background: none;
background: var(--main-color);
border: 0;
border-radius: 0;
color: var(--main-color);
font-size: 15px;
color: var(--main-light-color);
font-size: 12px;
font-weight: 700;
margin: 0;
margin: 10px 0 0;
outline: 0;
padding: 15px 0 5px;
padding: 7px;
text-transform: uppercase;
}
}
2 changes: 1 addition & 1 deletion src/components/map/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class MapComponent extends Component {
<div class={style.map}>
<Gmaps
width="100%"
height="150px"
height="125px"
zoom={4}
lat={Number(latitude)}
lng={Number(longitude)}
Expand Down
13 changes: 10 additions & 3 deletions src/components/map/style.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
.location {
border: 1px solid var(--main-color);
// border: 1px solid var(--main-color);
border: 0;
padding: 10px;

p {
color: var(--main-color);
font-weight: 700;
}
}

.map {
border: 1px solid var(--main-color);
// border: 1px solid var(--main-color);
border: 0;
margin-bottom: 5px;
}

.label {
color: var(--main-color);
color: var(--main-blue);
font-size: 16px;
font-weight: 700;
margin: 0 0 5px;
Expand Down
5 changes: 3 additions & 2 deletions src/components/measurementRow/style.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.row {
align-items: baseline;
background: var(--main-bg-color);
border: 1px solid var(--main-color);
// border: 1px solid var(--main-color);
border: 0;
display: flex;
flex: 1;
flex-direction: row;
Expand All @@ -18,7 +19,7 @@
}

.label {
color: var(--main-color);
color: var(--main-blue);
font-size: 16px;
font-weight: 700;
}
Expand Down
6 changes: 5 additions & 1 deletion src/components/notification/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.notificationWrapper {
align-items: center;
border: 1px solid var(--main-color);
background: var(--main-light-color);
// border: 1px solid var(--main-color);
border: 0;
color: var(--main-color);
display: flex;
justify-content: space-between;
Expand All @@ -9,13 +11,15 @@
text-decoration: none;

p {
color: var(--main-blue);
display: inline-block;
font-size: 14px;
font-weight: 700;
margin: 0;
}

p:nth-child(2) {
color: var(--main-color);
font-weight: 400;
white-space: nowrap;
}
Expand Down
3 changes: 2 additions & 1 deletion src/components/removeMeasurementButton/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export default class RemoveMeasurementButton extends Component {
}}
class={style.removeButton}
>
Delete {this.props.label}
Delete
<i class="material-icons">delete</i>
</button>
);
}
Expand Down
Loading

0 comments on commit 8e4280f

Please sign in to comment.