Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
e3aa7f6
Add HTML boilerplate
hollislau Sep 8, 2015
288f92b
Create initial semantic HTML layout
hollislau Sep 8, 2015
9f1e829
Modify HTML to improve semantics
hollislau Sep 9, 2015
35cc454
Finalize HTML to include all relevant text
hollislau Sep 9, 2015
9593748
add a CSS directory and pricing buttons
Sep 9, 2015
ae1a07f
Merge branch 'master' of github.com:hollislau/advanced-presentation__…
Sep 9, 2015
e04a989
adds style.css file and a link to it in index
Sep 9, 2015
4a66694
add a set of icon fonts in a fonts directory
Sep 9, 2015
05c2a76
add the image directory with employee profiles
Sep 9, 2015
b9ec1f7
update pricing component styles
Sep 10, 2015
552359d
Merge branch 'pricing-header'
Sep 10, 2015
067ec59
add sub-section header styles
Sep 10, 2015
cb1d3b9
add @media queries to the pricing component
Sep 10, 2015
2a19418
add the 'services' components html and styles
Sep 10, 2015
3656516
Modify HTML and add CSS for Team profiles section
hollislau Sep 10, 2015
f4d5554
Resolve merge conflicts
hollislau Sep 10, 2015
817581d
Resolve merge conflicts
Sep 10, 2015
36fbdd1
add @media queries to the services components
Sep 10, 2015
d0ddd3f
add services text and section header background
Sep 10, 2015
d69378d
merge together all the sub sections of services
Sep 11, 2015
ce1886f
add portfolio section slider for mobile
Sep 11, 2015
0def81d
add a black line for section headers
Sep 11, 2015
b6999a5
Add responsive CSS to style Client section
hollislau Sep 11, 2015
406ba85
Resolve merge conflicts
hollislau Sep 11, 2015
d90be1e
add portfolio images and their captions
Sep 12, 2015
a407b1d
add slider bullets and a category buttons
Sep 12, 2015
25d6b91
adjusts the slider caption and categories
Sep 12, 2015
45fa398
Finalize the Team section layout for mobile and desktop views
hollislau Sep 12, 2015
b4f9fcf
adjust the portfolio layout
Sep 12, 2015
958f4a0
add initial styles for the input contact form
Sep 12, 2015
14f15b5
add contact location map with caption and icons
Sep 12, 2015
f186287
update the contact section with desktop layout
Sep 13, 2015
efdc9ed
resolved merge conflicts
Sep 13, 2015
ecfa391
resolve merge conflicts
Sep 13, 2015
b877334
add triangle images for between sections
Sep 13, 2015
16bacf0
Add and finalize layout for About section
hollislau Sep 13, 2015
4cab0dd
update style with downward triangles
Sep 13, 2015
98a21f9
Resolve merge conflicts
hollislau Sep 13, 2015
4618e6a
Add and finalize layout for Footer section
hollislau Sep 13, 2015
3567ce5
add header with logo
Sep 13, 2015
5a8912f
Add and finalize layout for Menu section
hollislau Sep 13, 2015
53b1804
resolved merge conflicts
Sep 13, 2015
1bc76a7
resolve merge conflicts
Sep 13, 2015
3d80737
add -webkit- for flex-box containers
Sep 13, 2015
c258c22
change all URL paths from relative to absolute
Sep 13, 2015
2898f81
remove unnecessary images
Sep 13, 2015
61e9afd
Initial commit: create main.scss file for Sass
hollislau Sep 14, 2015
4d48f72
Update sections with down arrow image at the top
Sep 15, 2015
789374f
Add a Gulpfile.js, package.json
Sep 15, 2015
c8b674e
add node modules to gitignore file
Sep 15, 2015
3e9475b
change the services section to an unordered list
Sep 15, 2015
1f84f3c
updated the section header styles in scss file
Sep 15, 2015
9c84a5c
update the section headers in the scss file
Sep 15, 2015
3d257d0
add base colors and updated scss with them
Sep 16, 2015
0b18232
Merge branch 'down-triangles' into w3-a3__sass-and-jquery
Sep 16, 2015
073222b
create typography and config scss files
Sep 16, 2015
2fc0f43
Add header presentation and wrap social icons in an unordered list
hollislau Sep 16, 2015
a42e4eb
Resolve merge conflicts
hollislau Sep 16, 2015
4a8eae4
Standardize document and header layout for consistency and to consoli…
hollislau Sep 16, 2015
21a1fd3
Edit styles to bundle component
Sep 16, 2015
6d48669
Rename colors for less specificity
hollislau Sep 16, 2015
c1a0c9a
Resolve merge conflicts
Sep 16, 2015
35e27ae
Refactor CSS to use Sass for flex box layout
hollislau Sep 16, 2015
1da58d3
Refactor Sass flex box code and add main.css to gitignore
hollislau Sep 16, 2015
c37870d
update the _icons.scss with correct names
Sep 16, 2015
68b373b
Merge branch 'portfolio' into w3-a3__sass-and-jquery
Sep 16, 2015
ed4ff68
Create sass slider in component directory
Sep 17, 2015
eccbad3
update to slider & download button styles
Sep 17, 2015
b24c31a
Finalize header components
hollislau Sep 17, 2015
4dc8da2
resolve merge conflicts
Sep 17, 2015
a142289
delete the css/main.css
Sep 17, 2015
c189772
resolve merge conflicts
Sep 17, 2015
04f581e
Refactor header and social-icons components with Sass
hollislau Sep 18, 2015
6720ffb
Update the portfolio slider and contact form
Sep 18, 2015
b116cd5
adjust the opaque down arrow below the header
Sep 18, 2015
b04f27e
resolve merge conflicts
Sep 18, 2015
748a6a1
Refactor team profile section with Sass
hollislau Sep 18, 2015
aeaaaf5
Resolve merge conflicts
hollislau Sep 18, 2015
567f5d3
update to header and logo positions
Sep 18, 2015
82c0eb2
Merge branch 'header' into w3-a3__sass-and-jquery
Sep 18, 2015
14501dd
Refactor client profile component with Sass
hollislau Sep 18, 2015
7202b04
Merge branch 'w3-a3__sass-and-jquery' of https://github.com/hollislau…
hollislau Sep 18, 2015
94c1ace
Refactor skills component with Sass
hollislau Sep 18, 2015
8417490
add port_nav.js with basic functionality
Sep 18, 2015
ea1a161
Merge branch 'portfolio-jquery' into w3-a3__sass-and-jquery
Sep 18, 2015
51494a6
Refactor aside component with Sass
hollislau Sep 18, 2015
a433b95
update to port-nav script and layout styles
Sep 18, 2015
75e2cad
Refactor about section with Sass
hollislau Sep 18, 2015
8fcad90
edit the style of the main menu
Sep 19, 2015
416a31a
add orange arrow to footer
Sep 19, 2015
cc16c6e
Refactor footer section with Sass
hollislau Sep 19, 2015
2959baa
resolve merge conflicts
Sep 19, 2015
242b1ae
add final edits
Sep 19, 2015
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ Icon
Network Trash Folder
Temporary Items
.apdisk

# Node
node_modules

# CSS
css/main.css
14 changes: 14 additions & 0 deletions Gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
var gulp = require("gulp");
var sass = require("gulp-sass");

gulp.task("sass", function() {
gulp.src("sass/**/*.scss")
.pipe(sass({
includePaths: require('node-bourbon').includePaths
}).on("error", sass.logError))
.pipe(gulp.dest("./css"));
});

gulp.task("default", ["sass"], function() {
gulp.watch("sass/**/*.scss", ["sass"]);
});
Binary file added css/fonts/ico-fonts.eot
Binary file not shown.
27 changes: 27 additions & 0 deletions css/fonts/ico-fonts.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/fonts/ico-fonts.ttf
Binary file not shown.
Binary file added css/fonts/ico-fonts.woff
Binary file not shown.
48 changes: 48 additions & 0 deletions css/reset.css
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;
}
Loading