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

Week2 floats #12

Open
wants to merge 37 commits into
base: week2-floats
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f372af5
initial commit
Nov 15, 2013
72c6ca1
added semantic grid example
Nov 15, 2013
2e8a3eb
updated examples
Nov 15, 2013
50cd656
updated zip link
Nov 15, 2013
ea67278
few html fixes
Nov 15, 2013
81992ff
Delete grid.html
Nov 20, 2013
9635490
Delete grid_semantic.html
Nov 20, 2013
4d4fa00
updated index page
Nov 21, 2013
949eb97
Remove width=device-width from viewport tag.
Nov 21, 2013
d2e26f2
Add back width=device-width, because oops.
Nov 21, 2013
c263d61
Delete _settings.scss
Nov 23, 2013
870b89e
Update app.scss
Nov 25, 2013
339fe10
Create .bowerrc
Nov 26, 2013
365406e
added _settings.scss file back in
Nov 27, 2013
a945aee
add all components
Jan 9, 2014
b9a5156
Create humans.txt
rafibomb Jan 10, 2014
9329c70
Create robots.txt
rafibomb Jan 10, 2014
2014a72
adding readme and project list
elyseholladay Jan 13, 2014
cbd869b
updating readme
elyseholladay Jan 13, 2014
122106b
updating readme
elyseholladay Jan 29, 2014
1739441
update path to jquery
mhayes Feb 18, 2014
c970556
revise javascripts_dir to match folder structure
mhayes Mar 4, 2014
3b50c09
adding basic foundation sass and file setup
elyseholladay Mar 5, 2014
c74b3c2
updating readme with instructions
elyseholladay Mar 5, 2014
77fcc7f
updating readme with instructions
elyseholladay Mar 5, 2014
52a06ca
updating readme with instructions
elyseholladay Mar 5, 2014
b9b44ac
adding project file
elyseholladay Mar 5, 2014
6015c34
new readme
elyseholladay Mar 5, 2014
75d6f3e
organizing css
elyseholladay Mar 5, 2014
e469565
styling individual project pages and adding color test and custom scss
elyseholladay Mar 5, 2014
ca6ffd0
adding new image, sample pictures and styling
elyseholladay Mar 5, 2014
fa7d445
adding fonts, styling, updating readme
elyseholladay Mar 5, 2014
0e416c4
last styling
elyseholladay Mar 5, 2014
644f217
old exercises
dbdriscoll Mar 6, 2014
bf5ee92
fixed merge conflict
dbdriscoll Mar 6, 2014
169754f
adding to my project list
dbdriscoll Mar 6, 2014
1bc9b6e
adding sample HTML
dbdriscoll Mar 6, 2014
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
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "bower_components"
}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/bower_components/*
/.sass-cache/*
*.DS_Store
/stylesheets/*
46 changes: 46 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# MKS Front-End Cohort 1 Final Projects

## Your mission, should you choose to accept it...

1. Fork this repo! This will make a copy of it in your own GitHub account. By default you can't edit _this_ repo because you don't have access, but by forking it, you'll have control. Then you can make changes and send me a pull request to add your changes to my project.
2. `git clone` your newly forked repo into your projects folder. Remember, cloning a repo makes a folder for it, so you don't need to create one first!
3. `cd` into the `projectlist` directory that has been created.
4. Confirm you are on the `master` branch by running `git status`. We don't want to make changes against master in case we screw something up, so...
5. Make a new git branch and check it out: `git checkout -b add-my-project`. 'add-my-project' is the name of my new branch, and `checkout -b` tells git to make a new branch AND go into it.
6. `git status` should tell you you are now on branch 'add-my-project'.
7. Follow the install commands below so you can use [bower.io](Bower) to install Foundation, & run Sass!
8. Add yourself to the project list in `index.html` by duplicating the sample div and adding your content.
16. Make your project name in `index.html` link to your project page.
9. `git add --all` to add those changes
10. `git commit -m "adding MYNAME to project list`
11. `git push`. It may ask you to set an upstream branch, which means that you have a branch locally but not on github.com. So run the command it asks for!
12. Now you can go to your repo on github.com and see the branch. You can also compare changes against master.
12. Make a new file in `/projects` folder called `project-[MYPROJECT].html` where [MYPROJECT] is a short name for your actual final project idea*.
13. Git add and commit!
14. Copy the HTML in `projects/project-sample.html` into your new project page and add your own info!
15. Git add and commit!
16. Make a new variable in `custom.scss` that is the main color for your project.
17. Then add an ID and the readable mixin to make your project page have your custom background color and always have readable text.
17. Git add and commit!
18. `git push` all your final changes up to github.com.
19. Now we want to compare your changes to master and merge them back in. GitHub has a handy-dandy Pull Request page that lets us easily see if there are conflicts and what changes we made.
20. Go to your repo—there should be a yellow banner saying you recently pushed a branch. Click there to compare them. If not, go to your branch in the dropdown and then hit the green Compare button next to it to generate a Pull Request.
21. Most likely you won't have any conflicts, because you are just making changes against your own branch. Yay! Use the page to merge your changes to your master branch.
22. NOW we want to generate a pull request against the original repo. This time we'll definitely have merge conflicts! Yikes!

*yes, we know you may not have settled on an idea yet, that's OK.


## To Install

Check to see if you have Node installed: `node --version`

If you do not: `brew install node`

Now install Zurb Foundation using Bower: `bower install foundation`

Bower is a package manager, so it will keep Foundation up to date for you!

Run the following command to make Sass watch for changes to your stylesheet: `sass --watch scss/app.scss:stylesheets/app.css`

This says, "Sass, watch the file `scss/app.scss` to see if there are any changes to it. If there are, compile it to regular css at the file `stylesheets/app.css`. Yay!"
8 changes: 8 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "foundation-compass-app",
"version": "0.0.1",
"private": "true",
"dependencies": {
"foundation": "zurb/bower-foundation"
}
}
25 changes: 25 additions & 0 deletions config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Require any additional compass plugins here.
add_import_path "bower_components/foundation/scss"

# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "stylesheets"
sass_dir = "scss"
images_dir = "images"
javascripts_dir = "js"

# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed

# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true

# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false


# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
4 changes: 4 additions & 0 deletions example-02.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@
.sidebar {
float: left;
width: 250px;
height: 300px;
}

.main_content {
float: left;
width: 734px;
height: 300px;
/* hint! */
}

