Merge branch 'header-controller-fix' into 'dev'

header in dashboard: size, logo, fixed

See merge request sa4-2020/the-sanmarinoes/frontend!47
This commit is contained in:
Matteo Omenetti 2020-03-22 23:40:48 +01:00
commit c6c62c51f2
2 changed files with 16 additions and 14 deletions

BIN
smart-hut/public/title7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

View file

@ -2,24 +2,26 @@ import React from "react";
import { Dropdown, Icon, Grid, Divider} from 'semantic-ui-react' import { Dropdown, Icon, Grid, Divider} from 'semantic-ui-react'
import { Segment, Image } from 'semantic-ui-react' import { Segment, Image } from 'semantic-ui-react'
const ImageExampleWrapped = () => ( const AvatarImage = () => (
<Image src='avatar3.png' size='tiny' centered <Image
src='avatar3.png'
style={{width: '25px', height: 'auto'}}
centered
/> />
) )
const ImageExampleWrapped2 = () => ( const IconHomeImage = () => (
<Image <Image
src='smart-home.png' src='smart-home.png'
size='tiny' style={{width: '50px', height: 'auto'}}
centered centered
as='a' as='a'
href='/' href='/'
/> />
) )
const ImageExampleWrapped3 = () => ( const TitleImage = () => (
<Image src='title6.png' size='medium' centered/> <Image src='title7.png' size='medium' centered/>
) )
@ -27,18 +29,18 @@ const ImageExampleWrapped3 = () => (
const GridExampleInverted = (props) => ( const GridExampleInverted = (props) => (
<Grid columns='equal' divided inverted padded> <Grid columns='equal' divided inverted padded>
<Grid.Row color='black' textAlign='center' > <Grid.Row color='black' textAlign='center' >
<Grid.Column width={2}> <Grid.Column width={3} height={0.5}>
<Segment color='black' inverted> <Segment color='black' inverted>
<ImageExampleWrapped2 /> <IconHomeImage />
</Segment> </Segment>
</Grid.Column> </Grid.Column>
<Grid.Column> <Grid.Column>
<Segment color='black' inverted> <Segment color='black' inverted>
<ImageExampleWrapped3 /> <TitleImage />
</Segment> </Segment>
</Grid.Column> </Grid.Column>
<Grid.Column width={3}> <Grid.Column width={2} heigth={1}>
<ImageExampleWrapped /> <AvatarImage />
<Divider /> <Divider />
<Dropdown item icon='setting' size='huge'> <Dropdown item icon='setting' size='huge'>
<Dropdown.Menu> <Dropdown.Menu>