Skip to content

Uploading #1

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Uploading #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4182385
Uploading
Resiid Feb 17, 2020
c2cef6a
changes made to project
Resiid Feb 19, 2020
69d9bc1
whatever changes
Resiid Feb 19, 2020
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
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,18 @@ You will need to follow the Lambda School Git Workflow to add a file to this pro
## Stretch
Stretch Review questions:
1. What is the difference between an inline element and a block element?
2. What happens when an element is positioned absolutely?

- Conceptual difference - Block elements cant go inside inline elements
2. What happens when an element is positioned absolutely?
- The element is now 'stuck' or 'fixed' wherever you've placed it.
3. How do I make an element take up only the amount of space it needs but also have the ability to give it a width?
-Modifying the padding
4. Name 3 elements that are diplay block by default, 2 elements that are display inline by default and 1 element that is display inline-block by default
- None, Block, Inline and Inline-Block
5. In your own words, explain the box model. What is the fix for the box model?
- The box model represents a literal box but in CSS the parts of the box provide elements you can adjust/modify. Each individual element in the box model has a different place in the box. External to internal the box would go Margin > Border > padding > Content
Stretch Git Tasks

- [ ] While the processes learned here will set you up to be successful in most situations, they are just the tip of the iceberg in learning Git. Independently research the following topics to learn more about Git.
- [ ] Research and understand what a `merge conflict` is and how to resolve it.
- [ ] Research the Git commands `pull`, `rebase`, `merge`. These commands will allow you to bring in changes that other developers push to the master branch.
Expand Down