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;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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