Skip to content

Finished Sprint #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
karlamartinezmoctez wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Finished Sprint #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77eb570
Finished Sprint
karlamartinezmoctez46 Jan 25, 2020
f298c70
updated project
karlamartinezmoctez46 Jan 25, 2020
47e0519
sprint
karlamartinezmoctez46 Jan 27, 2020
b6e898c
fixing answers
karlamartinezmoctez46 Jan 28, 2020
84f6837
karla-martinez
karlamartinezmoctez46 Jan 28, 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
12 changes: 11 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,29 @@ In meeting the minimum viable product (MVP) specifications listed below, your we
Demonstrate your understanding of this week's concepts by answering the following free-form questions.

Edit this document to include your answers after each question. Make sure to leave a blank line above and below your answer so it is clear and easy to read by your project manager

//
//
//
1. If you were to describe semantic HTML to the next cohort of students, what would you say?
Sematics HTML means a way to markup HTML in which the tags describes it's meaning clearly within the tag lines to both the browser and the developer. Sematic means meaning, in this case it gives the tags meaning.

2. Name two big differences between ```display: block;``` and ```display: inline;```.
Two differences are that display:inline-block allows to set a width and height on the element and the top and bottom margins/paddings are respected.

3. What are the 4 areas of the box model?
Content, padding, border, and margin.

4. While using flexbox, what axis does the following property work on: ```align-items: center```?
On the verticle axis.

5. Explain why git is valuable to a team of developers.
Git provides a centralized, cloud-based location to storem share, publish, test, collaborate between developers. It also allows for version control.

//

You are expected to be able to answer all these questions. Your responses contribute to your Sprint Challenge grade. Skipping this section *will* prevent you from passing this challenge.

test
## Project Set Up

- [ ] Create a forked copy of this project.
Expand Down
96 changes: 66 additions & 30 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,53 +12,87 @@
</head>

<body>
<div class="container about-page">

About
<div class="headerContainer">
<img src="img/lambda-black.png" alt="lambdaLogo">
<nav class = "navBar">
<a href="index.html">Home</a>
<a href="#">About</a>
<a href="#">Products</a>
<a href="#">Blog</a>
<a href="#">Contact</a>
</nav>

Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.
</div>

<img class="banner" src="img/jumbo-about.png" alt="aboutBanner">

<img src="img/about-plan.png" alt="strategy">

Strategy

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.
<div class="container about-page">

Learn More
<div class = "aboutSection">
<h1>About</h1>

<p>Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.</p>
</div>

<div class = "rowContainter">

<img src="img/about-working.png" alt="strategy">

How We Work

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.
<div class="firstRow">
<div class="strategy">
<div class="sectionContainer">

Learn More
<img src="img/about-plan.png" alt="strategy">

</div>

<h2>Strategy</h2>

<p>Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>

<button>Learn More</button>
</div>

<img src="img/about-office.png" alt="strategy">

Places We Work

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.
<div class="howWeWork">
<img src="img/about-working.png" alt="strategy">

<h2>How We Work</h2>

<p>Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>

Learn More
<button>Learn More</button>
</div>
</div>

<img src="img/about-meeting.png" alt="strategy">

Collaboration

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.
<div class="secondRow">
<div class="placeWeWork">
<img src="img/about-office.png" alt="strategy">
<h2>Places We Work</h2>

Learn More
<p>Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>

Let's Work Together
<button>Learn More</button>
</div>

Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.
<div class="collaboration">
<img src="img/about-meeting.png" alt="strategy">

<h2>Collaboration</h2>

<p>Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>

<button>Learn More</button>
</div>
</div>
</div>
</div>
</div>
<div class="letsWork">
<h2>Let's Work Together</h2>

<p>Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.</p>
</div>

<footer>
<nav>
<a href="index.html">Home</a>
Expand All @@ -68,6 +102,8 @@
<a href="#">Contact</a>
</nav>
</footer>
</div><!-- container -->
</div>

<!-- container -->
</body>
</html>
114 changes: 112 additions & 2 deletions css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,19 @@ p {
.middle-content .boxes .box {
width: 12.5%;
height: 100px;
background: black;
/* background: black; */
margin: 20px 2.5%;
color: white;
display: flex;
align-items: center;
justify-content: center;
}

/* //using nth child
.box:nth-child(1){
background-color: red;
} */

.bottom-content {
display: flex;
margin: 0 2% 20px;
Expand Down Expand Up @@ -143,4 +148,109 @@ footer nav {
footer nav a {
color: white;
text-decoration: none;
}
}

/* CODE STARTS HERE */
/* logo and image */
.headerContainer{
display:flex;
flex-direction: row;
width: 100%;
margin: 2% 20% 0% 19%;
align-items: baseline;
}

.navBar{
width: 45%;
display: flex;
justify-content: space-between;
margin: 0% 10% 0% 3%
}

.navBar a{
color: black;
text-decoration: none;
}

.banner{
margin: 4% 20% 2% 19%;
}


#one {
background:teal;
}

#two{
background-color:gold;
}
#three
{
background-color:cadetblue;
}
#four{
background-color:coral;
}
#five{
background-color:crimson;
}
#six{
background-color:forestgreen;
}
#seven{
background-color:darkorchid;
}
#eight{
background-color:hotpink;
}
#nine{
background-color:indigo;
}
#ten{
background-color:dodgerblue;
}

/* ABOUT PAGE */
.aboutSection{
margin: 3% 3%;
/* padding-bottom: 1%; */
}

/* .sectionContainer{
border-top: 1px dashed black;

} */

.firstRow, .secondRow{
display: flex;
flex-direction: row;
/* width: 20%; */
margin: 3% 3%;
/* padding: 30px; */
/* border-bottom: 1px dashed black; */
align-content: space-between;

}
/* .firstRow{
padding:90;
} */

.rowContainter{
margin-top: 3%;
border-top: 1px dashed black;
}

.letsWork{
margin: 0% 18% 0% 18%;
padding-bottom: 3%;
}

.strategy, .howWeWork, .placeWeWork, .collaboration{
border-bottom: 1px dashed black;
padding: 3px;
margin: 0% 13% 0% -4%;
}

/* button{
background: red;
} */
34 changes: 24 additions & 10 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
</head>

<body>
<div class="headerContainer">
<img src="img/lambda-black.png" alt="lambdaLogo">
<nav class = "navBar">
<a href="about.html">Home</a>
<a href="#">About</a>
<a href="#">Products</a>
<a href="#">Blog</a>
<a href="#">Contact</a>
</nav>

</div>

<img class="banner" src="img/jumbo.jpg" alt="homeBanner">

<div class="container">

<section class="top-content">
Expand All @@ -30,16 +44,16 @@ <h2>The Past</h2>
<h2>Why Did It Have To Be Boxes...</h2>

<div class="boxes">
<div class="box">Box 1</div>
<div class="box">Box 2</div>
<div class="box">Box 3</div>
<div class="box">Box 4</div>
<div class="box">Box 5</div>
<div class="box">Box 6</div>
<div class="box">Box 7</div>
<div class="box">Box 8</div>
<div class="box">Box 9</div>
<div class="box">Box 10</div>
<div class="box" id="one">Box 1</div>
<div class="box" id="two">Box 2</div>
<div class="box" id="three">Box 3</div>
<div class="box" id="four">Box 4</div>
<div class="box" id="five">Box 5</div>
<div class="box" id="six">Box 6</div>
<div class="box" id="seven">Box 7</div>
<div class="box" id="eight">Box 8</div>
<div class="box" id="nine">Box 9</div>
<div class="box" id="ten">Box 10</div>
</div>

</section>
Expand Down