Skip to content

Add Robot fonts from googleapis #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guilhermefos wants to merge 3 commits into
base: master
Choose a base branch
from
+62 −59
Open

Add Robot fonts from googleapis #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c810a4e
Add Robot fonts from googleapis
guilhermefos Apr 28, 2018
1c1fc5a
Add style to body
guilhermefos Apr 28, 2018
c1b11f6
Add grid system
guilhermefos Apr 28, 2018
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
115 changes: 56 additions & 59 deletions app/views/Session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { compose } from 'redux';
import { connect } from 'react-redux';
import { withStyles } from 'material-ui/styles';
import TextField from 'material-ui/TextField';
import Button from 'material-ui/Button';
import Paper from 'material-ui/Paper';
import { withStyles, TextField, Button, Paper, Grid } from 'material-ui';
import grey from 'material-ui/colors/grey';

import CustomAppBar from '../components/CustomAppBar';
Expand All @@ -26,7 +23,7 @@ const styles = theme => ({
paper: {
backgroundColor: grey[100],
padding: theme.spacing.unit * 2,
height: '100%'
height: '100vh'
},
bootstrapRoot: {
padding: 0,
Expand All @@ -40,7 +37,6 @@ const styles = theme => ({
border: '1px solid #ced4da',
fontSize: 16,
padding: '10px 12px',
width: '500px',
transition: theme.transitions.create(['border-color', 'box-shadow']),
'&:focus': {
borderColor: '#80bdff',
Expand All @@ -50,9 +46,6 @@ const styles = theme => ({
bootstrapFormLabel: {
fontSize: 18,
},
button: {
width: '100%'
}
});

function Session({ match, classes, sessions, save_session }) {
Expand All @@ -66,58 +59,62 @@ function Session({ match, classes, sessions, save_session }) {
};

return (
<div className={classes.root}>
<div>
<CustomAppBar />
<Paper className={classes.paper}>
<div className={classes.container}>
<TextField
// fullWidth={true}
// disabled={true}
label="Código"
defaultValue={session._id}
id="bootstrap-input"
InputProps={{
disableUnderline: true,
classes: {
root: classes.bootstrapRoot,
input: classes.bootstrapInput,
},
}}
InputLabelProps={{
shrink: true,
className: classes.bootstrapFormLabel,
}}
/>
<TextField
// fullWidth={true}
label="Hello"
id="bootstrap-input"
defaultValue={session.hello}
InputProps={{
disableUnderline: true,
classes: {
root: classes.bootstrapRoot,
input: classes.bootstrapInput,
},
}}
InputLabelProps={{
shrink: true,
className: classes.bootstrapFormLabel,
}}
/>
</div>
<div className={classes.container}>
<Button
variant="raised"
color="secondary"
// fullWidth={true}
className={classes.button}
style={pStyle}
onClick={() => buttonClickHandler(session)}
>
Salvar
</Button>
</div>
<Grid container spacing={8}>
<Grid item xs={12} lg={6}>
<TextField
fullWidth={true}
// disabled={true}
label="Código"
defaultValue={session._id}
id="bootstrap-input"
InputProps={{
disableUnderline: true,
classes: {
root: classes.bootstrapRoot,
input: classes.bootstrapInput,
},
}}
InputLabelProps={{
shrink: true,
className: classes.bootstrapFormLabel,
}}
/>
</Grid>
<Grid item xs={12} lg={6}>
<TextField
fullWidth={true}
label="Hello"
id="bootstrap-input"
defaultValue={session.hello}
InputProps={{
disableUnderline: true,
classes: {
root: classes.bootstrapRoot,
input: classes.bootstrapInput,
},
}}
InputLabelProps={{
shrink: true,
className: classes.bootstrapFormLabel,
}}
/>
</Grid>
<Grid item xs={12} lg={12}>
<Button
variant="raised"
color="secondary"
fullWidth={true}
className={classes.button}
style={pStyle}
onClick={() => buttonClickHandler(session)}
>
Salvar
</Button>
</Grid>
</Grid>
</Paper>
</div>
);
Expand Down
6 changes: 6 additions & 0 deletions build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<!DOCTYPE html>
<html lang="en">
<head>
<style>
body {
margin: 0;
}
</style>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Salesforce</title>
<link href="./styles/style.css" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
</head>
<body>
<div id="root"></div>
Expand Down