Skip to content
This repository has been archived by the owner on Mar 16, 2021. It is now read-only.

Logo #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Logo #58

Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions web/src/app/containers/Base.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { PropTypes } from 'react'
import { graphql, compose } from 'react-apollo'
import { Route, Link, Switch } from 'react-router-dom'
import { Container, Menu, Dropdown, Message, Form, Input, Button } from 'semantic-ui-react'
import { Container, Menu, Dropdown, Message, Form, Input, Button, Image } from 'semantic-ui-react'

import config from 'config'
import Auth from '../modules/Auth'
Expand All @@ -23,6 +23,8 @@ import EditTension from './EditTension'
import SearchPage from './SearchPage'
import Settings from './Settings'

import sirclesLogo from '../../www/img/sircles.png'

class Base extends React.Component {
getChildContext () {
return {appError: this.props.appError}
Expand Down Expand Up @@ -121,7 +123,9 @@ class Base extends React.Component {
return (
<div>
<Menu inverted>
<Menu.Item as={Link} to='/'>Sircles</Menu.Item>
<Menu.Item as={Link} to='/'>
<Image size='tiny' src={sirclesLogo} />
</Menu.Item>
{viewer && (
<Menu.Item as={Form} onSubmit={this.doSearch}>
<Input icon='search' placeholder='Search...' value={searchString} onChange={this.handleSearchChange} />
Expand Down
Binary file added web/src/www/img/sircles.png
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 web/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = function (env) {
},
{
test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,
loader: 'url-loader',
loader: 'file-loader',
options: {
limit: 10000
},
Expand Down