Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
8a51ff8
Add picture for W
ADRIENNE-DRAKE Oct 20, 2021
0192c46
Updated index for letter W
ADRIENNE-DRAKE Oct 20, 2021
b7204cb
b added
qabach2 Oct 20, 2021
84cd683
b created
qabach2 Oct 20, 2021
a011f1f
Add picture for C and update index
ADRIENNE-DRAKE Oct 20, 2021
799549e
salt photo added
laxmip21 Oct 20, 2021
69d1569
Added picture for K and updated index
ADRIENNE-DRAKE Oct 20, 2021
b41fbef
Added picure for letter K and updated index
ADRIENNE-DRAKE Oct 20, 2021
d9ad2a3
added readme
qabach2 Oct 20, 2021
1925d99
Merge pull request #31 from qabach2/3-letter
ADRIENNE-DRAKE Oct 20, 2021
9748f40
Merge pull request #28 from qabach2/24-W-Branch
ADRIENNE-DRAKE Oct 20, 2021
d73be68
Merge pull request #29 from qabach2/1-C-Branch
ADRIENNE-DRAKE Oct 20, 2021
0f74fde
apple added
qabach2 Oct 20, 2021
81c0986
Paper photo added
laxmip21 Oct 20, 2021
a4d16b0
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 20, 2021
41e886b
Merge branch 'main' into 4-LetterA
qabach2 Oct 20, 2021
6c0f000
Merge pull request #33 from qabach2/4-LetterA
ADRIENNE-DRAKE Oct 20, 2021
949ba02
Merge pull request #34 from qabach2/10-letterp
ADRIENNE-DRAKE Oct 20, 2021
4e2b5e7
hat added again
qabach2 Oct 21, 2021
463c05c
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
qabach2 Oct 21, 2021
034fecf
hatt added
qabach2 Oct 21, 2021
7ec5e6b
pls hat added
qabach2 Oct 21, 2021
c1e7de9
ice-cream added
qabach2 Oct 21, 2021
dd656c4
Add picture for letter T and updated index
ADRIENNE-DRAKE Oct 21, 2021
a965461
Update T branch
ADRIENNE-DRAKE Oct 21, 2021
96db370
Updated W branch
ADRIENNE-DRAKE Oct 21, 2021
18777bc
Merge branch 'main' of github.com:qabach2/ABC-scrum-github-activity i…
ADRIENNE-DRAKE Oct 21, 2021
213767c
Photo of diary added
laxmip21 Oct 21, 2021
c3068bc
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
7281e75
Update C branch
ADRIENNE-DRAKE Oct 21, 2021
4a9a50f
Merge branch 'main' into 1-C-Branch
ADRIENNE-DRAKE Oct 21, 2021
dcfc2fe
mail photo added
laxmip21 Oct 21, 2021
d604993
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
8d4cb96
Add picture and text to L branch
ADRIENNE-DRAKE Oct 21, 2021
78fa20c
video camera added
laxmip21 Oct 21, 2021
3ebca76
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
48190db
Merge pull request #43 from qabach2/8-letterm
ADRIENNE-DRAKE Oct 21, 2021
72e4b9a
Merge pull request #37 from qabach2/13-LetterH
ADRIENNE-DRAKE Oct 21, 2021
984d953
Added picture and text for R branch
ADRIENNE-DRAKE Oct 21, 2021
41a257d
Merge branch 'main' of github.com:qabach2/ABC-scrum-github-activity i…
ADRIENNE-DRAKE Oct 21, 2021
3d2d0d2
green added
qabach2 Oct 21, 2021
4f372ba
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
qabach2 Oct 21, 2021
1de405a
Merge pull request #44 from qabach2/6-L-Branch
qabach2 Oct 21, 2021
254a8db
Merge pull request #45 from qabach2/14-R-Branch
qabach2 Oct 21, 2021
58231c6
Merge pull request #41 from qabach2/5-letterd
qabach2 Oct 21, 2021
6b9f56d
Merge pull request #42 from qabach2/1-C-Branch
laxmip21 Oct 21, 2021
704e023
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
0206d10
Merge branch 'main' into 24-W-Branch
ADRIENNE-DRAKE Oct 21, 2021
dd25660
Merge pull request #40 from qabach2/24-W-Branch
ADRIENNE-DRAKE Oct 21, 2021
12152a5
Merge branch 'main' into 19-T-Branch
ADRIENNE-DRAKE Oct 21, 2021
cb362f0
Merge pull request #39 from qabach2/19-T-Branch
ADRIENNE-DRAKE Oct 21, 2021
a51af13
16-g added
qabach2 Oct 21, 2021
b229612
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
qabach2 Oct 21, 2021
cc4a695
Conflicts resolved on branch
ADRIENNE-DRAKE Oct 21, 2021
d8ed469
juice added
qabach2 Oct 21, 2021
84ec9e6
juice added again
qabach2 Oct 21, 2021
014e136
fork added
qabach2 Oct 21, 2021
d3d7c0e
Merge pull request #50 from qabach2/21-LetterF
ADRIENNE-DRAKE Oct 21, 2021
c865a6d
Picture and text for letter U
ADRIENNE-DRAKE Oct 21, 2021
6b17c40
Merge branch 'main' of github.com:qabach2/ABC-scrum-github-activity i…
ADRIENNE-DRAKE Oct 21, 2021
ea4b92a
x added
qabach2 Oct 21, 2021
4cc12e8
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
qabach2 Oct 21, 2021
3af20c0
Zepper added
qabach2 Oct 21, 2021
e866035
question mark photo added
laxmip21 Oct 21, 2021
aa824e8
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
535dede
Merge pull request #53 from qabach2/22-LetterX
laxmip21 Oct 21, 2021
7daf8de
Picture and text added for letter Y
ADRIENNE-DRAKE Oct 21, 2021
34a0f33
Merge branch 'main' of github.com:qabach2/ABC-scrum-github-activity i…
ADRIENNE-DRAKE Oct 21, 2021
8b9d9f4
Merge pull request #54 from qabach2/20-U-Branch
laxmip21 Oct 21, 2021
6b728a4
opporunity photo added
laxmip21 Oct 21, 2021
b9480e3
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
4e21bc3
Picture and text added for lette N
ADRIENNE-DRAKE Oct 21, 2021
a55cfd6
Merge pull request #56 from qabach2/23-LetterZ
ADRIENNE-DRAKE Oct 21, 2021
1eac09f
Merge branch 'main' of https://github.com/qabach2/ABC-scrum-github-ac…
laxmip21 Oct 21, 2021
d5ea85d
Merge pull request #58 from qabach2/27-N-Branch
qabach2 Oct 21, 2021
f2ce883
Merge pull request #57 from qabach2/25-Y-Branch
qabach2 Oct 21, 2021
b3239e8
Merge pull request #59 from qabach2/9-lettero
qabach2 Oct 21, 2021
cf45366
Merge pull request #55 from qabach2/11-letterq
qabach2 Oct 21, 2021
cc66f5b
Merge pull request #52 from qabach2/19-T-Branch
qabach2 Oct 21, 2021
2b32551
Merge pull request #47 from qabach2/26-letterv
qabach2 Oct 21, 2021
7c7c60a
Updated text on K branch
ADRIENNE-DRAKE Oct 21, 2021
16f18bf
Updates to letter K branch
ADRIENNE-DRAKE Oct 21, 2021
bc67ec9
Updates to K branch
ADRIENNE-DRAKE Oct 21, 2021
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
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
- You do not have to add any additional HTML code, you just need to add text inside of the existing "h1", "h3" tags and the "src" attributes inside of the "img" tags.

