Skip to content

Commit

Permalink
Logo enhancement and new iconi (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesv committed Sep 12, 2019
1 parent ca89839 commit 536c284
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 31 deletions.
Binary file removed public/favicon.ico
Binary file not shown.
Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="theme-color" content="#cfd0d1" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand Down
10 changes: 5 additions & 5 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "Pardal",
"name": "Pardal: Painless Planning Sessions",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
"type": "image/png"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"theme_color": "#cfd0d1",
"background_color": "#ffffff"
}
}
7 changes: 2 additions & 5 deletions src/components/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import IEntityMap from "../redux/utils/entity-map.interface";
import NotifyDock from "./NotifyDock";
import { setStateClean } from "../redux/actions";
import { importFromStorage, exportToStorage } from "../services/localStorage.service";
import SaveInfo from "./SaveInfo";
import Header from "./Header";

interface Props {
selectedStory: number,
Expand Down Expand Up @@ -103,10 +103,7 @@ class Dashboard extends React.Component<Props> {
<div className="app">
<div className="dashboard">
<aside>
<header>
<div className="app-title"> >=pardal<span>v{appVersion}</span></div>
</header>

<Header appVersion={appVersion} />
<StoryList importStory={this.importStory} />
</aside>

Expand Down
20 changes: 20 additions & 0 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react";

const Header = (props: any) => {
const { appVersion } = props;

return (
<header className="header">
<div className="app-logo">
<span className="app-logo__icon"> >=</span>
<span className="app-logo__name">Pardal</span>

<span className="app-logo__version">
<a href="https://github.com/gilesv/pardal" target="_blank">v{appVersion}</a>
</span>
</div>
</header>
);
}

export default Header;
20 changes: 1 addition & 19 deletions src/styles/components/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,4 @@
padding: 0 20px 20px 20px;
width: 100%;
}

header {
margin-bottom: 20px;

.app-title {
font-size: 26px;
margin: 0;
color: $primary;
font-family: FiraCode;

span {
font-size: 10px;
color: $lightpurple;
vertical-align: super;
margin-left: 2px;
}
}
}
}
}
28 changes: 28 additions & 0 deletions src/styles/components/header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
header.header {
margin-bottom: 20px;

.app-logo {
font-size: 26px;
margin: 0;
font-family: FiraCode;

&__icon {
color: $primary;
font-weight: bold;
}

&__name {
margin-left: 6px;
}

&__version {
font-size: 11px;
vertical-align: super;
margin-left: 4px;
}

a, a:hover {
color: $lesslightergray;
}
}
}
2 changes: 2 additions & 0 deletions src/styles/root.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ html, body {
$primary: #6600ff;

$lightgray: #cfd0d1;
$lesslightergray: #bbbdbd;
$lightpurple: #d8c1fb;
$darkpurple: #5107bf;

Expand All @@ -20,6 +21,7 @@ $darkpurple: #5107bf;
@import "./components/task-item";
@import "./components/task-form";
@import "./components/save-info";
@import "./components/header";

// Fonts
@font-face {
Expand Down

0 comments on commit 536c284

Please sign in to comment.