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

resolved conflicts

Browse Source
This commit is contained in:
Al Duncanson
2018-12-11 10:23:11 -05:00
parent 19cba81fff 65967c3e68
commit f676b1c1a8
10 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/css/App.css
View File

@@ -6,6 +6,10 @@ a {
text-decoration: none;
}
.sighting-google-map-container > div {
height: calc(100% - 64px) !important;
}
@media (min-width: 600px) {
.sighting-google-map-container > div {
width: calc(100% - 240px) !important;
@@ -13,12 +17,6 @@ a {
}
}
@media (min-width: 960px) {
.report-google-map-container > div {
width: calc(100% - 50% - 120px) !important;
}
}
#disqus_thread {
width: 89% !important;
margin: 0 auto;
@@ -34,18 +32,38 @@ a {
.sighting-list {
height: calc(50vh - 64px);
overflow-y: scroll;
}
@media (min-width: 960px) {
.sighting-container {
height: calc(100vh - 64px);
}
.sighting-list {
height: calc(100vh - 64px);
overflow-y: scroll;
}
.sighting-details {
height: calc(100vh - 64px);
overflow-y: scroll;
}
.report-google-map-container > div {
height: calc(100% - 64px) !important;
width: calc(100% - 50% - 120px) !important;
}
.sighting-detail-google-map-container > div {
height: 300px !important;
}
}
.sighting-details-content {
width: 89%;
margin: 330px auto 0 auto;
margin: 0 auto 0 auto;
}
.sighting-detail-google-map-container > div {
@@ -56,11 +74,4 @@ a {
.contact-form {
max-width: 100%;
overflow: hidden;
}
@media (min-width: 960px) {
.sighting-detail-google-map-container > div {
width: calc(100% - 50% - 120px) !important;
height: 300px !important;
}
}