diff --git a/app.js b/app.js index ab737a6002..c7fc4f2bb7 100644 --- a/app.js +++ b/app.js @@ -10,7 +10,7 @@ var taskInput=document.getElementById("new-task");//Add a new task. var addButton=document.getElementsByTagName("button")[0];//first button -var incompleteTaskHolder=document.getElementById("incompleteTasks");//ul of #incompleteTasks +var incompleteTaskHolder=document.getElementById("incomplete-tasks");//ul of #incomplete-tasks var completedTasksHolder=document.getElementById("completed-tasks");//completed-tasks @@ -28,22 +28,24 @@ var createNewTaskElement=function(taskString){ //button.edit var editButton=document.createElement("button");//edit button - //button.delete + //button.tasks__button_delete var deleteButton=document.createElement("button");//delete button var deleteButtonImg=document.createElement("img");//delete button image + listItem.classList.add("tasks__item"); + deleteButtonImg.classList.add("tasks__del-icon"); label.innerText=taskString; - label.className='task'; + label.className='tasks__label'; //Each elements, needs appending checkBox.type="checkbox"; editInput.type="text"; - editInput.className="task"; + editInput.className="tasks__input"; editButton.innerText="Edit"; //innerText encodes special characters, HTML does not. - editButton.className="edit"; + editButton.classList.add("tasks__button_edit", "tasks__button"); - deleteButton.className="delete"; + deleteButton.classList.add("tasks__button_delete", "tasks__button"); deleteButtonImg.src='./remove.svg'; deleteButton.appendChild(deleteButtonImg); @@ -84,12 +86,12 @@ var editTask=function(){ var editInput=listItem.querySelector('input[type=text]'); var label=listItem.querySelector("label"); - var editBtn=listItem.querySelector(".edit"); - var containsClass=listItem.classList.contains("editMode"); - //If class of the parent is .editmode + var editBtn=listItem.querySelector(".tasks__button_edit"); + var containsClass=listItem.classList.contains("tasks__item_edit-mode"); + //If class of the parent is .tasks__item_edit-mode if(containsClass){ - //switch to .editmode + //switch to .tasks__item_edit-mode //label becomes the inputs value. label.innerText=editInput.value; editBtn.innerText="Edit"; @@ -98,8 +100,8 @@ var editTask=function(){ editBtn.innerText="Save"; } - //toggle .editmode on the parent. - listItem.classList.toggle("editMode"); + //toggle .tasks__item_edit-mode on the parent. + listItem.classList.toggle("tasks__item_edit-mode"); }; @@ -131,7 +133,7 @@ var taskIncomplete=function(){ console.log("Incomplete Task..."); //Mark task as incomplete. //When the checkbox is unchecked - //Append the task list item to the #incompleteTasks. + //Append the task list item to the #incomplete-tasks. var listItem=this.parentNode; incompleteTaskHolder.appendChild(listItem); bindTaskEvents(listItem,taskCompleted); @@ -156,8 +158,8 @@ var bindTaskEvents=function(taskListItem,checkBoxEventHandler){ console.log("bind list item events"); //select ListItems children var checkBox=taskListItem.querySelector("input[type=checkbox]"); - var editButton=taskListItem.querySelector("button.edit"); - var deleteButton=taskListItem.querySelector("button.delete"); + var editButton=taskListItem.querySelector(".tasks__button_edit"); + var deleteButton=taskListItem.querySelector(".tasks__button_delete"); //Bind editTask to edit button. diff --git a/index.html b/index.html index ef4aa1f60c..0b65e8112f 100644 --- a/index.html +++ b/index.html @@ -1,19 +1,61 @@ + -Todo App - - - - -
Want more details?
-

-

Todo

-

Completed

-
- - + + Todo App + + + + + +
+
+ +
+ + +
+
+
+

Todo

+ +
+
+

Completed

