From 67ed4e778e4d13f744fd7d858c212540dead2e4d Mon Sep 17 00:00:00 2001 From: Erik Lindsay Date: Thu, 23 Feb 2017 12:06:22 -0500 Subject: [PATCH] ok --- .DS_Store | Bin 8196 -> 0 bytes .gitignore | 8 + Wello/src/css/hello[Conflict].css | 179 +++++++++++++ details.css | 8 + details.html | 146 +++++++++++ html-site/css/main (1).css | 419 ++++++++++++++++++++++++++++++ 6 files changed, 760 insertions(+) delete mode 100644 .DS_Store create mode 100644 Wello/src/css/hello[Conflict].css create mode 100644 html-site/css/main (1).css diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 576d5d5b5437f96cff9f16caabff00aa18fb121d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMTTC2P82*1Q?U~^=)V6@@mbDb6Ewq5pLZx-NX=!O`WVx2I%6~QFf6jk7 zm+yQthkpS8>_}@30ObI{=;2Z+pz0ch+xc@<$?-M$B$46)>YxvfLobX_D<}a10RjO6 z0RjO60Rrn00lKq!VQbv`!Wz^80s#WoB?A2W5TS?5s4o|U^gbO_c_{$NJW_jw+LQ-) zF%e%zeYqf{7fNG_>;e5y^ivEJ;bf0+cal+GE(j^Y0Yx~VKQsCn3VO3sT*Pw+j0zdl z0RjO6S0li4_hOg?7pA~mk-s}&kXFz1r!3R9PLm&h_3~i|bn-O8PRuyd3DZuH_M^nK zX*h0u{nwb2o0q>~BamxU#v^ zwp`V)^wcuq*!mFxKc4U*SfEvHqzMIJYO4`YiMq2sg1O> zG|$g7R#x3`uxDcG?76w~^Y=YZtEGbeX9P+_f2qDetz~;OolK|LW6pDnd;Df;k8(k% z=ZM@JS2ks6>3!3#VO!3io^nXWl@f{QkqoFWZG0+z1=kX zjdQv)?CP^FZ;d*3%I)+VAo$Iw#)Glu3)j;Kyjw=}~#J(MvVBVp<>OP$h7b6=9AY|+-T@`@Wn zp|xCx(+T5D+HlV*Rg7ho;*uh{GIX<~Tw!AxE$5i6@tHKw5~>VUGj@{eJ5xHz+NUGb?V(Ple8|T6+`X#f_D$;+P0x4NT^S0EaDBU`=^A6KDq17X+Jix=iq`u_ z&!7VK&}DNN#)#n4@E|-6Pr#FK0bYa4a0T9i58xB{3_gc1;5+yceuiJ+clZPTgujrX zgaufL6}TO%a0k|7D;~f$Jcu256npVF_F)W9;W$p9il=cJ&!B@Yp2vsqVSE%H!)NdX zd=X#9SMV~vfp6nG_%6POpW>I873<4cBfI>=RLx12^Ea|AU!$}CdCJHVAZ6m*uu1H>$Sb}d#b8##wq zmU~x5!eNDzM|5{oQ#XhBExJ2*g=Hm|*eiL?d-lpABVGkZ52F7p@hj9c)F^M|yZxRhm5&tqcgR^))KH%~2 z5qt`tCMG^hOuUG%uHs$KD&D=ml6R}FiIvVlZ(SmgD^^v`^Z)L(fB#>XYY!F`AP^w% z?;wDAUHx4hG}hwZ7^{cnxpst}33_*{X_3hP_| diff --git a/.gitignore b/.gitignore index 8269117..70e6ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,13 @@ +<<<<<<< HEAD # https://git-scm.com/docs/gitignore # https://help.github.com/articles/ignoring-files # Example .gitignore files: https://github.com/github/gitignore /bower_components/ /node_modules/ +======= +# https://git-scm.com/docs/gitignore +# https://help.github.com/articles/ignoring-files +# Example .gitignore files: https://github.com/github/gitignore +/bower_components/ +/node_modules/ +>>>>>>> ok diff --git a/Wello/src/css/hello[Conflict].css b/Wello/src/css/hello[Conflict].css new file mode 100644 index 0000000..9399384 --- /dev/null +++ b/Wello/src/css/hello[Conflict].css @@ -0,0 +1,179 @@ +.hello { + position: absolute; + top: 20px; + right: 0; + bottom: 0; + left: 0; +} + + + + + + + + + +

