-
Notifications
You must be signed in to change notification settings - Fork 7
Galen and Sheyna: Our Refactor Assignment #2
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
sheyna
wants to merge
7
commits into
SEA-Design-Dev:master
Choose a base branch
from
sheyna: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
7 commits
Select commit
Hold shift + click to select a range
6f7335b
Added files to git
sheyna 198c061
add Readme
gkbroderick 512c4f0
Added gitignore.
sheyna 9b8f2f0
Merge branch 'master' of https://github.com/sheyna/refactor-another-a…
sheyna d01f8ad
removed DS_Store.
sheyna 88ae03b
Update README.md
gkbroderick 549d480
Update README.md
gkbroderick 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,37 @@ | ||
| # Compiled source # | ||
| ################### | ||
| *.com | ||
| *.class | ||
| *.dll | ||
| *.exe | ||
| *.o | ||
| *.so | ||
|
|
||
| # Packages # | ||
| ############ | ||
| # it's better to unpack these files and commit the raw source | ||
| # git has its own built in compression methods | ||
| *.7z | ||
| *.dmg | ||
| *.gz | ||
| *.iso | ||
| *.jar | ||
| *.rar | ||
| *.tar | ||
| *.zip | ||
|
|
||
| # Logs and databases # | ||
| ###################### | ||
| *.log | ||
| *.sql | ||
| *.sqlite | ||
|
|
||
| # OS generated files # | ||
| ###################### | ||
| .DS_Store | ||
| .DS_Store? | ||
| ._* | ||
| .Spotlight-V100 | ||
| .Trashes | ||
| ehthumbs.db | ||
| Thumbs.db |
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,118 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>Kenyon Institute</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/style.css"> | ||
| </head> | ||
|
|
||
| <body> | ||
|
|
||
| <header> | ||
| <nav class="main-nav color3"> | ||
| <ul> | ||
| <li class="main-nav__item"> | ||
| <a href="#">Kenyon Institute</a> | ||
| </li> | ||
|
|
||
| <li class="main-nav__item"> | ||
| <a href="#">Programs</a> | ||
| </li> | ||
|
|
||
| <li class="main-nav__item"> | ||
| <a href="#">The Institute</a> | ||
| </li> | ||
|
|
||
| <li class="main-nav__item"> | ||
| <a href="#">The Campus</a> | ||
| </li> | ||
|
|
||
| <li class="main-nav__item"> | ||
| <a href="#">Request Info</a> | ||
| </li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
|
|
||
| <section class="hero col_3_of_3"> | ||
| <h1 class="hero__title">Main Introduction</h1> | ||
| <p class="hero__text">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> | ||
| </section> | ||
|
|
||
| <article class="feature col_3_of_3"> | ||
| <h1 class="headline-subhead">Programs</h1> | ||
|
|
||
| <section class="feature__box color1 col_1_of_3"> | ||
| <h2>Sample Header</h2> | ||
| <h3><time datetime="2014-11-03">November 3, 2014</time></h3> | ||
| <p>Lorem ipsum dolor sit amet, consectetur adipiscing | ||
| elit. Maecenas in mi urna. Phasellus rhoncus tempor | ||
| velit, vitae finibus felis.</p> | ||
| <img src="img/icon1.gif"> | ||
| </section> | ||
|
|
||
| <section class="feature__box color2 col_1_of_3"> | ||
| <h2>Sample Header</h2> | ||
| <h3><time datetime="2014-11-03">November 3, 2014</time></h3> | ||
| <p>Lorem ipsum dolor sit amet, consectetur adipiscing | ||
| elit. Maecenas in mi urna. Phasellus rhoncus tempor | ||
| velit, vitae finibus felis.</p> | ||
| <img src="img/icon2.gif"> | ||
| </section> | ||
|
|
||
| <section class="feature__box color3 col_1_of_3"> | ||
| <h2>Sample Header</h2> | ||
| <h3><time datetime="2014-11-03">November 3, 2014</time></h3> | ||
| <p>Lorem ipsum dolor sit amet, consectetur adipiscing | ||
| elit. Maecenas in mi urna. Phasellus rhoncus tempor | ||
| velit, vitae finibus felis.</p> | ||
| <img src="img/icon3.gif"> | ||
| </section> | ||
| </article> | ||
|
|
||
| <form class="sign-up"> | ||
| <label for="email" class="headline-subhead clearfix"> | ||
| Sign up to receive more information</label> | ||
| <input class="sign-up__field" id="email" type="email" placeholder="Email"> | ||
| <button type="submit" class="sign-up__btn">Sign Up</button> | ||
| </form> | ||
|
|
||
| <section class="feature col_4_of_4"> | ||
| <h1 class="headline-subhead">feature and Speakers</h1> | ||
|
|
||
| <figure class="profile col_1_of_4"> | ||
| <img src="img/professor_smith.jpg"/> | ||
| <figcaption>Professor Name</figcaption> | ||
| <p>Professor Title and Department</p> | ||
| </figure> | ||
|
|
||
| <figure class="profile col_1_of_4"> | ||
| <img src="img/professor_davis.jpg"/> | ||
| <figcaption>Professor Name</figcaption> | ||
| <p>Professor Title and Department</p> | ||
| </figure> | ||
|
|
||
| <figure class="profile col_1_of_4"> | ||
| <img src="img/professor_keller.jpg"/> | ||
| <figcaption>Professor Name</figcaption> | ||
| <p>Professor Title and Department</p> | ||
| </figure> | ||
|
|
||
| <figure class="profile col_1_of_4"> | ||
| <img src="img/professor_green.jpg"/> | ||
| <figcaption>Professor Name</figcaption> | ||
| <p>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,21 @@ | ||
| #Refactor Another Team's Project | ||
| ###Sheyna and Galen's refactor of Loann and Marissa's Core CSS Site | ||
|
|
||
| For Code Fellow's UX/Front End Accelerator. | ||
| Images from [morguefile.com](morguefile.com) | ||
|
|
||
| ##Major Changes | ||
| - CSS Formatting | ||
| - Fixed spacing in rule and property declarations | ||
| - Updated commented section names | ||
| - Fix BEM | ||
| - Change class names to be more semantic - ie .main into .hero | ||
| - Removed complex class names that could be easily accessed by selector - ie .profile__header into .profile figcaption | ||
| - Class Compression | ||
| - Combined redundant numbered classes | ||
| - Made class for page subheaders | ||
| - Cleaned up .feature and made it more modular (modifies both Events and Profile sections) | ||
| - Anonymized the Color classes into .color1, .color2, .color3 | ||
| - Cosmetic | ||
| - Add images to .feature boxes | ||
| - Change Form Submit Button |
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; | ||
| } | ||
Oops, something went wrong.
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.
Needs an extra blank line