## Begin this activity by... ##
- Having a scrum meeting!
- Having a scrum meeting!

- Your team should create a project board and then create an issue for EVERY letter. This is repetitive, and is meant to be used as practice. Start your first sprint by prioritizing the first easy items(letters) people have access to, once everyone is done with their letter, close the issues and then move to the next letters.


- Practice branching in your repository by creating a new branch for every letter that you work on. For example if you personally get tasked with letter C, then create a branch called "letterC". Once you finish that letter and are done with the branch, make sure to create a new branch for your next letter. For example, if you are next tasked with letter F your branch would be "letterF".

Expand All @@ -38,3 +39,4 @@

- Remember that since you are "forking" this repository you do NOT need to create a new repository. Forking will do that for you, and grab all necessary starter code. Start by cloning the repo to your local machine after forking and adding collaborators. Don't forget to set the security on your main branch though!


Empty file added bag.txt
Empty file.
101 changes: 51 additions & 50 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ <h3>Presented by...</h3>
<div class="row">
<div class="col-12">
<!-- Enter each persons name in place of the "Insert Name Here" below -->

<h5></h5>

<h5>Adrienne Drake</h5>
<h5>Insert Name Here</h5>
<h5>Insert Name Here</h5>
<h5>Insert Name Here</h5>
<h5>Insert Name Here</h5>
<h5>Insert Name Here</h5>
<h5>Mahlet Hailu</h5>
</div>
</div>
<br>
Expand All @@ -37,10 +38,10 @@ <h5>Insert Name Here</h5>
<div class="row">
<div class="col-4">
<h1 class="display-1">A</h1>
<h3>For Appa</h3>
<h3>For apple</h3>
</div>
<div class="col-8">
<img src="./photos/a-appa.jpg" class="img-thumbnail">
<img src="./photos/A-apple.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -50,11 +51,11 @@ <h3>For Appa</h3>
<div class="row">
<div class="col-4">
<h1 class="display-1">B</h1>
<h3>For Beans (Sofie)</h3>
<h3> For B (bag)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="./photos/b-beans.jpg" class="img-thumbnail">
<img src="./photos/B-bag.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -63,12 +64,12 @@ <h3>For Beans (Sofie)</h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">C</h1>
<h3>For Calendar</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/c-calendar.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand Down Expand Up @@ -106,11 +107,11 @@ <h3></h3>
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h3>F (fork)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/F-fork.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -120,11 +121,11 @@ <h3></h3>
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h3>G (green)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/G-green.jpgc" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -134,11 +135,11 @@ <h3></h3>
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h3>H (hat)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/H-hat.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -148,11 +149,11 @@ <h3></h3>
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h3>I (ice-cream)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/I-ice-cream.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -161,12 +162,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">J</h1>
<h3>J (juice)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/J-juice.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -175,12 +176,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">K</h1>
<h3>For Keys</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/k-keys.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -189,12 +190,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">L</h1>
<h3>For Lighter</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/L-Lighter.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -217,12 +218,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">N</h1>
<h3>For Nike</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/n-Nike.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand Down Expand Up @@ -273,12 +274,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">R</h1>
<h3>For Red</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/r-red.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -301,12 +302,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">T</h1>
<h3>For Tea</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/t-tea.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -315,12 +316,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">U</h1>
<h3>For Umbrella</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/u-umbrella.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -343,12 +344,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">W</h1>
<h3>For Weights</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/w-weight.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -358,11 +359,11 @@ <h3></h3>
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h3>X (for X</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/X-forX.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -371,12 +372,12 @@ <h3></h3>
<!-- Reference letter A for help, all details should be the same except for the letter in the h1 tag, the description in the h3 tag, and the path to the image "src". -->
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h1 class="display-1">Y</h1>
<h3>For Yellow</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/y-yellow.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand All @@ -386,11 +387,11 @@ <h3></h3>
<div class="row">
<div class="col-4">
<h1 class="display-1"></h1>
<h3></h3>
<h3>Z (zepper)</h3>
</div>
<div class="col-8">
<!-- insert pathway to image inside the quotation marks in the 'src' -->
<img src="" class="img-thumbnail">
<img src="./photos/Z- zepper.jpg" class="img-thumbnail">
</div>
</div>
<hr>
Expand Down
Binary file added photos/A-apple.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading