-
Notifications
You must be signed in to change notification settings - Fork 7
Henok & Monica's assignment #3
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
Open
monicaedavidson
wants to merge
6
commits into
SEA-Design-Dev:master
Choose a base branch
from
monicaedavidson:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b06609b
first commit
4cea9ba
Delete .DS_Store
monicaedavidson 6297c78
Delete .DS_Store
monicaedavidson 49a3986
spaces for BEM assignment
monicaedavidson 12d0cc9
Update bem.css
monicaedavidson bbe4632
Update bem.css
monicaedavidson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>Marissa and Loann</title> | ||
| <link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'> | ||
| <link rel="stylesheet" href="css/reset.css"> | ||
| <link rel="stylesheet" href="css/bem.css"> | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <nav> <!--changed from .main-nav__item --> | ||
| <ul> | ||
| <li class="item"> | ||
| <a class="link" href= "">Kenyon Institute</a></li> | ||
| <li class="item"> | ||
| <a class="link" href="#">Programs</a></li> | ||
| <li class="item"> | ||
| <a class="link" href="#">The Institute</a></li> | ||
| <li class="item"> | ||
| <a class="link" href="#">The Campus</a></li> | ||
| <li class="item"> | ||
| <a class="link" href="#">Request Info</a></li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
| <main class="main col_3_of_3"> | ||
| <h1 class="main__header">Main Introduction</h1> | ||
| <p class="intro">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu. Quisque maximus ut lorem suscipit molestie. Nullam interdum ante et maximus varius. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin interdum tellus tortor, sit amet placerat lectus gravida quis.</p> | ||
| </main> | ||
| <article class="dept col_3_of_3"> | ||
| <h1 class="dept__header">Programs</h1> | ||
| <section class="deptOne col_1_of_3"> | ||
| <h1 class="deptOne__header">Sample Header</h1> | ||
| <h2 class="deptOne__date"><time datetime="2014-11-03">November 3, 2014</time></h2> | ||
| <p class="deptOne__info">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.</p> | ||
| </section> | ||
| <section class="deptTwo col_1_of_3"> | ||
| <h1 class="deptTwo__header">Sample Header</h1> | ||
| <h2 class="deptTwo__date"><time datetime="2014-11-03">November 3, 2014</time></h2> | ||
| <p class="deptTwo__info">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.</p> | ||
| </section> | ||
| <section class="deptThree col_1_of_3"> | ||
| <h1 class="deptThree__header">Sample Header</h1> | ||
| <h2 class="deptThree__date"><time datetime="2014-11-03">November 3, 2014</time></h2> | ||
| <p class="deptThree__info">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.</p> | ||
| </section> | ||
| </article> | ||
| <form class="sign-up"> | ||
| <h1 class="sign-up__header">Sign up to receive more information</h1> | ||
| <label for="sign-up__email"></label> | ||
| <input class="sign-up__field" id="email" type="email" placeholder="Email"> | ||
| <button type="submit" class="sign-up__field--btn">Sign Up</button> | ||
| </form> | ||
| <section class="feature"> | ||
| <h1 class="feature__title">feature and Speakers</h1> | ||
| <figure class="feature__one col_1_of_4"> | ||
| <img class="feature__image" src="img/profile.jpg"/> | ||
| <h1 class="feature__header">Professor Name</h1> | ||
| <p class="feature__info">Professor Title and Department</p> | ||
| </figure> | ||
| <figure class="feature__two col_1_of_4"> | ||
| <img class="feature__image" src="img/profile.jpg"/> | ||
| <h1 class="feature__header">Professor Name</h1> | ||
| <p class="feature__info">Professor Title and Department</p> | ||
| </figure> | ||
| <figure class="feature__three col_1_of_4"> | ||
| <img class="feature__image" src="img/profile.jpg"/> | ||
| <h1 class="feature__header">Professor Name</h1> | ||
| <p class="feature__info">Professor Title and Department</p> | ||
| </figure> | ||
| <figure class="feature__four col_1_of_4"> | ||
| <img class="feature__image" src="img/profile.jpg"/> | ||
| <h1 class="feature__header">Professor Name</h1> | ||
| <p class="feature__info">Professor Title and Department</p> | ||
| </figure> | ||
| </section> | ||
| </body> | ||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Refractor Another Team's CSS | ||
|
|
||
| ##Overview | ||
|
|
||
| -We repaired the image tag for col 1_of_4 | ||
| -Changed the navigation from white to black (so that it appears on screen) | ||
| -Got rid of the main link on the nav bar | ||
| -Removed blue, yellow and green classes | ||
| -Got rid of height parameters dept 1-3 and main tags | ||
| -Switched <h1> tags to <h2> (there were multiple <h1> tags on the HTML) | ||
| -On dept. we added margin 0 auto to center | ||
| -Condensed CSS | ||
|
|
||
| ###Collaborators | ||
| Henok and Monica refractored this assignment |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| * { | ||
| -moz-box-sizing: border-box; /* Firefox 1, probably can drop this */ | ||
| -webkit-box-sizing: border-box; /* Safari 3-4, also probably droppable */ | ||
| box-sizing: border-box; /* Everything else */ | ||
| } | ||
|
|
||
| body { | ||
| font-size: 1em; | ||
| } | ||
| /* nav */ | ||
| nav { | ||
| width:100%; | ||
| height: 3em; | ||
| padding:5% 0; | ||
| text-align: center; | ||
| } | ||
|
|
||
| nav .item { | ||
| display: inline-block; | ||
| } | ||
|
|
||
| nav .link { | ||
| color: black; | ||
| margin:0 1em; | ||
| font-size: 1.5em; | ||
| text-decoration: none; | ||
| } | ||
| /* main intro */ | ||
| .main { | ||
| background-color:MediumOrchid; | ||
| padding:5% 0; | ||
| text-align:center; | ||
| } | ||
|
|
||
| .main__header { | ||
| color:white; | ||
| font-size: 5em; | ||
| width:100%; | ||
| } | ||
|
|
||
| .intro { | ||
| color:white; | ||
| font-size: 1em; | ||
| line-height: 1.5em; | ||
| width:600px; | ||
| margin:auto; | ||
| } | ||
|
|
||
| .dept { | ||
| margin: 0 auto; | ||
| display: inline-block; | ||
| width:100%; | ||
| text-align:center; | ||
| } | ||
|
|
||
| .dept__header { | ||
| text-align: center; | ||
| margin:3% 0; | ||
| text-transform: uppercase; | ||
| font-size: 1.25em; | ||
| color:gray; | ||
| } | ||
|
|
||
| .deptOne { | ||
| padding:3%; | ||
| display: inline-block; | ||
| background-color: SkyBlue; | ||
| } | ||
|
|
||
| .deptOne__header { | ||
| color:white; | ||
| font-size:1.1em; | ||
| } | ||
|
|
||
| .deptOne__date { | ||
| color:white; | ||
| font-size: 1em; | ||
| line-height: 2em; | ||
| } | ||
|
|
||
| .deptOne__info { | ||
| color:white; | ||
| line-height: 1em; | ||
| } | ||
|
|
||
| .deptTwo { | ||
| padding:3%; | ||
| display: inline-block; | ||
| background-color: LemonChiffon; | ||
| } | ||
|
|
||
| .deptTwo__header { | ||
| color:gray; | ||
| font-size:1.1em; | ||
| } | ||
|
|
||
| .deptTwo__date { | ||
| color:gray; | ||
| font-size: 1em; | ||
| line-height: 2em; | ||
| } | ||
|
|
||
| .deptTwo__info { | ||
| color:gray; | ||
| line-height: 1em; | ||
| } | ||
|
|
||
| .deptThree { | ||
| padding:3%; | ||
| display: inline-block; | ||
| background-color: MediumSeaGreen; | ||
| } | ||
|
|
||
| .deptThree__header { | ||
| color:white; | ||
| font-size:1.1em; | ||
| } | ||
|
|
||
| .deptThree__date{ | ||
| color:white; | ||
| font-size: 1em; | ||
| line-height: 2em; | ||
| } | ||
|
|
||
| .deptThree__info { | ||
| color:white; | ||
| line-height: 1em; | ||
| } | ||
| /* form section */ | ||
| .sign-up { | ||
| text-align: center; | ||
| display: block; | ||
| font-size: 1.25em; | ||
| cursor:pointer; | ||
| height:60px; | ||
| margin:10% 0; | ||
| } | ||
|
|
||
| .sign-up__field { | ||
| margin-top:20px; | ||
| width:275px; | ||
| height:35px; | ||
| padding:2px; | ||
| } | ||
| /* feature section */ | ||
| .feature { | ||
| text-align: center; | ||
| display: block; | ||
| width:100%; | ||
| } | ||
|
|
||
| .feature__title { | ||
| text-align: center; | ||
| margin:3% 0; | ||
| text-transform: uppercase; | ||
| font-size: 1.25em; | ||
| width:100%; | ||
| } | ||
|
|
||
| .feature__header { | ||
| margin-top:3px; | ||
| color:gray; | ||
| line-height: 1.5em; | ||
| } | ||
|
|
||
| .feature__info { | ||
| color:gray; | ||
| } | ||
|
|
||
| .feature__one { | ||
| display: inline-block; | ||
| padding:1%; | ||
| } | ||
|
|
||
| .feature__two { | ||
| display: inline-block; | ||
| padding:1%; | ||
| } | ||
|
|
||
| .feature__three { | ||
| height:450px; | ||
| display: inline-block; | ||
| padding:1%; | ||
| } | ||
|
|
||
| .feature__four { | ||
| height:450px; | ||
| display: inline-block; | ||
| padding:1%; | ||
| } | ||
|
|
||
| /*Grids*/ | ||
| .col_1_of_3 { | ||
| width: 25.25%; | ||
| } | ||
|
|
||
| .col_1_of_4 { | ||
| width: 21%; | ||
| } | ||
|
|
||
| /*GO FULL WIDTH AT LESS THAN 480 PIXELS */ | ||
|
|
||
| @media only screen and (max-width: 480px) { | ||
| .col_3_of_3 { | ||
| width: 100%; | ||
| } | ||
|
|
||
| .col_1_of_3 { | ||
| width: 100%; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (max-width: 480px) { | ||
|
|
||
| .col_4_of_4 { | ||
| width: 100%; | ||
| } | ||
| .col_1_of_4 { | ||
| width: 100%; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* 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: none; | ||
| } | ||
| blockquote, q { | ||
| quotes: none; | ||
| } | ||
| blockquote:before, blockquote:after, | ||
| q:before, q:after { | ||
| content: ''; | ||
| content: none; | ||
| } | ||
| table { | ||
| border-collapse: collapse; | ||
| border-spacing: 0; | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove all the extra space in this whole document.