Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
d3c4fc2
first assets
Brian11f Sep 8, 2015
7208af4
Merge pull request #1 from brain11f/brians-brach
Brian11f Sep 8, 2015
964146b
1
Brian11f Sep 8, 2015
6fa073f
2
Brian11f Sep 8, 2015
9306136
Merge pull request #2 from brain11f/brians-brach
Sep 8, 2015
c108746
Added content to the team section. Include team header followed by a …
Sep 8, 2015
93ee350
3
Brian11f Sep 9, 2015
41e1e0e
added services-price html
Brian11f Sep 9, 2015
ae1c1b0
Add comments to the figure tag to show where profile pic images are g…
Sep 9, 2015
5ea3f2c
Merge pull request #3 from brain11f/sredna
Brian11f Sep 9, 2015
8ab269c
Merge pull request #4 from brain11f/brians-brach
Sep 9, 2015
e478f99
added &
Brian11f Sep 9, 2015
736bb24
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 9, 2015
3f9bdb4
added nothing
Sep 9, 2015
ac20ff5
added portfolio html
Brian11f Sep 9, 2015
c110c84
added nothing
Sep 9, 2015
6ae866c
Add navigation bar containing social media icons to the team pics
Sep 9, 2015
dee8ac4
Add figure captions under team profile pics
Sep 9, 2015
edb6ef1
added about-skills html
Brian11f Sep 9, 2015
b567bb9
Merge pull request #5 from brain11f/brians-brach
Sep 9, 2015
aac6463
not much changed
Sep 9, 2015
3539226
getting git to work
Sep 9, 2015
fd6cc32
removed git error messages
Sep 9, 2015
fc5664b
Merge pull request #7 from brain11f/sredna
Brian11f Sep 9, 2015
c626677
finish contacts, google maps, and author at bottom of the page
Sep 9, 2015
93fb744
added css header and cleaned up images
Brian11f Sep 9, 2015
fa1b654
Merge pull request #8 from brain11f/brians-brach
Sep 9, 2015
6da20cf
Merge pull request #9 from brain11f/sredna
Brian11f Sep 9, 2015
0f9525f
removed extra body tag
Sep 9, 2015
0fd5b96
Merge pull request #10 from brain11f/sredna
Brian11f Sep 9, 2015
100b558
1
Brian11f Sep 10, 2015
1b2f6fe
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 10, 2015
988123f
Upload icon images to assets folder
Sep 10, 2015
888a5e3
Add footer at bottom of page
Sep 10, 2015
0950711
Add images to team and clients sections
Sep 10, 2015
8046c55
Add footer icons
Sep 10, 2015
e385961
Merge pull request #11 from brain11f/sredna
Brian11f Sep 10, 2015
eb43c2e
2
Brian11f Sep 10, 2015
91a5979
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 10, 2015
7bccd6a
Add google maps image
Sep 10, 2015
6ef007f
Add google maps image to html
Sep 10, 2015
2b18e1a
Create common class for footer named footer
Sep 10, 2015
db73891
drop down menu!
Brian11f Sep 10, 2015
1da7f4a
drop down menu styling
Brian11f Sep 10, 2015
fa643e2
drop down menu styling
Brian11f Sep 10, 2015
5bfd68d
Merge pull request #12 from brain11f/sredna
Brian11f Sep 10, 2015
f70fcab
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 10, 2015
0184012
Merge pull request #13 from brain11f/brians-brach
Brian11f Sep 10, 2015
d9667f5
Used flex box for team in css
Sep 10, 2015
ede7c36
add svg
Brian11f Sep 10, 2015
a32394a
Merge pull request #14 from brain11f/brians-brach
Sep 10, 2015
e85efee
updated files
Sep 10, 2015
e0df780
Create page lip on bottom of all sections
Sep 10, 2015
6c6a87a
welcome page icon
Brian11f Sep 10, 2015
0705c5a
Merge pull request #15 from brain11f/sredna
Brian11f Sep 10, 2015
c2d7a53
merge conflict fix
Brian11f Sep 10, 2015
1cb05c6
fixed missed <<<<<
Brian11f Sep 10, 2015
44a13b6
Merge pull request #17 from brain11f/brians-branch
Sep 10, 2015
e1efbec
working on welcome
Brian11f Sep 10, 2015
7bc4208
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 10, 2015
ef2634a
fixed missing curly brace
Brian11f Sep 10, 2015
129259f
Merge pull request #18 from brain11f/brians-branch
Sep 10, 2015
a246b92
not sure
Sep 10, 2015
ece7b2c
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Sep 10, 2015
968fac2
Add page lips to bottom of sections
Sep 10, 2015
af2b1d2
no changes
Sep 10, 2015
f254f7d
Merge pull request #19 from brain11f/sredna
Brian11f Sep 10, 2015
df9ecc1
updating master
Brian11f Sep 10, 2015
9b0f00f
updating master
Brian11f Sep 10, 2015
bfe3680
Merge pull request #20 from brain11f/brians-branch
Sep 10, 2015
6ee860a
Centered the team section
Sep 11, 2015
7af0506
working on portfolio
Brian11f Sep 11, 2015
599d38b
Finish team and client section
Sep 11, 2015
2666b19
Merge pull request #21 from brain11f/sredna
Brian11f Sep 11, 2015
1342be3
fix merge error
Brian11f Sep 11, 2015
d8d6dfa
Merge pull request #22 from brain11f/brians-branch
Sep 11, 2015
9ad5d8c
Create and style contact form
Sep 11, 2015
c97a651
Style google contact info
Sep 11, 2015
d26e582
Finish footer
Sep 11, 2015
ff12cbc
portfolio add at media@ and css formatting
Brian11f Sep 11, 2015
37c1fd6
portfolio add at media@ and css formatting
Brian11f Sep 11, 2015
2ae7b8b
Finish footer
Sep 11, 2015
01e1e0c
Merge pull request #23 from brain11f/sredna
Brian11f Sep 11, 2015
b6fa336
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 11, 2015
fab2a79
Merge pull request #24 from brain11f/brians-branch
Sep 11, 2015
10535cf
style about/skills added desktop nav menu % is awesome!
Brian11f Sep 12, 2015
60585ce
Start making contact section desktop friendly
Sep 12, 2015
25e7523
Merge pull request #25 from brain11f/sredna
Brian11f Sep 12, 2015
206e935
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 12, 2015
50912e7
Merge pull request #26 from brain11f/brians-branch
Sep 12, 2015
1add8a6
finish
Sep 12, 2015
a67c0fe
price form styling
Brian11f Sep 12, 2015
dc4d2e0
Merge pull request #27 from brain11f/sredna
Brian11f Sep 12, 2015
c031895
Merge branch 'master' of https://github.com/brain11f/advanced-present…
Brian11f Sep 12, 2015
d0c899c
Merge pull request #28 from brain11f/brians-branch
Sep 12, 2015
a2219a5
price button done
Brian11f Sep 12, 2015
2ab4bc4
added circle crop
Brian11f Sep 12, 2015
3d04774
changing folder structure for express
Brian11f Sep 12, 2015
3d5e02f
added express server js/ changed file paths/ added circle to icon again
Brian11f Sep 12, 2015
7befc58
push herukuheroku
Brian11f Sep 12, 2015
b998e75
procfile!
Brian11f Sep 12, 2015
c0e9e76
Procfile
Brian11f Sep 12, 2015
e2f88f9
Procfile
Brian11f Sep 12, 2015
38a3015
Procfile
Brian11f Sep 12, 2015
25c1009
Procfile
Brian11f Sep 12, 2015
ca2cf64
Procfile
Brian11f Sep 12, 2015
2681efe
Procfile
Brian11f Sep 12, 2015
907cb52
Merge pull request #29 from brain11f/brians-branch
Brian11f Sep 12, 2015
feebaf8
Added a Procfile.
Brian11f Sep 12, 2015
7d4b40a
fixed Procfile.
Brian11f Sep 12, 2015
fd9784f
added map overlay/ phone formating
Brian11f Sep 13, 2015
8e8ed6a
html and css formating
Brian11f Sep 13, 2015
aec4be2
Merge branch 'master' into brians-branch
Brian11f Sep 13, 2015
7084432
Removed folder from repexpress repository
Brian11f Sep 13, 2015
c17737f
Removed folder from repexpress repository
Brian11f Sep 13, 2015
cefe3f3
Merge pull request #31 from brain11f/brians-branch
Sep 13, 2015
56eec1a
add gitignore gulp sass
Brian11f Sep 14, 2015
cfa45d5
add gitignore gulp sass
Brian11f Sep 14, 2015
136597a
Merge pull request #33 from brain11f/brian-sass-js
Sep 14, 2015
3dd659f
Add seperate sass files to the src folder and import those files into…
Sep 14, 2015
2ab165c
Merge pull request #35 from brain11f/sredna
Brian11f Sep 14, 2015
05b009c
Add button sass to button.scss file
Sep 15, 2015
6560f88
named variables
Brian11f Sep 15, 2015
398bf7f
Merge pull request #36 from brain11f/sredna
Brian11f Sep 15, 2015
fada8f1
fixed merge
Brian11f Sep 15, 2015
160fb1d
Merge pull request #38 from brain11f/brian-sass-js
Sep 15, 2015
ed7ee8c
no changes
Sep 15, 2015
b139b74
Add header, sections, and icons files to src folder
Sep 15, 2015
d3ab2ca
Merge pull request #40 from brain11f/sredna
Brian11f Sep 15, 2015
7232249
updating
Brian11f Sep 15, 2015
448d26c
updating
Brian11f Sep 15, 2015
69f16d5
Add document files, Turn icon css into sass, Currently icon sass isn'…
Sep 15, 2015
d9bb39e
Merge pull request #42 from brain11f/sredna
Brian11f Sep 15, 2015
030b369
updating added document level files
Brian11f Sep 15, 2015
22fd422
combing files/ fixing merge confilcts
Brian11f Sep 15, 2015
7fe11b0
Merge pull request #43 from brain11f/brian-sass-js
Brian11f Sep 15, 2015
a577815
Fix icon layout
Sep 15, 2015
ef017a9
Add more to client and contact section
Sep 15, 2015
5e6aff2
Finish conversion into sass of about,skills,contact,clients,and foote…
Sep 16, 2015
c0b162e
getting ready to merge
Brian11f Sep 16, 2015
d7e6444
brian fixing merge confilcs
Brian11f Sep 16, 2015
e98468d
Merge pull request #44 from brain11f/sredna
Brian11f Sep 16, 2015
2eab126
brian fixing merge confilcs
Brian11f Sep 16, 2015
7f7dc75
Do scrolling on contact us button and submit message button resets fo…
Sep 16, 2015
3679a6f
breaking code up
Brian11f Sep 16, 2015
aa1f4c4
Merge pull request #46 from brain11f/sredna
Brian11f Sep 16, 2015
8c381e9
fixed merge conflict in the read me
Brian11f Sep 16, 2015
9cff39e
fixed merge conflict
Brian11f Sep 16, 2015
553821a
pushing work
Brian11f Sep 16, 2015
2b12793
Merge pull request #48 from brain11f/brian-sass-js
Sep 16, 2015
f643104
no changes
Sep 16, 2015
a16bbd5
added animate mixin/finnished flexbox mixin/added smooth scroll and w…
Brian11f Sep 17, 2015
aec1b6f
added button animations/getting ready to merge
Brian11f Sep 17, 2015
c23cccd
Work on client buttons
Sep 17, 2015
25600fc
Merge pull request #49 from brain11f/sredna
Brian11f Sep 17, 2015
aeed995
merge conflict fix
Brian11f Sep 17, 2015
9fea5eb
Merge pull request #50 from brain11f/brian-sass-js
Sep 17, 2015
9f2b295
added filtering to portfolio
Brian11f Sep 18, 2015
c70b4a7
Finish
Sep 18, 2015
6e42502
Merge pull request #51 from brain11f/sredna
Brian11f Sep 18, 2015
6f4e6e3
Merge branch 'w3-a3__sass-and-jquery' of https://github.com/brain11f/…
Brian11f Sep 18, 2015
328a970
added portfolio carousel
Brian11f Sep 18, 2015
808a536
css header width
Brian11f Sep 18, 2015
9479f54
Merge pull request #53 from brain11f/brian-sass-js
Brian11f Sep 18, 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
29 changes: 4 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
### OSX ###
.sass-cache
node_modules
public/css
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
*.log
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node index.js
13 changes: 13 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
var gulp = require("gulp");