+ + + + +Hazzard button + + + +Edit button + + +go back + + +

+ + +

+W3Schools.com

+

+ + +

+ Date Completed: +

Insert date completed here

+ + Permit Number: +

Insert Permit Number here

+ + State Well Number: +

Insert well number here

+ Signature +

Name of the person here

+ +

+ Owner +

University of Connecticut

+ Location +

Mansfield CT

+ + +
+ +
+ Date of Report: +

Insert that here

+ + Registrant Number: +

Insert that here

+ Other number: +

Insert that here:

+ + +

+

+ +
+ + + + +

+Location Relative To Landmarks +

Insert description here

+ + +
+ Use : +

where to use

+ +
+ +
+ Drilling Equipment: +

Write what equipment was used

+
+

+

Casing details

+
+

Length: insert length here

+

Diameter: insert here

+

Weight per foot: insert here

+

Drive Shoe: insert here

+

Threaded: insert here

+

Was Casing Grouted: insert here

+
+

Yeild Test

+
+

Methods: insert here

+

Duration: insert here

+

Yield: insert here

+

+Write down the yeild here with same format as above +

+
+

Water Level

+
+

From Land to Surface: insert here

+

During Yeild Test: insert here

+

Depth of Completed Well: insert here

+ +
+

Screen Details

+
+

Make: insert here

+

Length Open To Aquilfier: insert here

+

Slot Size: insert here

+

Diameter: insert here

+

Gravel: insert here

+

Diameter Including Gravel Pack: insert here

+

Gravel Size: insert here

+

Gravel Pack Location: insert here

+
+

Depth from land to surface

+
+

We must find a way to iterate based on the value in the submit form

+ + +
+ + + + + + + + +.hello .button-say-hello { + position: absolute; + display: block; + font-size: 120%; + bottom: 100px; + right: 50%; + -webkit-transform: translate(50%,0); + transform: translate(50%,0); + -webkit-appearance: none; + border-radius: 2px; + background: #efefef; + color: #666666; + padding: 10px; + width: 300px; + text-align: center; + text-decoration: none; + box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1); +} + +.hello .button-say-hello.Tappable-active { + background: #e6e6e6; + color: #333333; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + -webkit-transform: translate(50%, 1px); + transform: translate(50%, 1px); +} diff --git a/details.css b/details.css index 670c7e3..993f1fe 100644 --- a/details.css +++ b/details.css @@ -1,5 +1,13 @@ +<<<<<<< HEAD body{ style = height: 2500px; background-color: darkgray; } +======= +body{ + style = height: 2500px; + background-color: darkgray; +} + +>>>>>>> ok diff --git a/details.html b/details.html index 4eae1d9..a870a3d 100644 --- a/details.html +++ b/details.html @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -141,3 +142,148 @@ Write down the yeild here with same format as above +======= + + + + + + + + + +

+ + + + +Hazzard button + + + +Edit button + + +go back + + +

+ + +

+W3Schools.com

+

+ + +

+ Date Completed: +

Insert date completed here

+ + Permit Number: +

Insert Permit Number here

+ + State Well Number: +

Insert well number here

+ Signature +

Name of the person here

+ +

+ Owner +

University of Connecticut

+ Location +

Mansfield CT

+ + +
+ +
+ Date of Report: +

Insert that here

+ + Registrant Number: +

Insert that here

+ Other number: +

Insert that here:

+ + +

+

+ +
+ + + + +

+Location Relative To Landmarks +

Insert description here

+ + +
+ Use : +

where to use

+ +
+ +
+ Drilling Equipment: +

Write what equipment was used

+
+

+

Casing details

+
+

Length: insert length here

+

Diameter: insert here

+

Weight per foot: insert here

+

Drive Shoe: insert here

+

Threaded: insert here

+

Was Casing Grouted: insert here

+
+

Yeild Test

+
+

Methods: insert here

+

Duration: insert here

+

Yield: insert here

+

+Write down the yeild here with same format as above +

+
+

Water Level

+
+

From Land to Surface: insert here

+

During Yeild Test: insert here

+

Depth of Completed Well: insert here

+ +
+

Screen Details

+
+

Make: insert here

+

Length Open To Aquilfier: insert here

+

Slot Size: insert here

+

Diameter: insert here

+

Gravel: insert here

+

Diameter Including Gravel Pack: insert here

+

Gravel Size: insert here

+

Gravel Pack Location: insert here

+
+

Depth from land to surface

+
+

We must find a way to iterate based on the value in the submit form

+ + +
+ + + + + +>>>>>>> ok diff --git a/html-site/css/main (1).css b/html-site/css/main (1).css new file mode 100644 index 0000000..83a76b8 --- /dev/null +++ b/html-site/css/main (1).css @@ -0,0 +1,419 @@ +/*! HTML5 Boilerplate v5.3.0 | MIT License | https://html5boilerplate.com/ */ +/* + * What follows is the result of much research on cross-browser styling. + * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, + * Kroc Camen, and the H5BP dev community and team. + */ +/* ========================================================================== + Base styles: opinionated defaults + ========================================================================== */ +html { + color: #222; + font-size: 1em; + line-height: 1.4; } + +/* This is where the page for details starts */ + + + + + + + + +

+ + + + +Hazzard button + + + +Edit button + + +go back + + +

+ + +

+W3Schools.com

+

+ + +

+ Date Completed: +

Insert date completed here

+ + Permit Number: +

Insert Permit Number here

+ + State Well Number: +

Insert well number here

+ Signature +

Name of the person here

+ +

+ Owner +

University of Connecticut

+ Location +

Mansfield CT

+ + +
+ +
+ Date of Report: +

Insert that here

+ + Registrant Number: +

Insert that here

+ Other number: +

Insert that here:

+ + +

+

+ +
+ + + + +

+Location Relative To Landmarks +

Insert description here

+ + +
+ Use : +

where to use

+ +
+ +
+ Drilling Equipment: +

Write what equipment was used

+
+

+

Casing details

+
+

Length: insert length here

+

Diameter: insert here

+

Weight per foot: insert here

+

Drive Shoe: insert here

+

Threaded: insert here

+

Was Casing Grouted: insert here

+
+

Yeild Test

+
+

Methods: insert here

+

Duration: insert here

+

Yield: insert here

+

+Write down the yeild here with same format as above +

+
+

Water Level

+
+

From Land to Surface: insert here

+

During Yeild Test: insert here

+

Depth of Completed Well: insert here

+ +
+

Screen Details

+
+

Make: insert here

+

Length Open To Aquilfier: insert here

+

Slot Size: insert here

+

Diameter: insert here

+

Gravel: insert here

+

Diameter Including Gravel Pack: insert here

+

Gravel Size: insert here

+

Gravel Pack Location: insert here

+
+

Depth from land to surface

+
+

We must find a way to iterate based on the value in the submit form

+ + +
+ + + + + + + + + + + +/* + * Remove text-shadow in selection highlight: + * https://twitter.com/miketaylr/status/12228805301 + * + * These selection rule sets have to be separate. + * Customize the background color to match your design. + */ +::-moz-selection { + background: #b3d4fc; + text-shadow: none; } + +::selection { + background: #b3d4fc; + text-shadow: none; } + +/* + * A better looking default horizontal rule + */ +hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; } + +/* + * Remove the gap between audio, canvas, iframes, + * images, videos and the bottom of their containers: + * https://github.com/h5bp/html5-boilerplate/issues/440 + */ +audio, +canvas, +iframe, +img, +svg, +video { + vertical-align: middle; } + +/* + * Remove default fieldset styles. + */ +fieldset { + border: 0; + margin: 0; + padding: 0; } + +/* + * Allow only vertical resizing of textareas. + */ +textarea { + resize: vertical; } + +/* ========================================================================== + Browser Upgrade Prompt + ========================================================================== */ +.browserupgrade { + margin: 0.2em 0; + background: #ccc; + color: #000; + padding: 0.2em 0; } + +/* ========================================================================== + Author's custom styles + ========================================================================== */ +/*colors--------------------------------------*/ +/*nav bars------------------------------------*/ +nav.top-nav { + position: fixed; + top: 0; + width: 100%; + display: flex; + justify-content: space-between; + background-color: #65b2ff; + z-index: 10; } + nav.top-nav button { + margin: .5rem; } + +nav.bottom-nav { + position: fixed; + bottom: 0; + width: 100%; + display: flex; + justify-content: space-around; + background-color: #65b2ff; } + nav.bottom-nav button { + margin: .5rem; } + +nav.fabs { + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + position: fixed; + bottom: 6rem; + right: 0; + width: 6rem; + height: 8rem; } + +button { + background-color: transparent; + border: none; } + button.add-well { + background: #65b2ff; + border-radius: 10rem; + width: 4rem; + height: 4rem; } + button.gps { + background: #65b2ff; + border-radius: 10rem; + width: 2rem; + height: 2rem; } + button.gps img { + width: 100%; } + +#map { + width: 100vw; + height: 100vh; } + +/* ========================================================================== + Helper classes + ========================================================================== */ +/* + * Hide visually and from screen readers + */ +.hidden { + display: none !important; } + +/* + * Hide only visually, but have it available for screen readers: + * http://snook.ca/archives/html_and_css/hiding-content-for-accessibility + */ +.visuallyhidden { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; } + +/* + * Extends the .visuallyhidden class to allow the element + * to be focusable when navigated to via the keyboard: + * https://www.drupal.org/node/897638 + */ +.visuallyhidden.focusable:active, +.visuallyhidden.focusable:focus { + clip: auto; + height: auto; + margin: 0; + overflow: visible; + position: static; + width: auto; } + +/* + * Hide visually and from screen readers, but maintain layout + */ +.invisible { + visibility: hidden; } + +/* + * Clearfix: contain floats + * + * For modern browsers + * 1. The space content is one way to avoid an Opera bug when the + * `contenteditable` attribute is included anywhere else in the document. + * Otherwise it causes space to appear at the top and bottom of elements + * that receive the `clearfix` class. + * 2. The use of `table` rather than `block` is only necessary if using + * `:before` to contain the top-margins of child elements. + */ +.clearfix:before, +.clearfix:after { + content: " "; + /* 1 */ + display: table; + /* 2 */ } + +.clearfix:after { + clear: both; } + +/* ========================================================================== + EXAMPLE Media Queries for Responsive Design. + These examples override the primary ('mobile first') styles. + Modify as content requires. + ========================================================================== */ +@media only screen and (min-width: 35em) { + /* Style adjustments for viewports that meet the condition */ } +@media print, (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx), (min-resolution: 120dpi) { + /* Style adjustments for high resolution devices */ } +/* ========================================================================== + Print styles. + Inlined to avoid the additional HTTP request: + http://www.phpied.com/delay-loading-your-print-css/ + ========================================================================== */ +@media print { + *, + *:before, + *:after, + *:first-letter, + *:first-line { + background: transparent !important; + color: #000 !important; + /* Black prints faster: + http://www.sanbeiji.com/archives/953 */ + box-shadow: none !important; + text-shadow: none !important; } + + a, + a:visited { + text-decoration: underline; } + + a[href]:after { + content: " (" attr(href) ")"; } + + abbr[title]:after { + content: " (" attr(title) ")"; } + + /* + * Don't show links that are fragment identifiers, + * or use the `javascript:` pseudo protocol + */ + a[href^="#"]:after, + a[href^="javascript:"]:after { + content: ""; } + + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; } + + /* + * Printing Tables: + * http://css-discuss.incutio.com/wiki/Printing_Tables + */ + thead { + display: table-header-group; } + + tr, + img { + page-break-inside: avoid; } + + img { + max-width: 100% !important; } + + p, + h2, + h3 { + orphans: 3; + widows: 3; } + + h2, + h3 { + page-break-after: avoid; } }