From ef0417c052751e6323b0f2b1da5554a54790e4af Mon Sep 17 00:00:00 2001 From: David Date: Sat, 8 Apr 2017 12:56:36 -0600 Subject: [PATCH 1/2] updated public folder with to do list project files --- .DS_Store | Bin 0 -> 6148 bytes public/.DS_Store | Bin 0 -> 6148 bytes public/css/.DS_Store | Bin 0 -> 6148 bytes public/css/style.css | 58 +++++++++++++++++++++++++++++++++++++++++-- public/index.html | 41 +++++++++++++++++++++--------- public/js/.DS_Store | Bin 0 -> 6148 bytes public/js/script.js | 13 ++++++++++ 7 files changed, 98 insertions(+), 14 deletions(-) create mode 100644 .DS_Store create mode 100644 public/.DS_Store create mode 100755 public/css/.DS_Store mode change 100644 => 100755 public/css/style.css mode change 100644 => 100755 public/index.html create mode 100755 public/js/.DS_Store create mode 100755 public/js/script.js diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cdfda52137f21b31f3de9785af3c25297ac69ec4 GIT binary patch literal 6148 zcmeHK%Wl&^6ur}i;_wg=t<(xO-XO6^QQQYzAS5f4MR!O+umF_WiIuvzp2&};kf!pc z{{Z{}pTZaLA$$Owc?88tpqmN-nj76Y*E9DXdyX_S86slMyz3Cvh{%EqtXxAg$Hchs z8C%djVvtFWBkEH`0j*OylWjVT0!D$qO#!iXZ<9l9tk{qy*Ka@x9b+vg^nea2-HUj~ zkGPL~u~|HV-~TQR5z#VjfFqz2>;MTc#ZT-4zi0V8#d4Q6FJM^*JExp7d~Hm^paQdDeMNmj-PWL z{fs^TMHmd)wUsA4&b%-Vl8N-!FT=RY2Th*G-Bj{C^Rfff$``e3Yr~<_*sj|f&i1Ho z4|jGNb$e^`;b>%8tM{D8d;3T4-VaYlXCE-&GX$UGSZi~|3a0<5yz+HGP=`fQzxi z!khFB;0gLTWoCA$l2CeVqiRRm{qM)j+WWJ1*9!ouGYp#mH2`ohkyaKl`;AdQrF&MA zmIYKrW9XA0)&bUNIBS-GB{1&q=^Rl&o{Q}ZnNDQ*WJ9`Zq(h4*5-KZILm9z zoxS7JFJJTX@x`V23JNzVwr8Sua)kw%-ly&$iFNV;TgZD6B1j;F9(;y%=tBml5Kn`G z*XZ|R0#pe;&ccN6=(9EJGlBB@U!z>k^A?fZZ2XbrH=GCBgCvPG&wqv^N7-z?2*`49 zp3K*4*|)I-EP**7K>LG>iPRG6D^El3z{;as3ug& z6+_A0L78yu_r$+2YQjPBlW`n*vXUE$lBLv7 zPX|Jb0Kgg2VOYm30c=bFd*PUf49t@XOsdz2;YmlnRb4L}6O(QpH{&^Vv)6>;aXa!Y z%FTPCq7;wd!*+ZbMOoLl#(6Is6N8R?(1H3hKwV@~;I9?<0BbiJV*mgE literal 0 HcmV?d00001 diff --git a/public/css/style.css b/public/css/style.css old mode 100644 new mode 100755 index 4c0e04d..37a5653 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,3 +1,57 @@ -h1 { - color:red; +body { + background-color: lightgreen; +} + +@media (max-width: 1500px) { + body { + background-color: MediumSeaGreen; + } +} + +@media (max-width: 1250px) { + body { + background-color: SeaGreen; + } +} + +@media (max-width: 1000px) { + body { + background-color: ForestGreen; + } +} + +@media (max-width: 750px) { + body { + background-color: Green; + } +} + +@media (max-width: 500px) { + body { + background-color: DarkGreen; + } +} + +ul li { + list-style:none; + } + input[type="checkbox"]{ + margin-right: 35px; + } + .finished-task{ + text-decoration: line-through; + color-#F00 + } + + #container{ + width:100%; + height:100%; +} + +.centered-panel{ + width:50%; + margin:0 auto; + border:5px solid black; + padding:40px; + background-color:white; } diff --git a/public/index.html b/public/index.html old mode 100644 new mode 100755 index c95bdad..543fa1c --- a/public/index.html +++ b/public/index.html @@ -1,12 +1,29 @@ - - - - - Title - - - -

Hello World!

-

This is our home page

- - + + + + + + + My To Do List + + + +
+
+

Honey Do This, Do That List

+ +
    +
  • Pick up Dry Cleaning
    • +
  • Buy Apples, Bananas and Celery at Grocers
    • +
  • Vaccuum and Mop Floors
    • +
+ +

Finished

+
    + +
+
+
+ + + diff --git a/public/js/.DS_Store b/public/js/.DS_Store new file mode 100755 index 0000000000000000000000000000000000000000..f19d484cedcbc34d1b3eeab3078f7b1ef3eb1e51 GIT binary patch literal 6148 zcmeHKyG{c^3>-s>AexkvTT&rW)2yOUQ1b&Qp#en-BB8&E@8Zvr@k5B{ph2QRW67Rf zuje*5#W@CG^S8%qU- p2ZbTpF)`XPH{OmfqA2T{uX)}Jhs2;WA9SMr47e^bDe%_{8~}0?8*Tsq literal 0 HcmV?d00001 diff --git a/public/js/script.js b/public/js/script.js new file mode 100755 index 0000000..15aab7a --- /dev/null +++ b/public/js/script.js @@ -0,0 +1,13 @@ +$( document ).ready(function() { + $('.task').click(function() { + $(this).fadeOut( "slow", function() { + if($(this).find("input").is(':checked')){ + $(this).appendTo(".finished-list").addClass("finished-task"); + }else{ + $(this).appendTo(".todo-list").removeClass("finished-task"); + } + $(this).fadeIn("slow"); + }); + }); + $(".finished-task input").prop( "disabled", true ); //Disable +}); From 484ce37632f3b815bfa1a9abe3207677625e022f Mon Sep 17 00:00:00 2001 From: David Date: Sat, 8 Apr 2017 17:40:18 -0600 Subject: [PATCH 2/2] Got Jquery to work for us --- public/.DS_Store | Bin 6148 -> 6148 bytes public/css/style.css | 12 ++++++++++++ public/index.html | 13 +++++++++++-- public/js/.DS_Store | Bin 6148 -> 6148 bytes public/js/script.js | 25 ++++++++++++++++--------- 5 files changed, 39 insertions(+), 11 deletions(-) mode change 100755 => 100644 public/js/script.js diff --git a/public/.DS_Store b/public/.DS_Store index bee404692c710be796cce22dff1845ad11d0cc26..449c22de0a8ec93c8ead34a82d09f59faea91af8 100644 GIT binary patch delta 38 ucmZoMXffC@iFL9&OACjEfuW9qp_%1mSvJ|pA6Qg2$FZ$o+|17LmmdJ*!3(PZ delta 46 zcmZoMXffC@iIwrhWDk}GF7fJWV+$PxLo

Honey Do This, Do That List

+

+ Enter a task + + +

+
+

+ Not Completed +

    -
  • Pick up Dry Cleaning
    • +
  • Pick up Dry Cleaning
  • Buy Apples, Bananas and Celery at Grocers
  • Vaccuum and Mop Floors
-

Finished

+

Completed

diff --git a/public/js/.DS_Store b/public/js/.DS_Store index f19d484cedcbc34d1b3eeab3078f7b1ef3eb1e51..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 100755 GIT binary patch delta 67 zcmZoMXfc=|&Zs)EP;8=}A_oHyFfuR*Y&_`3KJh}' + $('#taskInput').val()+''); }); + + $(document).on("click",".task",function(){ + $(this).fadeOut( "slow", function() { + if($(this).find("input").is(':checked')){ + $(this).appendTo(".finished-list").addClass("finished-task"); + }else{ + $(this).appendTo(".todo-list").removeClass("finished-task"); + } + + $(this).fadeIn("slow"); + }); + }); + $(".finished-task input").prop( "disabled", true ); //Disable });