GVSU/marten-application
GVSU
/
marten-application
1
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

merge into: GVSU:develop
Branches Tags
GVSU:master
GVSU:develop
...
pull from: GVSU:master
Branches Tags
GVSU:master
GVSU:develop

5 Commits
develop ... master

Author SHA1 Message Date
Al Duncanson 55775e10b9 new api keys 2019-01-05 12:50:07 -05:00
Alex Duncanson 37c5733014
Merge pull request #75 from alDuncanson/bugfix/little-things 
bugfix/little-things
 2018-12-17 10:51:35 -05:00
WildScotsmen 119f89489b Removed CSS I added that doesn't actually make a difference. 2018-12-17 01:38:56 -05:00
WildScotsmen 29933ccb71 Fixed issue with background image getting a server error. 2018-12-17 01:24:15 -05:00
WildScotsmen 2b664334a2 Fixed bug where paper would go off screen 2018-12-17 01:21:01 -05:00
6 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

0
src/images/galleryBackgroundImage.png → public/galleryBackgroundImage.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

2
src/components/SightingMap.js
View File

@ -5,7 +5,7 @@ import Typography from '@material-ui/core/Typography';
import firebase from '../utilities/firebase.js'; import firebase from '../utilities/firebase.js';
// Google Maps API Key // Google Maps API Key
const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM'; const API_KEY = 'AIzaSyCSOlH291-dVi3dqYoapwG3st70IzLL6j4';
// Map container styles // Map container styles
const mapStyles = { const mapStyles = {

2
src/components/flamelink/FlameLinkCollectionGallery.js
View File

@ -18,7 +18,7 @@ const styles = theme => ({
flamelinkGallery: { flamelinkGallery: {
marginRight: 'auto', marginRight: 'auto',
marginLeft: 'auto', marginLeft: 'auto',
backgroundImage: 'url(../images/galleryBackgroundImage.png)', backgroundImage: 'url(/galleryBackgroundImage.png)',
overflow: 'hidden', overflow: 'hidden',
minHeight: 180, minHeight: 180,
minWidth: 300, minWidth: 300,

3
src/components/flamelink/FlameLinkComponentCreations.js
View File

@ -10,8 +10,7 @@ const styles = theme => ({
...theme.mixins.gutters(), ...theme.mixins.gutters(),
margin: theme.spacing.unit * 2, margin: theme.spacing.unit * 2,
paddingTop: theme.spacing.unit * 2, paddingTop: theme.spacing.unit * 2,
paddingBottom: theme.spacing.unit * 2, paddingBottom: theme.spacing.unit * 2
width: '100%'
}, },
}); });

2
src/components/forms/ReportMap.js
View File

@ -3,7 +3,7 @@ import { Map, InfoWindow, Marker, GoogleApiWrapper } from 'google-maps-react';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
// Google Maps API Key // Google Maps API Key
const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM'; const API_KEY = 'AIzaSyCSOlH291-dVi3dqYoapwG3st70IzLL6j4';
// Map container styles // Map container styles
const mapStyles = { const mapStyles = {

2
src/components/list/SightingDetailMap.js
View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { Map, Marker, GoogleApiWrapper } from 'google-maps-react'; import { Map, Marker, GoogleApiWrapper } from 'google-maps-react';
// Google Maps API Key // Google Maps API Key
const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM'; const API_KEY = 'AIzaSyCSOlH291-dVi3dqYoapwG3st70IzLL6j4';
// Map container styles // Map container styles
const mapStyles = { const mapStyles = {