Skip to content
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.

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

Marcus kwan #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -32,4 +32,6 @@ Once you have finished the home page using flex box module, go build the service
## Stretch Goals

* [ ] Create another page based on one of the navigation items in addition to services. Try to create a layout that follows the patterns of the first two designs but with your own creative twist. Use lorem ipsum text for all your content.
* [ ] Introduce media queries into your services page to create a mobile view that stacks all the boxes on top of each other on phone but looks like the layout file on desktop.
* [ ] Introduce media queries into your services page to create a mobile view that stacks all the boxes on top of each other on phone but looks like the layout file on desktop.

Name: Marcus Kwan
142 changes: 141 additions & 1 deletion great-idea/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,144 @@ h1, h2, h3, h4, h5 {
margin-bottom: 15px;
}

/* Copy and paste your work from yesterday here and start to refactor into flexbox */
/* Your code starts here! */

.container {
width: 880px;
/* border: 10px dashed black; */
margin: auto;
display: flex;
flex-flow: wrap;
}

header {
/* border: 5px dashed orange; */
padding: 20px 20px 20px;
display: flex;
flex-flow: wrap;
align-items: center;
}

nav {
/* border: 3px solid red; */
}

nav a {
color: grey;
text-decoration: none;
padding: 0 25px 0px;
/* border: 3px solid blue; */
}

.intro-container {
text-align: center;
display: flex;
flex-flow: wrap;
justify-content: space-evenly;
align-items: center;
/* border: 3px solid green; */
}

.intro {
/* border: 4px dashed red; */
width: 450px;
text-align: center;
padding: 0px 0px 40px;
display: flex;
flex-direction: column;
align-items: center;
}

.intro h1 {
font-size: 50pt;
/* border: 1px dashed red; */
}


.introimg {
width: 30%;
/* border: 1px dashed red; */
/* TRBL*/
padding: 20px 10px 10px 20px;
}

.intro button {
padding: 5px 40px 5px;
border: 1px solid black;
font-family: 'Titillium Web';
}

header p {
text-align: center;
border: 1px solid black;
width: 150px;
}
.codeimg {
width: 30%;
height: 30%;
/*TRBL*/
padding: 0 20px 20px 100px;
}

.top-content {
border-top: 1px solid black;
padding: 30px 0 30px;
display: flex;
flex-flow: wrap;
}


.top-content .features {
/* border: 1px solid red; */
width: 49%;
margin-right: 5px;

}

.top-content .about {
/* border: 1px solid red; */
width: 49%;
}

.middle-img {
display: block;
width: 100%;
}

.bottom-content {
border-bottom: 1px solid black;
padding: 20px 0 30px;
display: flex;
flex-flow: wrap;
}

.bottom-content .services {
width: 32%;
/* border: 1px solid red; */

}

.bottom-content .product {
width: 32%;
margin: 0px 10px 0px;
}

.bottom-content .vision {
width: 32%;
}

.contact-content {
margin-top: 30px;
width: 100%;
}

footer {
margin-bottom: 10%;
align-self: center;
}

footer {
width: 100%;
text-align: center;
margin: 50px 0px 50px; 10px;
}
173 changes: 173 additions & 0 deletions great-idea/css/services.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: square;
padding: 20px 0px 20px 0px;
margin: 20px 0px 20px 20px;
}

blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}

/* Set every element's box-sizing to border-box */
* {
box-sizing: border-box;
}

html, body {
height: 100%;
font-family: 'Titillium Web', sans-serif;
}

h1, h2, h3, h4, h5 {
font-family: 'Bangers', cursive;
letter-spacing: 1px;
margin: 10px 0px 10px 0px;
}

h1 {
font-size: 30px;
}

.container {
width: 900px;
/* border: 10px dashed black; */
margin: auto;
display: flex;
flex-flow: wrap;
justify-content: space-between;
align-content: center;
}

header {
width: 100%;
display: flex;
margin: 20px 0px 20px 0px;
align-items: center;
justify-content: space-between;
}

nav {
padding: 0 25px 0px 0px;
}

nav a {
color: grey;
text-decoration: none;
padding: 0 55px 0px 0px;
}

button {
width: 150px;
height: 35px;
padding: 5px 40px 5px;
margin: 10px 0px 10px 0px;
border: 1px solid black;
border-radius: 5px;
font-family: 'Titillium Web';
}

p {
margin: 10px 0px 10px 0px;
}

img.services-header-img {
margin: 10px 0px 10px 0px;
width: 100%;
}

div.intro {
margin: 10px 0px 10px 0px;
padding: 20px 0px 20px 0px;
border-bottom: 1px solid black;
}


section.types {
display: flex;
flex-wrap: wrap;
width: 100%;
border-bottom: 1px solid black;
justify-content: space-between;
}

section.types div {
width: 47%;
display: flex;
flex-direction: column;
align-items: baseline;
padding: 10px 10px 10px 10px;
margin: 30px 10px 10px 10px;
border: 1px solid black;
background-color: lightgrey;

}

section.facts-section {
display: flex;
justify-content: space-between;
}

div.facts {

}

section.facts-section div.facts {
display: flex;
flex-direction: column;
width: 40%;
justify-content: space-evenly;
margin: 10px; 0px; 10px; 0px;
}

footer {
width: 100%;
text-align: center;
margin: 50px 0px 50px; 10px;
}

img.services-info-img {
width: 40%;
height: auto;
}
Loading