diff --git a/css/main.css b/css/main.css index d7ceb59..0727f69 100644 --- a/css/main.css +++ b/css/main.css @@ -8,44 +8,3 @@ h1 { font-family: 'Anton', sans-serif; font-size: 1.5em; } - -/*=========================================*/ /*PARTIALS*/ -/*=========================================*/ - -/*Login Partial*/ - -/*.form-signin { - max-width: 330px; - padding: 15px; - margin: 0 auto; - margin-bottom: 10px; -} -.form-signin .form-signin-heading, -.form-signin .checkbox { - margin-bottom: 10px; -} -.form-signin .checkbox { - font-weight: normal; -} -.form-signin .form-control { - position: relative; - height: auto; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding: 10px; - font-size: 16px; -} -.form-signin .form-control:focus { - z-index: 2; -} -.form-signin input[type="email"] { - margin-bottom: -1px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} -.form-signin input[type="password"] { - margin-bottom: 10px; - border-top-left-radius: 0; - border-top-right-radius: 0; -}*/ \ No newline at end of file diff --git a/index.html b/index.html index 32115bd..fdbc988 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - +

Pin This!

@@ -32,10 +32,9 @@

Pin This!

- - - - + + + + \ No newline at end of file diff --git a/javascripts/app.js b/javascripts/app.js index ff2d7d1..3c73363 100644 --- a/javascripts/app.js +++ b/javascripts/app.js @@ -1,4 +1,4 @@ "use strict"; -var app = angular.module("PinThisApp",["ngRoute"]); +var app = angular.module("PinThisApp", ["ngRoute"]); diff --git a/javascripts/controllers/NavCtrl.js b/javascripts/controllers/NavCtrl.js index aaac44b..a71c6f7 100644 --- a/javascripts/controllers/NavCtrl.js +++ b/javascripts/controllers/NavCtrl.js @@ -8,11 +8,11 @@ app.controller("NavCtrl", function($scope) { }, { name:"All Items", - url:"#/items/list" + url:"#/boards/list" }, { name:"New Item", - url:"#/items/new" + url:"#/boards/new" } ]; }); diff --git a/javascripts/index.js b/javascripts/index.js deleted file mode 100644 index 93fb8d4..0000000 --- a/javascripts/index.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -console.log(poop) \ No newline at end of file diff --git a/partials/board-new.html b/partials/board-new.html new file mode 100644 index 0000000..d8b0f7f --- /dev/null +++ b/partials/board-new.html @@ -0,0 +1,14 @@ +

New Todo

+
+
+ + +
+ +
+ + +
+ + +
\ No newline at end of file diff --git a/partials/create-board.html b/partials/create-board.html deleted file mode 100644 index e69de29..0000000 diff --git a/partials/general-view.html b/partials/general-view.html index e69de29..baeb4d1 100644 --- a/partials/general-view.html +++ b/partials/general-view.html @@ -0,0 +1,37 @@ +
+
+
+ + + + +
+
+
+ +

Boards

+
+
+
+ + +
+ +
{{board.pin}}
+
{{board.assignedTo}}
+
+
+
+
+ +

My Boards

+
+
+
+
+
{{board.pin}}
+
{{board.assignedTo}}
+
+
+
+
\ No newline at end of file diff --git a/partials/login b/partials/login deleted file mode 100644 index ec8771f..0000000 --- a/partials/login +++ /dev/null @@ -1,17 +0,0 @@ -
-
diff --git a/partials/navbar.html b/partials/navbar.html index 0b68f69..a910803 100644 --- a/partials/navbar.html +++ b/partials/navbar.html @@ -1,8 +1,20 @@ -logo \ No newline at end of file + \ No newline at end of file diff --git a/pinSeed.json b/pinSeed.json index 8982585..a8488b2 100644 --- a/pinSeed.json +++ b/pinSeed.json @@ -3,7 +3,7 @@ "board0": { "title": "Boot 1", "assignedTo": "Helana", - "uid":"" + "uid":"rVXxyfbQWDQBScEly0CQyg4XXT33" }, "board1": { "title": "Boot 2", @@ -28,7 +28,7 @@ "board5": { "title": "Boot 6", "assignedTo": "Helana", - "uid":"" + "uid":"rVXxyfbQWDQBScEly0CQyg4XXT33" }, "board6": { "title": "Boot 7", @@ -44,7 +44,7 @@ "board8": { "title": "Boot 9", "assignedTo": "Helana", - "uid":"" + "uid":"rVXxyfbQWDQBScEly0CQyg4XXT33" }, "board9": { @@ -60,7 +60,7 @@ "board11": { "title": "Boot 12", "assignedTo": "Helana", - "uid":"" + "uid":"rVXxyfbQWDQBScEly0CQyg4XXT33" } }, "pins": { diff --git a/styles/main.css b/styles/main.css new file mode 100644 index 0000000..f5ae36e --- /dev/null +++ b/styles/main.css @@ -0,0 +1,71 @@ +body h1 { + color: green; + text-align: center; } + +.search-bar { + text-align: center; } + .search-bar input { + margin-bottom: 20px; } + +#incomplete-tasks, #completed-tasks { + padding-left: 40px; + padding-right: 40px; } + +.new-text-container { + padding: 20px 0px; } + +.newtodo-input { + padding-top: 5px; } + +.inputTask { + display: none; + width: 93%; + margin-left: 10px; + margin-top: 6px; } + +.inputLabel { + font-size: 18px; + line-height: 40px; + width: 237px; + padding: 0 0 0 11px; } + +.checkboxStyle { + margin-top: 15px !important; } + +h3 { + color: #333; + font-weight: 700; + font-size: 15px; + border-bottom: 2px solid #333; + padding: 30px 0 10px; + margin: 0; } + +li * { + float: left; } + +li, h3 { + clear: both; + list-style: none; } + +label[for='new-task'] { + display: block; + margin: 0 0 20px; } + +input#new-task { + float: left; + width: 318px; } + +li { + overflow: hidden; + padding: 20px 0; + border-bottom: 1px solid #eee; } + +#completed-tasks label { + text-decoration: line-through; + color: #888; } + +ul li.editMode input[type=text] { + display: block; } + +ul li.editMode label { + display: none; }