-
Notifications
You must be signed in to change notification settings - Fork 8
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
midterm #1
Open
k-kawa-gucci
wants to merge
3
commits into
kcc-nma-art128:master
Choose a base branch
from
k-kawa-gucci:gh-pages
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
midterm #1
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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,272 @@ | ||
/* CSS TABLE OF CONTENTS | ||
===================================== | ||
#BASE CSS | ||
#SITE-SPECIFIC CSS | ||
===================================== */ | ||
|
||
|
||
/* | ||
===================================== | ||
========== BEGIN BASE CSS =========== | ||
===================================== | ||
*/ | ||
|
||
/* BASE CSS (Initital Base Setup) | ||
Description: "Base" css is an initial set of core | ||
styles that can be used (and reused) as a start | ||
for most sites. It should be placed at the top so | ||
it can be over-written by site-specific styling | ||
below. | ||
===================================== | ||
#RESET | ||
#HTML5 | ||
#BASE TYPOGRAPHY | ||
#BODY | ||
#nav | ||
#HEADINGS | ||
#PARAGRAPHS | ||
#LINKS | ||
#LISTS | ||
#IMAGES | ||
#CLEARFIX | ||
===================================== */ | ||
|
||
|
||
/* #RESET | ||
================================================== */ | ||
* { | ||
margin: 0; | ||
padding: 0; | ||
} | ||
|
||
/* #HTML5 | ||
================================================== */ | ||
header, section, footer, aside, nav, article, figure { | ||
display: block | ||
} | ||
|
||
/* #BASE TYPOGRAPHY | ||
================================================== */ | ||
|
||
/* #BODY */ | ||
body { | ||
font-family: Helvetica, Arial, sans-serif; | ||
font-size: 100%; /* 1em = 16px */ | ||
line-height: 1.5em; /* 16px x 1.5em = 24px */ | ||
color: #333; | ||
} | ||
/* #nav */ | ||
nav { | ||
width:750px; | ||
margin:0 auto; | ||
list-style:none; | ||
} | ||
#nav li { | ||
float:left; | ||
} | ||
#nav a { | ||
display:block; | ||
text-align:center; | ||
width:150px; /* fixed width */ | ||
text-decoration:none; | ||
} | ||
/* #HEADINGS | ||
Based on a Traditional Typographic Scale: | ||
48, 36, 24, 21, 18, 16 | ||
================================================== */ | ||
|
||
h1, h2, h3, h4, h5, h6 { | ||
margin-bottom: .5em; | ||
} | ||
|
||
h1 { | ||
font-size: 3em; /* 48px / 16px = 3em */ | ||
line-height: 1em; | ||
} | ||
|
||
h2 { | ||
font-size: 2.25em; /* 36px / 16px = 2.25em */ | ||
line-height: 1.1em; | ||
text-align:center; | ||
} | ||
|
||
h3 { | ||
font-size: 1.5em; /* 24px / 16px = 1.5em */ | ||
line-height: 1.1em; | ||
text-align:center; | ||
} | ||
|
||
h4 { | ||
font-size: 1.3125em; /* 21px / 16px = 1.3125em */ | ||
line-height: 1.3em; | ||
text-align:center; | ||
} | ||
|
||
h5 { | ||
font-size: 1.125em; /* 18px / 16px = 1.125em */ | ||
line-height: 1.4em; | ||
text-align:center; | ||
} | ||
|
||
h6 { | ||
font-size: 1em; /* 16px / 16px = 1em */ | ||
line-height: 1.5em; | ||
text-align:center; | ||
} | ||
|
||
/* #Paragraphs | ||
================================================== */ | ||
p { | ||
margin-bottom: .5em; | ||
} | ||
|
||
|
||
/* #Links | ||
================================================== */ | ||
a { color: #39c; text-decoration: none; } | ||
a:visited, a:hover, a:focus { color: #069; } | ||
|
||
|
||
/* #Lists | ||
================================================== */ | ||
ul, ol { | ||
margin-bottom: .5em; | ||
} | ||
|
||
ul li ul, ul li ol, ol li ul, ol li ol { | ||
margin: 0; | ||
} | ||
|
||
li { | ||
margin-left: 1.875em; | ||
} | ||
|
||
|
||
/* #Images | ||
================================================== */ | ||
img.scale-with-grid { | ||
max-width: 100%; | ||
height: auto; | ||
} | ||
|
||
a img { | ||
border: none; | ||
} | ||
|
||
|
||
/* #CLEARFIX | ||
================================================== */ | ||
.group:after { | ||
content: ""; | ||
display: table; | ||
clear: both; | ||
} | ||
|
||
/* | ||
===================================== | ||
=========== END BASE CSS ============ | ||
===================================== | ||
*/ | ||
|
||
|
||
/* | ||
===================================== | ||
===== BEGIN SITE- SPECIFIC CSS ====== | ||
===================================== | ||
*/ | ||
|
||
/* SITE-SPECIFIC CSS (Site-Specific Design) | ||
Description: "Site-specific" css is where all | ||
site-specific visual design styles. Site-specific | ||
css should be placed on the bottom to | ||
override any base styling above it. | ||
===================================== | ||
#SITE-SPECIFIC BASE STYLING | ||
#SITE-SPECIFIC TYPOGRAPHY | ||
#LAYOUT/GRID | ||
#SECTIONS | ||
#MEDIA QUERIES | ||
#@FONT-FACE | ||
===================================== */ | ||
|
||
/* SITE-SPECIFIC BASE STYLING | ||
Description: Adjust general base settings above with | ||
site-specific styles here. | ||
(e.g. body background color) | ||
===================================== */ | ||
|
||
body { | ||
background: | ||
} | ||
|
||
/* SITE-SPECIFIC TYPOGRAPHY | ||
Description: Adjust the base typography settings above | ||
with site-specific styles here. | ||
(e.g. headings, paragraphs, colors, etc.) | ||
===================================== */ | ||
|
||
|
||
|
||
/* LAYOUT/GRID | ||
Description: Place grid and visual layout styling here. | ||
(e.g. containers, rows, columns) | ||
===================================== */ | ||
.container { | ||
/* Fixed width: 960px */ | ||
width: 50em; /* 960px / 16px (base) = 60em - (5em padding x 2) = 50em */ | ||
margin: 2em auto; | ||
padding: 5em; | ||
background: #fff; | ||
} | ||
|
||
/* SECTIONS | ||
Description: Style major site sections here. | ||
(e.g. header, navs/navigation, site-specific content sections, | ||
asides, sidebars, footer, sub page-specific styling, etc.) | ||
===================================== */ | ||
|
||
|
||
/* MEDIA QUERIES | ||
Description: Define screen-size breakpoints here. | ||
(e.g. Desktop, Tablet, Mobile) | ||
===================================== */ | ||
|
||
/* Tablet (Between 768px - 992px)*/ | ||
@media all and (min-width: 48em) and (max-width: 62em) { | ||
|
||
body { | ||
font-size: 93.75%; /* 15px */ | ||
} | ||
|
||
.container { | ||
width: 80%; | ||
margin: 4%; | ||
padding: 6%; | ||
} | ||
|
||
} | ||
|
||
/* MOBILE (Smaller than 768px)*/ | ||
@media all and (max-width: 47.9999em) { | ||
|
||
body { | ||
font-size: 87.5%; /* 14px */ | ||
} | ||
|
||
.container { | ||
width: 84%; | ||
margin: 3%; | ||
padding: 5%; | ||
} | ||
|
||
} | ||
|
||
/* @FONT-FACE (Webfonts) | ||
===================================== */ | ||
|
||
|
||
/* | ||
===================================== | ||
====== END SITE- SPECIFIC CSS ======= | ||
===================================== | ||
*/ |
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.
Your
nav
styles are under your Base Typography section. It would be better to move this down to Site Specific css section.