W3 a3 sass and jquery#28

Open

brain11f wants to merge 164 commits intoSEA-Design-Dev:masterfrom

brain11f:w3-a3__sass-and-jquery

Commits on Sep 8, 2015

Commits on Sep 9, 2015

3
Brian11f
committed
added services-price html
Brian11f
committed
Add comments to the figure tag to show where profile pic images are going to be inserted
Sredna Kunowski
committed
Merge pull request #3 from brain11f/sredna
Brian11f
committed
Merge pull request #4 from brain11f/brians-brach
Sredna Kunowski
committed
added &
Brian11f
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into brians-brach
Brian11f
committed
added nothing
Sredna Kunowski
committed
added portfolio html
Brian11f
committed
added nothing
Sredna Kunowski
committed
Add navigation bar containing social media icons to the team pics
Sredna Kunowski
committed
Add figure captions under team profile pics
Sredna Kunowski
committed
added about-skills html
Brian11f
committed
Merge pull request #5 from brain11f/brians-brach
Sredna Kunowski
committed
not much changed
Sredna Kunowski
committed
getting git to work
Sredna Kunowski
committed
removed git error messages
Sredna Kunowski
committed
Merge pull request #7 from brain11f/sredna
Brian11f
committed
finish contacts, google maps, and author at bottom of the page
Sredna Kunowski
committed
added css header and cleaned up images
Brian11f
committed
Merge pull request #8 from brain11f/brians-brach
Sredna Kunowski
committed
Merge pull request #9 from brain11f/sredna
Brian11f
committed
removed extra body tag
Sredna Kunowski
committed
Merge pull request #10 from brain11f/sredna
Brian11f
committed

Commits on Sep 10, 2015

1
Brian11f
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into brians-brach
Brian11f
committed
Upload icon images to assets folder
Sredna Kunowski
committed
Add footer at bottom of page
Sredna Kunowski
committed
Add images to team and clients sections
Sredna Kunowski
committed
Add footer icons
Sredna Kunowski
committed
Merge pull request #11 from brain11f/sredna
Brian11f
committed
2
Brian11f
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into brians-brach
Brian11f
committed
Add google maps image
Sredna Kunowski
committed
Add google maps image to html
Sredna Kunowski
committed
Create common class for footer named footer
Sredna Kunowski
committed
drop down menu!
Brian11f
committed
drop down menu styling
Brian11f
committed
drop down menu styling
Brian11f
committed
Merge pull request #12 from brain11f/sredna
Brian11f
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into brians-brach
Brian11f
committed
Merge pull request #13 from brain11f/brians-brach
Brian11f
committed
Used flex box for team in css
Sredna Kunowski
committed
add svg
Brian11f
committed
Merge pull request #14 from brain11f/brians-brach
Sredna Kunowski
committed
updated files
Sredna Kunowski
committed
Create page lip on bottom of all sections
Sredna Kunowski
committed
welcome page icon
Brian11f
committed
Merge pull request #15 from brain11f/sredna
Brian11f
committed
merge conflict fix
Brian11f
committed
fixed missed <<<<<
Brian11f
committed
Merge pull request #17 from brain11f/brians-branch
Sredna Kunowski
committed
working on welcome
Brian11f
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into brians-branch
Brian11f
committed
fixed missing curly brace
Brian11f
committed
Merge pull request #18 from brain11f/brians-branch
Sredna Kunowski
committed
not sure
Sredna Kunowski
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into sredna
Sredna Kunowski
committed
Add page lips to bottom of sections
Sredna Kunowski
committed
no changes
Sredna Kunowski
committed
Merge pull request #19 from brain11f/sredna
Brian11f
committed
updating master
Brian11f
committed
updating master
Brian11f
committed
Merge pull request #20 from brain11f/brians-branch
Sredna Kunowski
committed

Commits on Sep 11, 2015

Centered the team section
Sredna Kunowski
committed
working on portfolio
Brian11f
committed
Finish team and client section
Sredna Kunowski
committed
Merge pull request #21 from brain11f/sredna
Brian11f
committed
fix merge error
Brian11f
committed
Merge pull request #22 from brain11f/brians-branch
Sredna Kunowski
committed
Create and style contact form
Sredna Kunowski
committed
Style google contact info
Sredna Kunowski
committed
Finish footer
Sredna Kunowski
committed
portfolio add at media@ and css formatting
Brian11f
committed
portfolio add at media@ and css formatting
Brian11f
committed
Finish footer
Sredna Kunowski
committed
Merge pull request #23 from brain11f/sredna
Brian11f
committed
Merge branch 'master' of https://github.com/brain11f/advanced-presentation__W2-A2 into brians-branch
Brian11f
committed
Merge pull request #24 from brain11f/brians-branch
Sredna Kunowski
committed

Commits on Sep 12, 2015

Commits on Sep 14, 2015

Commits on Sep 15, 2015

Add button sass to button.scss file
Sredna Kunowski
committed
named variables
Brian11f
committed
Merge pull request #36 from brain11f/sredna
Brian11f
committed
fixed merge
Brian11f
committed
Merge pull request #38 from brain11f/brian-sass-js
Sredna Kunowski
committed
no changes
Sredna Kunowski
committed
Add header, sections, and icons files to src folder
Sredna Kunowski
committed
Merge pull request #40 from brain11f/sredna
Brian11f
committed
updating
Brian11f
committed
updating
Brian11f
committed
Add document files, Turn icon css into sass, Currently icon sass isn't showing up in main.css so that has to be fixed
Sredna Kunowski
committed
Merge pull request #42 from brain11f/sredna
Brian11f
committed
updating added document level files
Brian11f
committed
combing files/ fixing merge confilcts
Brian11f
committed
Merge pull request #43 from brain11f/brian-sass-js
Brian11f
committed
Fix icon layout
Sredna Kunowski
committed
Add more to client and contact section
Sredna Kunowski
committed

Commits on Sep 16, 2015

Finish conversion into sass of about,skills,contact,clients,and footer sections
Sredna Kunowski
committed
getting ready to merge
Brian11f
committed
brian fixing merge confilcs
Brian11f
committed
Merge pull request #44 from brain11f/sredna
Brian11f
committed
brian fixing merge confilcs
Brian11f
committed
Do scrolling on contact us button and submit message button resets form field
Sredna Kunowski
committed
breaking code up
Brian11f
committed
Merge pull request #46 from brain11f/sredna
Brian11f
committed
fixed merge conflict in the read me
Brian11f
committed
fixed merge conflict
Brian11f
committed
pushing work
Brian11f
committed
Merge pull request #48 from brain11f/brian-sass-js
Sredna Kunowski
committed
no changes
Sredna Kunowski
committed