var sass = require("gulp-sass");

gulp.task("sass", function() {
gulp.src("./src/scss/*.scss")
.pipe(sass().on("error", sass.logError))
.pipe(gulp.dest("./public/css/"));
});

gulp.task("default", function() {
gulp.watch("./src/scss/*.scss", ["sass"]);
});
26 changes: 26 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "w2a2mobilesite",
"version": "1.0.0",
"description": "w2a2 project advanced css",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/brain11f/advanced-presentation__W2-A2.git"
},
"author": "Brian",
"license": "ISC",
"bugs": {
"url": "https://github.com/brain11f/advanced-presentation__W2-A2/issues"
},
"homepage": "https://github.com/brain11f/advanced-presentation__W2-A2#readme",
"dependencies": {
"express": "^4.13.3"
},
"devDependencies": {
"gulp": "^3.9.0",
"gulp-sass": "^2.0.4"
}
}
Binary file added public/assets/Arrow.png
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 public/assets/Dribbble x2.png
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 public/assets/Dribble shot.png
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 public/assets/Shot copy 2.png
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 public/assets/Shot copy 3.png
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 public/assets/Shot copy 4.png
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 public/assets/Shot copy 5.png
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 public/assets/Shot copy 6.png
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 public/assets/Shot copy.png
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 public/assets/Shot.png
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 public/assets/Slider.jpg
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 public/assets/Web shot.png
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 public/assets/circle-left-icon.png
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 public/assets/circle-right-icon.png
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 public/assets/dribble-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/assets/droplet.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 public/assets/facebook-icon.png
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 public/assets/google-maps.jpg
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 public/assets/googlePlus-icon.png
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 public/assets/header-background-image.jpg
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 public/assets/jane-doe.jpg
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 public/assets/jannete-doe.jpg
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 public/assets/jessie-doe.jpg
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 public/assets/jonathan-doe.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions public/assets/lab.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 public/assets/linkedIn-icon.png
Binary file added public/assets/location-icon.png
Binary file added public/assets/mail-icon.png
Binary file added public/assets/matthew-broderic.png
7 changes: 7 additions & 0 deletions public/assets/menu.svg
Binary file added public/assets/mobile-icon.png
18 changes: 18 additions & 0 deletions public/assets/paint-brush.svg
18 changes: 18 additions & 0 deletions public/assets/settings.svg
Binary file added public/assets/slider2.jpg
Binary file added public/assets/slider3.jpg
Binary file added public/assets/slider4.jpg
Binary file added public/assets/slider5.jpg
Binary file added public/assets/twitter-icon.png
Loading