+ +
+
+ + \ No newline at end of file diff --git a/style.css b/style.css index ab36227705..4e49f9d7d3 100644 --- a/style.css +++ b/style.css @@ -1,148 +1,159 @@ /* Basic Style */ body { - background-color: #f8f8f8; - color: #333; - font-family: Lato, sans-serif; + background-color: #f8f8f8; + color: #333; + font-family: Lato, sans-serif; } -.aaa { - width: 500px; - margin: 0 auto; - display: block; - text-align: right; +.aside { + width: 500px; + margin: 0 auto; + display: block; + text-align: right; } -.aaa img { - width: 100%; +.aside__eisenhower-matrix { + width: 100%; } -.aaa .more_inf { - font-family: fantasy, cursive; +.aside__more-inf-link { + font-family: fantasy, cursive; } @media (max-width:768px) { -.aaa { text-align: center; + .aside { text-align: center; } } -.centered-main-page-element { - display: block; - width: 500px; - margin: 0 auto 0; +.main_centered { + display: block; + width: 500px; + margin: 0 auto 0; } -.task { - width: 56%; - display: inline-block; - flex-grow: 1 -} -.task-row-wrapper { - display: flex; -} -ul { - margin:0; - padding: 0px; -} -li, h3 { - list-style:none; -} -input,button{ - outline:none; -} -button { - background: none; - border: 0px; - color: #888; - font-size: 15px; - width: 60px; - font-family: Lato, sans-serif; - cursor: pointer; -} -button:hover { - color: #3a3A3a; + +.task-form__input, +.tasks__input, +.tasks__label { + width: 56%; + display: inline-block; + flex-grow: 1; +} +.task-form__row { + display: flex; +} +.tasks__list { + margin: 0; + padding: 0px; +} +.tasks__item, +.tasks__title { + list-style: none; +} +.task-form__input, +.tasks__input, +.task-form__button, +.tasks__button { + outline: none; +} +.task-form__button, +.tasks__button { + background: none; + border: 0px; + color: #888; + font-size: 15px; + width: 60px; + font-family: Lato, sans-serif; + cursor: pointer; +} +.task-form__button:hover, +.tasks__button:hover { + color: #3a3A3a; } /* Heading */ -h3, -label[for='new-task'] { - color: #333; - font-weight: 700; - font-size: 15px; - border-bottom: 2px solid #333; - padding: 30px 0 10px; - margin: 0; - text-transform: uppercase; -} -input[type="text"] { - margin: 0; - font-size: 18px; - line-height: 18px; - height: 21px; - padding: 0 9px; - border: 1px solid #dDd; - background: #FFF; - border-radius: 6px; - font-family: Lato, sans-serif; - color: #888; -} -input[type="text"]:focus { - color: #333; +.tasks__title, +.task-form__label { + color: #333; + font-weight: 700; + font-size: 15px; + border-bottom: 2px solid #333; + padding: 30px 0 10px; + margin: 0; + text-transform: uppercase; +} +.task-form__input, +.tasks__input { + margin: 0; + font-size: 18px; + line-height: 18px; + height: 21px; + padding: 0 9px; + border: 1px solid #dDd; + background: #FFF; + border-radius: 6px; + font-family: Lato, sans-serif; + color: #888; +} +.task-form__input:focus, +.tasks__input:focus { + color: #333; } /* New Task */ -label[for='new-task'] { - display: block; - margin: 0 0 20px; +.task-form__label { + display: block; + margin: 0 0 20px; } -input#new-task { - width: 318px; +.task-form__input { + width: 318px; } /* Task list */ -li { - overflow: hidden; - padding: 20px 0; - border-bottom: 1px solid #eee; +.tasks__item { + overflow: hidden; + padding: 20px 0; + border-bottom: 1px solid #eee; - display: flex; - justify-content: space-between; - align-items: center; + display: flex; + justify-content: space-between; + align-items: center; } -li > * { - vertical-align: middle; +.tasks__item > * { + vertical-align: middle; } -li > input[type="checkbox"] { - margin: 0 10px; +.tasks__checkbox { + margin: 0 10px; } -li > label { - padding-left: 10px; - box-sizing: border-box; - font-size: 18px; - width: 226px; +.tasks__label { + padding-left: 10px; + box-sizing: border-box; + font-size: 18px; + width: 226px; } -li > input[type="text"] { - width: 226px +.tasks__input { + width: 226px; } -button.delete img { - height: 2em; - transform: rotateZ(45deg); - transition: transform 200ms ease-in; +.tasks__del-icon { + height: 2em; + transform: rotateZ(45deg); + transition: transform 200ms ease-in; } -button.delete img:hover { - transform: rotateZ(0); +.tasks__del-icon:hover { + transform: rotateZ(0); } /* Completed */ -ul#completed-tasks label { - text-decoration: line-through - color: #888; +.tasks__list#completed-tasks .tasks__label { + text-decoration: line-through; + color: #888; } /* Edit Task */ -ul li input[type=text] { - display:none +.tasks__input { + display: none; } -ul li.editMode input[type=text] { - display:inline-block; - width:224px +.tasks__item_edit-mode .tasks__input { + display: inline-block; + width: 224px; } -ul li.editMode label { - display:none; +.tasks__item_edit-mode .tasks__label { + display: none; } \ No newline at end of file