From f7ae17c9a98f8dc23a3fc1439cde0ed6f81e3b15 Mon Sep 17 00:00:00 2001 From: Erik Lindsay Date: Sun, 26 Mar 2017 20:48:43 -0400 Subject: [PATCH] desktop looks --- html-ONLY-site/css/desktop.css | 30 ++++++++++++++++++++++++++++-- html-ONLY-site/css/main.css | 5 ++++- html-ONLY-site/css/map-desktop.css | 7 ++++++- html-ONLY-site/details-content.php | 24 ++++++++++++++++-------- html-ONLY-site/details.php | 5 +++-- html-ONLY-site/form.html | 29 ++++++++++++++++++++--------- html-ONLY-site/map.php | 1 + html-ONLY-site/wells-list.php | 25 ++++++++++++++++--------- 8 files changed, 94 insertions(+), 32 deletions(-) diff --git a/html-ONLY-site/css/desktop.css b/html-ONLY-site/css/desktop.css index 60e1a38..c8eae9a 100644 --- a/html-ONLY-site/css/desktop.css +++ b/html-ONLY-site/css/desktop.css @@ -1,12 +1,23 @@ -@media only screen and (min-width: 65em) { - +@media only screen and (min-width: 40.75em) { + div.well-card { + border: 2px solid #4d4d4d; + margin: 1.5rem; + width: 41rem; + } + main.list { + display: flex; + flex-direction: column; +/* justify-content: center;*/ + align-items: center; + } } @media only screen and (min-width: 45em) { div.well-card { border: 2px solid #4d4d4d; margin: 1.5rem; + width: 41rem; } main.search{ display: flex; @@ -17,5 +28,20 @@ color: inherit; width: 50%; } + + +} +@media only screen and (min-width: 25em) { + main.details{ + max-width: 25rem; + margin-left: auto; + margin-right: auto; + margin-top: 8rem; + } + #add-well{ + display: flex; + flex-direction: column; + align-items: center; + } } \ No newline at end of file diff --git a/html-ONLY-site/css/main.css b/html-ONLY-site/css/main.css index 4af3c66..9bfe93a 100644 --- a/html-ONLY-site/css/main.css +++ b/html-ONLY-site/css/main.css @@ -389,7 +389,10 @@ div.desk-details { } - +div.group{ + width: 100%; + max-width: 26rem; +} diff --git a/html-ONLY-site/css/map-desktop.css b/html-ONLY-site/css/map-desktop.css index 9c6b616..9213e45 100644 --- a/html-ONLY-site/css/map-desktop.css +++ b/html-ONLY-site/css/map-desktop.css @@ -24,7 +24,7 @@ margin-bottom: 3rem; } - div.well-card{ + main.map div.well-card{ margin-left: 0; margin-right: 0; top: auto; @@ -57,4 +57,9 @@ main.details{ margin-top: 0rem; } + a.go-to{ + float: right; + margin: 1rem; + + } } \ No newline at end of file diff --git a/html-ONLY-site/details-content.php b/html-ONLY-site/details-content.php index 3e84a08..695db11 100644 --- a/html-ONLY-site/details-content.php +++ b/html-ONLY-site/details-content.php @@ -1,4 +1,5 @@ +
- - +
+

Owner Info

- +
+

Well location

+
+

Casing Details

- +
+

Yield Test

- +
+

Water Level

- +
+

Screen Details

- +
+

Other Notes

- +

\ No newline at end of file diff --git a/html-ONLY-site/details.php b/html-ONLY-site/details.php index a82fe0d..a8fd3ff 100644 --- a/html-ONLY-site/details.php +++ b/html-ONLY-site/details.php @@ -11,6 +11,7 @@ + @@ -31,8 +32,8 @@

diff --git a/html-ONLY-site/form.html b/html-ONLY-site/form.html index c97f81c..4ec1de9 100644 --- a/html-ONLY-site/form.html +++ b/html-ONLY-site/form.html @@ -11,6 +11,7 @@ + @@ -35,12 +36,14 @@ -
+ +
- +
+
  • @@ -70,7 +73,8 @@
- +
+

Owner Info

    @@ -92,7 +96,8 @@

    Owner Info

- +
+

Well location

    @@ -160,7 +165,8 @@

    Well location

- +
+

Casing Details

  • @@ -194,7 +200,8 @@

    Casing Details

    no
- +
+

Yield Test

  • @@ -221,7 +228,8 @@

    Yield Test

- +
+

Water Level

  • @@ -240,7 +248,8 @@

    Water Level

- +
+

Screen Details

  • @@ -287,7 +296,8 @@

    Screen Details

- +
+

Other Notes

    @@ -298,6 +308,7 @@

    Other Notes

+
diff --git a/html-ONLY-site/map.php b/html-ONLY-site/map.php index a5f6004..b7fe8b6 100644 --- a/html-ONLY-site/map.php +++ b/html-ONLY-site/map.php @@ -76,6 +76,7 @@
+ go to > diff --git a/html-ONLY-site/wells-list.php b/html-ONLY-site/wells-list.php index 62ad138..f3da33d 100644 --- a/html-ONLY-site/wells-list.php +++ b/html-ONLY-site/wells-list.php @@ -25,7 +25,9 @@ - + + + @@ -46,28 +48,33 @@ -
+
+

Nearby Wells

query($query)) { /* fetch associative array */ while ($row = $result->fetch_assoc()) { echo' - +
@@ -75,7 +82,7 @@

short well description

- /a>'; +
'; //printf ($row["Well_Street_Name"]); } @@ -86,8 +93,8 @@