From 4d87e4e47d9364826d1aa4aa0982024f3efaa04c Mon Sep 17 00:00:00 2001 From: Daniel Kim Date: Sat, 7 Oct 2023 18:10:54 -0700 Subject: [PATCH 1/6] changed upperbound, usg --- .DS_Store | Bin 8196 -> 8196 bytes templates/.DS_Store | Bin 8196 -> 6148 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index 97111d902ddab4164d5ef0bee52bdac02aa86c68..030dfab043745cbb2cb5e86030fbe3581b7b35f9 100644 GIT binary patch delta 196 zcmZp1XmQvuQCN_hA%!84p#+GNfVh|;b#j29$mDy%f|Dl-TNv^&q%)*4kW6DJ_RPsoPRhwoVqjnp0Afc521dTgPlSsnrwf#Fm>L-9D43X;Ox6;zpZs1} tezS=vJLBZFf~6crCMG623Ko`NnQvlB6HAtCW|#QJGWno@G)dYP0suWVG`au) delta 178 zcmZp1XmQvuQF!ukVGDLVof89OHl$}@INwi8$7XJ;s7NM=Z3&|@fI$b%R; UvFzYxc8PB+lM{s{C@^Fn0CMUu?f?J) diff --git a/templates/.DS_Store b/templates/.DS_Store index bf50980e2b33a66ffedffcf084dd516164e8fd69..af6f20652d6f99f256a7aad85b915b97bb7b3d3e 100644 GIT binary patch delta 111 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jG-bU^g=(-(((v*^`|GuWWV~ xdcZibVa;N84h}(Pph6%J;06+|AUzukzcWwfm+=Idz`z7C4P*hs=6Iet%m9yW6XpN_ delta 259 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7Z0TH}hr%jz7$c**Q2SHn1=X zPUc~m?Wn?##$e2l#9+x_!e9iXlYx9wAT|QRR3I;z!5j!dEK3GMpc+e{Yzk0^0Z=pv zNE%P}V-c5a16t1d9}0lhaxtVcaLmq=3 z(9~jvV$YoX Date: Sat, 7 Oct 2023 21:12:04 -0700 Subject: [PATCH 2/6] fixed again --- dogs.db | Bin 0 -> 16384 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dogs.db diff --git a/dogs.db b/dogs.db new file mode 100644 index 0000000000000000000000000000000000000000..b12e89d6ecbf19a45d2eed38de0198dc1116b995 GIT binary patch literal 16384 zcmeI#O>fgM7zgmAov2g^iObZ(F1{eOTH!LdQ&2z^UAL7W(NpEPUSi?cS)8owz<~<~ z&U`pN4(`?o)|W@zkgC5WD@mWnj{UP$#UCz4s*>!|mN~E3N$?~H!{8NTK@c>2J@ECu ztUrhM0pi*Sp1)v^eL}O{3fjNg-~9yz0uX=z1Rwwb2teTf3w&+1I!8z0w~LA=S_*3_ zE~?e#;LRiV@JuSXGE{m8mZ&Dn4qNAIEuJD&_s2a_p#A5GcdV|+Fo`!=W1IPNpU zbIIc9lfRWYS9*1yOXqlc7h%2g#-q;haX7twySviYmdzbqge}fmv8I) zmc1WO!&c|;F#P%Kw$Hgu-Lf_wv|j$gx^1>r{%v9#&3tdOKeOEk+l7%Ol~BpNm}zA` z-w|zeu#hUvD)x4CHi)|?z5Yf*Qc5|WrKPQl9bGv2Ww~aXO_v}4yF2DaSu;y{LF70) zS9MM#6t?2d(K#a1wp4RTbdxB-%Y;ZMGV6RTYeysrt_3}mq&8IhQu0a}YM`mEg>`bf zcTw6(DziPvbyDX(xO+iTZIjw>6(WUeazz~()znI-Db-eFR!djO(rRLKiPEa96LJQ1 z>49gikV0K5;rBJaR@Kd_)0bQJe%p#nd1G v0SG_<0uX=z1Rwwb2tWV=D*>GUu@xWy0SG_<0uX=z1Rwwb2tWV=`!Dbt{Ox0O literal 0 HcmV?d00001 From 538919b5eadc435238577e427bc073fcfa232331 Mon Sep 17 00:00:00 2001 From: Daniel Kim Date: Sun, 8 Oct 2023 14:39:28 -0700 Subject: [PATCH 3/6] usg fixed --- templates/index.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/index.html b/templates/index.html index f914b90..f2515ea 100644 --- a/templates/index.html +++ b/templates/index.html @@ -197,8 +197,9 @@

