W3 A3 - Sass and jQuery Peter/Hollis (final)#25

Open

hollislau wants to merge 93 commits intoSEA-Design-Dev:masterfrom

hollislau:w3-a3__sass-and-jquery

Commits on Sep 8, 2015

Commits on Sep 9, 2015

Modify HTML to improve semantics
hollislau
committed
Finalize HTML to include all relevant text
hollislau
committed
add a CSS directory and pricing buttons

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' of github.com:hollislau/advanced-presentation__W2-A2

Peter Strumolo
authored and
Peter Strumolo
committed
adds style.css file and a link to it in index

Peter Strumolo
authored and
Peter Strumolo
committed
add a set of icon fonts in a fonts directory

Peter Strumolo
authored and
Peter Strumolo
committed
add the image directory with employee profiles

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 10, 2015

update pricing component styles

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'pricing-header'

Peter Strumolo
authored and
Peter Strumolo
committed
add sub-section header styles

Peter Strumolo
authored and
Peter Strumolo
committed
add @media queries to the pricing component

Peter Strumolo
authored and
Peter Strumolo
committed
add the 'services' components html and styles

Peter Strumolo
authored and
Peter Strumolo
committed
Modify HTML and add CSS for Team profiles section
hollislau
committed
Resolve merge conflicts
hollislau
committed
Resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
add @media queries to the services components

Peter Strumolo
authored and
Peter Strumolo
committed
add services text and section header background

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 11, 2015

merge together all the sub sections of services

Peter Strumolo
authored and
Peter Strumolo
committed
add portfolio section slider for mobile

Peter Strumolo
authored and
Peter Strumolo
committed
add a black line for section headers

Peter Strumolo
authored and
Peter Strumolo
committed
Add responsive CSS to style Client section
hollislau
committed
Resolve merge conflicts
hollislau
committed

Commits on Sep 12, 2015

add portfolio images and their captions

Peter Strumolo
authored and
Peter Strumolo
committed
add slider bullets and a category buttons

Peter Strumolo
authored and
Peter Strumolo
committed
adjusts the slider caption and categories

Peter Strumolo
authored and
Peter Strumolo
committed
Finalize the Team section layout for mobile and desktop views
hollislau
committed
adjust the portfolio layout

Peter Strumolo
authored and
Peter Strumolo
committed
add initial styles for the input contact form

Peter Strumolo
authored and
Peter Strumolo
committed
add contact location map with caption and icons

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 13, 2015

update the contact section with desktop layout

Peter Strumolo
authored and
Peter Strumolo
committed
resolved merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
add triangle images for between sections

Peter Strumolo
authored and
Peter Strumolo
committed
Add and finalize layout for About section
hollislau
committed
update style with downward triangles

Peter Strumolo
authored and
Peter Strumolo
committed
Resolve merge conflicts
hollislau
committed
Add and finalize layout for Footer section
hollislau
committed
add header with logo

Peter Strumolo
authored and
Peter Strumolo
committed
Add and finalize layout for Menu section
hollislau
committed
resolved merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
add -webkit- for flex-box containers

Peter Strumolo
authored and
Peter Strumolo
committed
change all URL paths from relative to absolute

Peter Strumolo
authored and
Peter Strumolo
committed
remove unnecessary images

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 14, 2015

Initial commit: create main.scss file for Sass
hollislau
committed

Commits on Sep 15, 2015

Update sections with down arrow image at the top

Peter Strumolo
authored and
Peter Strumolo
committed
Add a Gulpfile.js, package.json

Peter Strumolo
authored and
Peter Strumolo
committed
add node modules to gitignore file

Peter Strumolo
authored and
Peter Strumolo
committed
change the services section to an unordered list

Peter Strumolo
authored and
Peter Strumolo
committed
updated the section header styles in scss file

Peter Strumolo
authored and
Peter Strumolo
committed
update the section headers in the scss file

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 16, 2015

add base colors and updated scss with them

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'down-triangles' into w3-a3__sass-and-jquery

Peter Strumolo
authored and
Peter Strumolo
committed
create typography and config scss files

Peter Strumolo
authored and
Peter Strumolo
committed
Add header presentation and wrap social icons in an unordered list
hollislau
committed
Resolve merge conflicts
hollislau
committed
Standardize document and header layout for consistency and to consolidate code
hollislau
committed
Edit styles to bundle component

Peter Strumolo
authored and
Peter Strumolo
committed
Rename colors for less specificity
hollislau
committed
Resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
Refactor CSS to use Sass for flex box layout
hollislau
committed
Refactor Sass flex box code and add main.css to gitignore
hollislau
committed
update the _icons.scss with correct names

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'portfolio' into w3-a3__sass-and-jquery

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 17, 2015

Create sass slider in component directory

Peter Strumolo
authored and
Peter Strumolo
committed
update to slider & download button styles

Peter Strumolo
authored and
Peter Strumolo
committed
Finalize header components
hollislau
committed
resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
delete the css/main.css

Peter Strumolo
authored and
Peter Strumolo
committed
resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Sep 18, 2015

Refactor header and social-icons components with Sass
hollislau
committed
Update the portfolio slider and contact form

Peter Strumolo
authored and
Peter Strumolo
committed
adjust the opaque down arrow below the header

Peter Strumolo
authored and
Peter Strumolo
committed
resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
Refactor team profile section with Sass
hollislau
committed
Resolve merge conflicts
hollislau
committed
update to header and logo positions

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'header' into w3-a3__sass-and-jquery

Peter Strumolo
authored and
Peter Strumolo
committed
Refactor client profile component with Sass
hollislau
committed
Merge branch 'w3-a3__sass-and-jquery' of https://github.com/hollislau/advanced-presentation__W2-A2 into w3-a3__sass-and-jquery
hollislau
committed
Refactor skills component with Sass
hollislau
committed
add port_nav.js with basic functionality

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'portfolio-jquery' into w3-a3__sass-and-jquery

Peter Strumolo
authored and
Peter Strumolo
committed
Refactor aside component with Sass
hollislau
committed
update to port-nav script and layout styles

Peter Strumolo
authored and
Peter Strumolo
committed
Refactor about section with Sass
hollislau
committed

Commits on Sep 19, 2015

edit the style of the main menu

Peter Strumolo
authored and
Peter Strumolo
committed
add orange arrow to footer

Peter Strumolo
authored and
Peter Strumolo
committed
Refactor footer section with Sass
hollislau
committed
resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
add final edits

Peter Strumolo
authored and
Peter Strumolo
committed