Skip to content

Camhickey #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariaWan wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Camhickey #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a2ad641
Changed todo names
viviangarcia Oct 28, 2019
70509a2
changed background color
bVelliquette Oct 28, 2019
3f2c506
Mariaa
MariaWan Oct 28, 2019
1befffb
I like powderblue
DavidSR56 Oct 28, 2019
03be79f
Changed todo names back to original
viviangarcia Oct 28, 2019
884912b
Merge pull request #3 from CEN3031-4d/ILikeCS
DavidSR56 Oct 28, 2019
6586ac1
Merge branch 'master' into new_background_color
MariaWan Oct 28, 2019
e592935
added comment
nlisiecka Oct 28, 2019
1e7541a
Merge pull request #1 from CEN3031-4d/new_background_color
MariaWan Oct 28, 2019
b7d3717
Merge pull request #2 from CEN3031-4d/vivian-test
MariaWan Oct 28, 2019
57e8fb5
Merge pull request #4 from CEN3031-4d/Maria
MariaWan Oct 28, 2019
b7b04f1
Merge branch 'master' into natalia
MariaWan Oct 28, 2019
005c9da
Merge pull request #5 from CEN3031-4d/natalia
MariaWan Oct 28, 2019
a1a5c42
test commit message
Oct 28, 2019
9e6e5b6
test commit
Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion todo-src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</head>

<body ng-app="app">
<h1 class="text-center">My little to do app!</h1>
<h1 class="text-center">My little to do app! Test commit: Cameron Hickey</h1>

<div id="todo" class="col-xs-6 col-xs-offset-3" ng-controller="MainCtrl">

Expand Down
4 changes: 2 additions & 2 deletions todo-src/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ myApp.controller('MainCtrl', function ($scope){
$scope.newItem = "";

$scope.addItem = function(){
console.log("in add");
console.log("in addition");// Maria
if ($scope.newItem !== ""){
$scope.todos.push($scope.newItem);
$scope.newItem = "";
Expand All @@ -33,4 +33,4 @@ myApp.controller('MainCtrl', function ($scope){
* - add a due date
* - add reminder (setInterval)
*
* *********************/
* *********************/
7 changes: 6 additions & 1 deletion todo-src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
/* Styles go here */
body {

background: grey;
/* Gray is boring */

/*hello*/

background: blue;


}