- -

+ + +


@@ -221,7 +222,7 @@
- +
@@ -249,7 +250,7 @@
- +
From cb04b79bcba45a4a80074571d7ad0f3ae563c843 Mon Sep 17 00:00:00 2001 From: Daniel Kim Date: Mon, 9 Oct 2023 11:18:16 -0700 Subject: [PATCH 4/6] this includes all changes --- css/index.css | 6 +++--- templates/index.html | 31 +++++++++++++++---------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/css/index.css b/css/index.css index 4fd33e3..f74efdb 100644 --- a/css/index.css +++ b/css/index.css @@ -473,7 +473,7 @@ } .header { width: 100%; - height: 260px; + /* height: 260px; */ margin: 0; display: flex; flex-direction: column; @@ -505,6 +505,7 @@ width: 100%; height: 20px; transition: .3s ease transform; + margin-bottom: 20px; } .tab { display: inline-block; @@ -580,7 +581,7 @@ div.col1{ width: 80%; height: auto; - margin-bottom: 77px; + margin-bottom: 80px; align-items: center; padding-left: 80px; margin-right: 40px; @@ -637,7 +638,6 @@ justify-content: center; background-color: lightgray; margin-bottom: 50px; - margin-top: 10px; } p.info { font-size: 2.5rem; diff --git a/templates/index.html b/templates/index.html index f2515ea..56ea74a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -37,7 +37,7 @@
  • Contact
    • -
    + -
    + --> +
    @@ -55,16 +55,16 @@

    - +

    - +

    - +

    - +

    @@ -91,7 +91,7 @@

    - +

    - +

    @@ -120,21 +120,21 @@

    - +

    - +

    - +

    - +

    - +

    @@ -184,7 +184,6 @@

    -

    From a2a31eddbd4d22320e70938b9dbd133a3c7ea032 Mon Sep 17 00:00:00 2001 From: Cameron Bannasch Date: Mon, 9 Oct 2023 12:45:46 -0700 Subject: [PATCH 5/6] Resolve merge conflicts in templates/index.html --- templates/index.html | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/templates/index.html b/templates/index.html index a6b1295..f7f1d74 100644 --- a/templates/index.html +++ b/templates/index.html @@ -56,7 +56,6 @@

    -<<<<<<< HEAD

    @@ -68,19 +67,6 @@

    -======= - - -

    - - -

    - - -

    - - ->>>>>>> master

    @@ -625,19 +611,11 @@

    -<<<<<<< HEAD

    -======= - - -

    - - ->>>>>>> master

    @@ -648,7 +626,6 @@

    -<<<<<<< HEAD

    @@ -665,24 +642,6 @@

    -======= - - -

    - - -

    -
    -
    - - -

    - - -

    - - ->>>>>>> master

    From 3de48e1cb727be18ed4e7832c68508023dec3e22 Mon Sep 17 00:00:00 2001 From: Cameron Bannasch Date: Mon, 9 Oct 2023 12:46:33 -0700 Subject: [PATCH 6/6] Fixed merge conflics in index.css --- static/index.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/static/index.css b/static/index.css index 24e55bd..e5e31d9 100644 --- a/static/index.css +++ b/static/index.css @@ -587,11 +587,7 @@ div.col1{ width: 80%; height: auto; -<<<<<<< HEAD:css/index.css margin-bottom: 80px; -======= - margin-bottom: 120px; ->>>>>>> master:static/index.css align-items: center; padding-left: 80px; margin-right: 40px; @@ -710,4 +706,4 @@ color: white; padding: 5px; } -} \ No newline at end of file +}