Skip to content

Commit

Permalink
Merge branch 'master' into styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Berihugebre authored Feb 11, 2020
2 parents a821b3c + 8f2a08f commit 1088d31
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/Components/Header/Menu.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { Navbar, Nav } from 'react-bootstrap';
import { withLocalize, Translate } from 'react-localize-redux';
import {Navbar, Nav} from 'react-bootstrap';
import {withLocalize, Translate} from 'react-localize-redux';
import globalTranslations from '../languages/data/language.json';
import { renderToStaticMarkup } from 'react-dom/server';
import { renderToStaticMarkup } from "react-dom/server";
import LanguageToggle from '../languages/LanguageToggle';

class Menu extends React.Component {
Expand All @@ -26,7 +26,8 @@ class Menu extends React.Component {
<Navbar collapseOnSelect expand="lg" bg="dark" variant="dark">
<Navbar.Brand href="/">
<img src="Alternative-1.png" alt="logo" style={{ height: '2rem' }} />
{/* <Translate id="menu.title">Bivouac Zone</Translate> */}
<Translate id="menu.title">Bivouac Zone</Translate>

</Navbar.Brand>
<Navbar.Toggle aria-controls="responsive-navbar-nav" />
<Navbar.Collapse id="responsive-navbar-nav">
Expand Down

0 comments on commit 1088d31

Please sign in to comment.