Skip to content
Snippets Groups Projects
Commit 30021ddb authored by Richard Fernando Heise Ferreira's avatar Richard Fernando Heise Ferreira
Browse files

Merge branch 'issue/32-Icon' into 'development'

Issue #32: Changed Icon and name in browser

See merge request !57
parents cff90df1 6ab72cb5
No related branches found
No related tags found
2 merge requests!58Version 1.1,!57Issue #32: Changed Icon and name in browser
public/favicon.ico

3.78 KiB | W: | H:

public/favicon.ico

3.43 KiB | W: | H:

public/favicon.ico
public/favicon.ico
public/favicon.ico
public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8" /> <head>
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="theme-color" content="#000000" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta <meta name="theme-color" content="#000000" />
name="description" <meta name="description" content="Web site created using create-react-app" />
content="Web site created using create-react-app" <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
/> <!--
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build. It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML. Only files inside the `public` folder can be referenced from the HTML.
...@@ -24,12 +22,13 @@ ...@@ -24,12 +22,13 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>Gerador de Formulários</title>
</head> </head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript> <body>
<div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript>
<!-- <div id="root"></div>
<!--
This HTML file is a template. This HTML file is a template.
If you open it directly in the browser, you will see an empty page. If you open it directly in the browser, you will see an empty page.
...@@ -39,5 +38,6 @@ ...@@ -39,5 +38,6 @@
To begin the development, run `npm start` or `yarn start`. To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`. To create a production bundle, use `npm run build` or `yarn build`.
--> -->
</body> </body>
</html>
</html>
\ No newline at end of file
public/logo192.png

5.22 KiB

public/logo512.png

9.44 KiB

{ {
"short_name": "React App", "short_name": "Gerador de formulários",
"name": "Create React App Sample", "name": "Gerador de formulários",
"icons": [ "icons": [
{ {
"src": "favicon.ico", "src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16", "sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon" "type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
} }
], ],
"start_url": ".", "start_url": ".",
"display": "standalone", "display": "standalone",
"theme_color": "#000000", "theme_color": "#000000",
"background_color": "#ffffff" "background_color": "#ffffff"
} }
\ No newline at end of file
...@@ -7,6 +7,7 @@ import InputAdornment from "@material-ui/core/InputAdornment"; ...@@ -7,6 +7,7 @@ import InputAdornment from "@material-ui/core/InputAdornment";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
container: { container: {
width: "254px",
height: "50px", height: "50px",
marginTop: "15px", marginTop: "15px",
marginBottom: "15px", marginBottom: "15px",
......
...@@ -55,6 +55,7 @@ const useStyles = makeStyles(theme => ({ ...@@ -55,6 +55,7 @@ const useStyles = makeStyles(theme => ({
}, },
gridMenu: { gridMenu: {
width: "254px",
display: "flex", display: "flex",
alignItems: "center", alignItems: "center",
marginLeft: "20px" marginLeft: "20px"
...@@ -94,7 +95,7 @@ function Tab(props) { ...@@ -94,7 +95,7 @@ function Tab(props) {
inputProps={{ "aria-label": "Without label" }} inputProps={{ "aria-label": "Without label" }}
> >
<MenuItem value=""> <MenuItem value="">
<em>Original</em> Original
</MenuItem> </MenuItem>
<MenuItem value={1}>Alfabética</MenuItem> <MenuItem value={1}>Alfabética</MenuItem>
<MenuItem value={2}>Mais recente</MenuItem> <MenuItem value={2}>Mais recente</MenuItem>
......
...@@ -118,7 +118,7 @@ export default function Header() { ...@@ -118,7 +118,7 @@ export default function Header() {
className={classes.link} className={classes.link}
> >
<h2 className={classes.form_creator}> <h2 className={classes.form_creator}>
Gerenciador de Formulários Gerador de Formulários
</h2> </h2>
</a> </a>
</Grid> </Grid>
......
...@@ -140,7 +140,7 @@ export default function ListForms() { ...@@ -140,7 +140,7 @@ export default function ListForms() {
) : ( ) : (
<Grid item> <Grid item>
<Typography variant="h4"> <Typography variant="h4">
Nenhum formulário foi encontrado! Nenhum formulário foi encontrado
</Typography> </Typography>
</Grid> </Grid>
)} )}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment