Skip to content

Commit

Permalink
Merge pull request #14 from phillipson808/nav-bar
Browse files Browse the repository at this point in the history
Nav bar logo + favicon desmosinc#50
  • Loading branch information
misscoded authored Jun 25, 2019
2 parents 5e3c760 + 2e990ba commit 7a0aecd
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 12 deletions.
Binary file modified public/favicon.ico
100644 → 100755
Binary file not shown.
2 changes: 1 addition & 1 deletion src/components/App.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.calculator {
position: absolute;
top: 40px;
top: 60px;
left: 70px;
right: 0;
bottom: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Burst.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.Burst {
position: absolute;
top: 40px;
top: 60px;
left: 70px;
bottom: 0;
width: 200px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Folder.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.Folder {
position: absolute;
top: 40px;
top: 60px;
left: 70px;
bottom: 0;
width: 378px;
Expand Down
10 changes: 5 additions & 5 deletions src/components/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
top: 0;
left: 0;
right: 0;
height: 40px;
height: 60px;
background: #e79600;
color: #fff;
}

.Header-logo {
font-weight: bold;
margin: 10px 0 0 10px;
width: 100px;
margin: 12px 5px 0 10px;
width: 90px;
}

.Header-help {
margin: 10px 10px 0 0;
font-size: 0.75em;
margin: 20px 20px 0px 5px;
font-size: 0.8em;
font-style: italic;
}
3 changes: 2 additions & 1 deletion src/components/Header.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react';
import './Header.css';
import logo from './icons/gifsmos-logo.svg';

const Header = () => (
<div className="Header">
<div className="Header-logo" data-testid="Header-logo">
GIFsmos
<img src={logo} alt="GIFsmos logo" />
</div>
<div className="Header-help" data-testid="Header-help">
Paste a Desmos link into the expressions list to import a saved graph.
Expand Down
2 changes: 1 addition & 1 deletion src/components/Preview.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.Preview {
position: absolute;
top: 40px;
top: 60px;
left: 70px;
right: 0;
bottom: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Settings.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.Settings {
position: absolute;
top: 40px;
top: 60px;
left: 70px;
bottom: 0;
width: 200px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Sidebar.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.Sidebar {
position: absolute;
top: 40px;
top: 60px;
left: 0;
bottom: 0;
width: 70px;
Expand Down
1 change: 1 addition & 0 deletions src/components/icons/gifsmos-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7a0aecd

Please sign in to comment.