Skip to content

Commit

Permalink
Merge pull request #736 from OSMCha/update/osmus-logo
Browse files Browse the repository at this point in the history
Add OSM US logo
  • Loading branch information
willemarcel committed Jun 8, 2024
2 parents c0d3152 + 197dd91 commit 94f091d
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

Log of changes since the 2.0 version

### 1.0.0
- Add OSM US logo and update main logo

### 0.88.1
- Loads all tags and reasons to avoid errors

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "osmcha-frontend",
"version": "0.88.1",
"version": "1.0.0",
"license": "ISC",
"engines": {
"node": ">=7.0"
Expand Down
Binary file modified src/assets/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions src/assets/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,15 @@ img {

/*home images*/
.osmcha-logo {
width: 40vw;
width: 35vw;
}

.workflow-img {
width: 35vw;
width: 30vw;
}

.osmus-img {
width: 14vw;
}

#guide > p {
Expand Down
Binary file added src/assets/osmus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 19 additions & 4 deletions src/views/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Link } from 'react-router-dom';
import { appVersion, isDev, isStaging, isLocal } from '../config';
import banner from '../assets/banner.png';
import work_flow from '../assets/work_flow.png';
import osmus from '../assets/osmus.png';

export function Home() {
return (
Expand All @@ -15,7 +16,7 @@ export function Home() {
<img
src={work_flow}
className="pt36 workflow-img"
alt="Validation tool for OpenStreetmap"
alt="Filter, Select, View, Verify"
/>
</div>
<div className="flex-child flex-child--grow">&nbsp;</div>
Expand All @@ -39,7 +40,7 @@ export function Home() {
|{' '}
<a
target="__blank"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
href="https://github.com/osmcha/osmcha-frontend/blob/master/CONTRIBUTING.md"
>
<svg className="icon">
Expand All @@ -50,7 +51,7 @@ export function Home() {
|{' '}
<a
target="__blank"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
href="https://openstreetmap.app.neoncrm.com/forms/osmcha"
>
<svg className="icon">
Expand All @@ -61,7 +62,7 @@ export function Home() {
|{' '}
<a
target="__blank"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
href="https://github.com/osmcha/osmcha-frontend/issues"
>
<svg className="icon">
Expand All @@ -71,6 +72,20 @@ export function Home() {
</a>
</div>
</div>
<div className="flex-parent flex-parent--column align-center txt-l pt12">
<p className="block pt36 pb6 txt-m">Supported by</p>
<a
target="__blank"
className="link link--gray flex-parent flex-parent--row flex-parent--center-cross mx6"
href="https://openstreetmap.us"
>
<img
src={osmus}
className="osmus-img"
alt="An OpenStreetMap US charter project"
/>
</a>
</div>
<div className="flex-child flex-child--grow">&nbsp;</div>
</div>
);
Expand Down

0 comments on commit 94f091d

Please sign in to comment.