.footer {
clear: both;
/* hint! */
}
7 changes: 7 additions & 0 deletions example-03.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@

.sidebar {
/* hint! */
float: right;
width: 250px;
height: 300px;
}

.main_content {
/* hint! */
float: left;
width: 734px;
height: 300px;
}

.footer {
/* hint! */
clear: both;
}

/*
Expand Down
18 changes: 17 additions & 1 deletion example-04.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,37 @@


.header {}
/* hint! you have to contain the floated children elements. */

.header:after{
display: block;
content: "";
visibility: hidden;
height: 0;
clear: both;
}
/* hint! you have to contain the floated children elements. */

.logo {
/* hint! */
float: left;
}

.navigation {
/* hint! */
float: right;
}

.sidebar {
float: left;
width: 250px;
}

.main_content {
float: left;
width: 734px;
height: 300px;
}

.footer {
clear: both;
}
36 changes: 31 additions & 5 deletions example-05.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,46 @@
.header {}
/* hint! what do you have to add here? */

.logo {}
.header:after{
display:block;
content:"";
visibility: hidden;
height: 0;
clear: both;
}

.navigation {}
.logo {
float: left;
}

.sidebar {}
.navigation {
float: right;
}

.main_content {}
.sidebar {
float: left;
height: 115px;
}

.main_content {
overflow: auto;
}
/* hint! you have to contain the floated children elements. */

.sub_content {
/* hint! */
float: right;
width: 810px;
padding: 20px;
}
.sub_content_2 {
/* hint! */
float: right;
clear: right;
width: 810px;
padding: 20px;
}

.footer {}
.footer {
clear: both;
}
9 changes: 7 additions & 2 deletions example-06.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@
/* Example 06 */

.container {
width: 1024px; /* what happens to the widget boxes when you change this width? */
width: 80%; /* what happens to the widget boxes when you change this width? */
height: 80%;
margin: 0 auto;
}


.main_content {}
.main_content {
}
/* hint! what do you need to add here? */

.widget {
float: right;
width: 10%; /* what happens to the widget boxes when you change this width? */
height: 10%;
/* how do you make the widgets float next to each other? */
/* what happens when you change float left to float right? why? */
}
Expand Down
Binary file added fonts/2A065D_0_0.eot
Binary file not shown.
Binary file added fonts/2A065D_0_0.ttf
Binary file not shown.
Binary file added fonts/2A065D_0_0.woff
Binary file not shown.
43 changes: 43 additions & 0 deletions fonts/fonts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@import url("//hello.myfonts.net/count/2a065d");


@font-face {font-family: 'PlutoMedium';src: url('2A065D_0_0.eot');src: url('2A065D_0_0.eot?#iefix') format('embedded-opentype'),url('2A065D_0_0.woff') format('woff'),url('2A065D_0_0.ttf') format('truetype');}


@font-face {
font-family: 'PlutoSansExtraLight';
src: url('plutosans_exlight.eot');
src: url('plutosans_exlight.eot?#iefix') format('embedded-opentype'),
url('plutosans_exlight.woff') format('woff'),
url('plutosans_exlight.ttf') format('truetype'),
url('plutosans_exlight.svg#PlutoSansExtraLight') format('svg');
font-weight: normal;
font-style: normal;

}


@font-face {
font-family: 'PlutoSansRegular';
src: url('plutosans_regular.eot');
src: url('plutosans_regular.eot?#iefix') format('embedded-opentype'),
url('plutosans_regular.woff') format('woff'),
url('plutosans_regular.ttf') format('truetype'),
url('plutosans_regular.svg#PlutoSansRegular') format('svg');
font-weight: normal;
font-style: normal;

}


@font-face {
font-family: 'PlutoSansBold';
src: url('plutosans_bold.eot');
src: url('plutosans_bold.eot?#iefix') format('embedded-opentype'),
url('plutosans_bold.woff') format('woff'),
url('plutosans_bold.ttf') format('truetype'),
url('plutosans_bold.svg#PlutoSansBold') format('svg');
font-weight: normal;
font-style: normal;

}
Binary file added fonts/plutosans_bold.eot
Binary file not shown.
Loading