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

Project Week 1 - Turn In (Final) - Molly Kent, Mark Buchthal, Alina To, Brian Finck #12

Open
wants to merge 407 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
407 commits
Select commit Hold shift + click to select a range
1162792
Merge pull request #95 from mbuchthal/header_graphic
mollyfish Sep 22, 2015
3d037a6
Start nav smooth scroll
toalina Sep 22, 2015
772ec4e
Start refactor of review subsection
mollyfish Sep 22, 2015
cc43d2e
Modify IDs in HTML. No appropriate place for #blog-nav
toalina Sep 23, 2015
9d3f6a5
Added id=blog to discounted pricing section for testing
toalina Sep 23, 2015
c438983
html fix
mbuchthal Sep 23, 2015
1cbe4b5
Test refactored App Review subsection in mobile
mollyfish Sep 23, 2015
54f18d1
Merge pull request #98 from mbuchthal/smooth_scroll
mbuchthal Sep 23, 2015
668f5aa
Remove test color from background of section
mollyfish Sep 23, 2015
00f6518
Merge pull request #100 from mbuchthal/header_graphic
mollyfish Sep 23, 2015
68ba37e
Merge pull request #102 from mbuchthal/review-refactor
mbuchthal Sep 23, 2015
73da0cb
Style and layout of Team subsection
mollyfish Sep 23, 2015
a0ef49c
Typo fix in _drawn-arrow
mollyfish Sep 23, 2015
e75d158
style get it free section
mbuchthal Sep 23, 2015
14d8cf9
Merge pull request #104 from mbuchthal/team-components
mbuchthal Sep 23, 2015
b708232
place newspapers into newspaper section with styling and mixin added
mbuchthal Sep 23, 2015
14a446d
Merge pull request #105 from mbuchthal/getitfree_3
mollyfish Sep 23, 2015
c9c1ea8
Merge pull request #106 from mbuchthal/newspapers
Brian11f Sep 23, 2015
bd4aa2d
Initial commit. Rename presentational divs. Refactor from partial fil…
mollyfish Sep 23, 2015
b85100b
working on nav bar
Brian11f Sep 23, 2015
bc741d7
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 23, 2015
6df5c7b
moving on from nav needs more work
Brian11f Sep 23, 2015
bd2c7da
Refactor and consolidate _feature, _new-feature, _paragraphs, _secti…
toalina Sep 23, 2015
a4f4f3f
Merge pull request #109 from mbuchthal/brian-header
mbuchthal Sep 23, 2015
f5b3e6a
updating
Brian11f Sep 23, 2015
1e9abcb
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 23, 2015
bf8c48f
add style to screenshot section with images brought in and add arrows…
mbuchthal Sep 23, 2015
5b49eb2
Merge pull request #110 from mbuchthal/screenshot_section
Brian11f Sep 23, 2015
ad9ec19
Finish refactor of Why Choose list columns.
mollyfish Sep 23, 2015
850bdfa
Merge pull request #111 from mbuchthal/why-choose-refactor
mbuchthal Sep 23, 2015
af15a55
Fix arrow position in Team and App Review
mollyfish Sep 23, 2015
15afc85
Merge pull request #113 from mbuchthal/arrow-position
mbuchthal Sep 23, 2015
41dc232
add underline span using partial to several sections
mbuchthal Sep 23, 2015
f3f3b93
Merge pull request #114 from mbuchthal/videoheader
mollyfish Sep 23, 2015
3d8407c
Combine form subelement partials into form partial
mollyfish Sep 23, 2015
91612f1
format whychoose header and refactored into separate partial
mbuchthal Sep 23, 2015
5685534
Merge pull request #115 from mbuchthal/form-refactor
Brian11f Sep 23, 2015
5b30593
Merge pull request #116 from mbuchthal/whychooseheader
Brian11f Sep 23, 2015
a178587
Complete layout for new feature div in Some Amazing Features section
toalina Sep 23, 2015
f456ed5
Resolve merge conflict
toalina Sep 23, 2015
8313837
positioning boxes/added imgs
Brian11f Sep 23, 2015
fcf2099
Fix svg file, use as background img with pic-insert mixin
toalina Sep 23, 2015
d84cf87
Style and layout for App Support section.
mollyfish Sep 23, 2015
373f6b1
Create app-support partial
mollyfish Sep 23, 2015
8dbe689
Merge pull request #117 from mbuchthal/features_layout
mollyfish Sep 23, 2015
e1517ae
Merge pull request #118 from mbuchthal/support-section
toalina Sep 23, 2015
58caf41
add flex format
mbuchthal Sep 23, 2015
d73a0a9
merge conflict main.scss
mbuchthal Sep 23, 2015
1b10079
Merge pull request #119 from mbuchthal/socialsection
mollyfish Sep 23, 2015
e08a28d
Fix bug in main.scss
mollyfish Sep 23, 2015
11332fe
Merge pull request #120 from mbuchthal/main-bug
mbuchthal Sep 23, 2015
731fae6
adding arrow svg in css
Brian11f Sep 23, 2015
ca0187a
fixed merge conflict in html
Brian11f Sep 23, 2015
04c611c
Style and layout for blogroll section.
mollyfish Sep 23, 2015
2860b4c
Merge pull request #121 from mbuchthal/blogroll
mbuchthal Sep 23, 2015
5529928
add flickr section
mbuchthal Sep 23, 2015
46af704
Merge pull request #122 from mbuchthal/flickr
Brian11f Sep 23, 2015
c37fd8e
Style AppBox logo and paragraph at bottom of page
mollyfish Sep 23, 2015
3c70a30
readjust top margins for mobile layout
mollyfish Sep 23, 2015
cc45548
Merge pull request #123 from mbuchthal/appbox-info
mbuchthal Sep 23, 2015
cc65a20
finnish h1 in download
Brian11f Sep 23, 2015
8e896ac
Complete Popular Tags layout and style
toalina Sep 23, 2015
0a4927d
Resolve merge conflict
toalina Sep 23, 2015
8bb0a02
Merge pull request #126 from mbuchthal/popular_tags
Brian11f Sep 23, 2015
0df5964
Remove extra text
toalina Sep 23, 2015
413eec0
Merge pull request #127 from mbuchthal/popular_tags
Brian11f Sep 23, 2015
8a58f17
Modify _new-feature.scss partial div widths
toalina Sep 23, 2015
7a7e10e
Add padding-left and padding-right to .new-feature-wrapper
toalina Sep 23, 2015
678614c
Center image position in .feature-img-wrapper. Finish layout in .new-…
toalina Sep 23, 2015
f09c332
fix font and header on pricing section, refactored files into section…
mbuchthal Sep 23, 2015
4244a4c
Merge pull request #128 from mbuchthal/new_feature
mbuchthal Sep 23, 2015
d506f6e
merge conflict main.scss
mbuchthal Sep 23, 2015
ecfdb55
Merge pull request #130 from mbuchthal/discpricingheader
toalina Sep 23, 2015
be3c480
done with download for now
Brian11f Sep 23, 2015
ca702da
Merge pull request #131 from mbuchthal/brian-download0-app
toalina Sep 23, 2015
12363fb
Import Gallery CSS and start tweaking styles
mollyfish Sep 23, 2015
bdc0f9d
sass error fix
mbuchthal Sep 23, 2015
68dbc5b
Merge pull request #132 from mbuchthal/twocolumndel
mollyfish Sep 23, 2015
f684cbd
Finish replacing js carousel with CSS
mollyfish Sep 24, 2015
02d38cc
Fix hover behavior and color variable bug
mollyfish Sep 24, 2015
64346ce
Cleaned up commented-out code
mollyfish Sep 24, 2015
dd3dfd2
Resolve merge conflicts in multiple files
mollyfish Sep 24, 2015
db87ae6
Merge pull request #133 from mbuchthal/css_carousel
mbuchthal Sep 24, 2015
5959720
download style start, refactor large buttons into button/mock partial
mbuchthal Sep 24, 2015
c4435b7
Merge pull request #134 from mbuchthal/downloadappstyle
mollyfish Sep 24, 2015
aa845ae
Fix color variable name
mollyfish Sep 24, 2015
d3a7739
Merge pull request #135 from mbuchthal/sass-bug
mbuchthal Sep 24, 2015
72cf10d
Style download buttons to be one line, position properly.
mollyfish Sep 24, 2015
4c85bdc
Merge pull request #136 from mbuchthal/button-inline
mbuchthal Sep 24, 2015
eb1cb3a
update color/size on bestway section, fix feature section font size d…
mbuchthal Sep 24, 2015
fbb268f
Begin refactor of screenshots section.
mollyfish Sep 24, 2015
b7c4650
Merge pull request #137 from mbuchthal/bestwayfix2
mollyfish Sep 24, 2015
83e3bd2
header done
Brian11f Sep 24, 2015
88a11f8
Merge pull request #143 from mbuchthal/brian-nav-bar-fixed
toalina Sep 24, 2015
dda1922
Create back-to-top triangle on .social-section near footer
toalina Sep 24, 2015
e06ad7c
Modify smooth scroll to include back-to-top triangle
toalina Sep 24, 2015
50d3e2e
Merge pull request #144 from mbuchthal/back-to-top
Brian11f Sep 24, 2015
8871c1c
Replace dysfunctional carousel with Slick carousel plugin
mollyfish Sep 24, 2015
d058d1f
Clean up file structure after implementation of plugin
mollyfish Sep 24, 2015
c521131
Add media calls for desktop layout
mollyfish Sep 24, 2015
2bfd536
Merge pull request #147 from mbuchthal/screenshots
Brian11f Sep 24, 2015
22fbc70
fixed mobile with overflow hidden on html,body
Brian11f Sep 24, 2015
9801171
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 24, 2015
d335f38
Merge pull request #148 from mbuchthal/brian-mobile-testing
mollyfish Sep 24, 2015
de21640
add slanty divs for background
mbuchthal Sep 24, 2015
4ff78d9
Change nav font and height
toalina Sep 24, 2015
db21daa
merge conflict
mbuchthal Sep 24, 2015
c3574b9
Merge pull request #150 from mbuchthal/navfont
mbuchthal Sep 24, 2015
d27138a
Change App Reviews from old carousel to Slick carousel
mollyfish Sep 24, 2015
20337b1
Merge pull request #149 from mbuchthal/background-add
toalina Sep 24, 2015
b1b099e
Resolve merge conflict in _why-choose.scss
mollyfish Sep 24, 2015
5ad63e8
Merge pull request #151 from mbuchthal/app-reviews
mbuchthal Sep 24, 2015
7b0ad02
fixed mobile download app img scale
Brian11f Sep 24, 2015
e8d88ee
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 24, 2015
22c80bc
Modify font in pricing features
toalina Sep 24, 2015
81cf327
Merge pull request #152 from mbuchthal/price-fonts
Brian11f Sep 24, 2015
2d6b2a1
Merge pull request #153 from mbuchthal/brian-mobile-testing
toalina Sep 24, 2015
60d7650
add media queries to div
mbuchthal Sep 24, 2015
7c55f1a
Adjust layout in full screen and mobile for social section
toalina Sep 24, 2015
a10d73a
Merge pull request #154 from mbuchthal/social-section-layout
Brian11f Sep 24, 2015
62c634a
updating
Brian11f Sep 24, 2015
8043374
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 24, 2015
b48dc88
add addtional media queries for background divs
mbuchthal Sep 24, 2015
bcbd172
Merge pull request #195 from mbuchthal/background-media
mollyfish Sep 24, 2015
6957444
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 24, 2015
96a7e86
fix first arrow in getitfree section and remove extra markup for section
mbuchthal Sep 25, 2015
41b5387
Merge pull request #197 from mbuchthal/tabletophide
mollyfish Sep 25, 2015
1ab3234
fixed margin down load app
Brian11f Sep 25, 2015
35c09bf
Fix top nav logo padding and size
toalina Sep 25, 2015
e2e61a0
Merge pull request #198 from mbuchthal/download-app-margin-fix
mbuchthal Sep 25, 2015
a7605b4
Center align for MENU on mobile view
toalina Sep 25, 2015
2a0f45c
fixed img hide @550 and fixed spacing in safari
Brian11f Sep 25, 2015
72032d0
Reduce margin in home section
toalina Sep 25, 2015
cf21ebd
swapped out forbes logo with png
mbuchthal Sep 25, 2015
13d7a2b
Merge pull request #199 from mbuchthal/download-app-img-hide
mbuchthal Sep 25, 2015
6297e67
Remove home section phone in mobile view
toalina Sep 25, 2015
f2858ca
Merge pull request #200 from mbuchthal/forbeslogofix
mollyfish Sep 25, 2015
0ec6f31
Add accent bar to Some Amazing Features h1
toalina Sep 25, 2015
8f1b481
Less margin-top in Amazing Features LI's in mobile view
toalina Sep 25, 2015
83f4764
Video element bigger on mobile view
toalina Sep 25, 2015
45ee145
Remove margin-top from .arrow-position-wrapper in Why Choose section,…
toalina Sep 25, 2015
1f0b1a2
place arrow correctly in download app section with rotate
mbuchthal Sep 25, 2015
35d1768
Modify space above Team members, mobile to tablet to desktop
toalina Sep 25, 2015
ff9f179
fixed p width
Brian11f Sep 25, 2015
8a90660
refixed h1 issue from last push
mbuchthal Sep 25, 2015
b70ed82
Merge pull request #202 from mbuchthal/discounted-pricing-width-fix
mbuchthal Sep 25, 2015
901113c
spacing
mbuchthal Sep 25, 2015
55de358
Merge pull request #201 from mbuchthal/dwnloadarrow
Brian11f Sep 25, 2015
7796471
Modify margin in Live Support section, mobile to tablet to desktop
toalina Sep 25, 2015
18edea4
Modify margin in live support, adjust aside width to fit
toalina Sep 25, 2015
411a1b3
Resolve merge conflict
toalina Sep 25, 2015
ad1e00c
Merge pull request #203 from mbuchthal/logo-margin
mbuchthal Sep 25, 2015
9eb7b0d
fixed centered circle
Brian11f Sep 25, 2015
51d1811
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 25, 2015
68c5411
Merge pull request #204 from mbuchthal/centered-circle-price
mbuchthal Sep 25, 2015
76c60fa
add prefix for back to top arrow and move in html
mbuchthal Sep 25, 2015
e46079f
Change video width on full screen
toalina Sep 25, 2015
2f5ab7a
change background color on quickform increased font size on placeholder
mbuchthal Sep 25, 2015
7451ac5
Merge pull request #206 from mbuchthal/appsuppform
Brian11f Sep 25, 2015
c46e8de
Merge pull request #207 from mbuchthal/video
Brian11f Sep 25, 2015
b5296ca
Merge pull request #208 from mbuchthal/formbackground
Brian11f Sep 25, 2015
82c4216
adjust img on download app section and change media query to 1030px b…
mbuchthal Sep 25, 2015
79eb507
Create styleguide to go with project
mollyfish Sep 25, 2015
2a028a8
Merge pull request #210 from mbuchthal/styleguide
mbuchthal Sep 25, 2015
0541ea8
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 25, 2015
5c52479
Merge pull request #209 from mbuchthal/skewfix_two
mollyfish Sep 25, 2015
f888c22
Change margin-top App Support section, mobile view
toalina Sep 25, 2015
af717b2
Change margin-bottom App Support section, all views. Change color in …
toalina Sep 25, 2015
ae0a584
fixed accent bar
Brian11f Sep 25, 2015
f5a1089
fix size on google play to match ios link
mbuchthal Sep 25, 2015
1dcb0d7
Merge pull request #211 from mbuchthal/appsupport
mbuchthal Sep 25, 2015
6213348
Increase carosuel dot size in safari and firefox
mollyfish Sep 25, 2015
d7c9fed
Merge pull request #212 from mbuchthal/googleplaysizefix
mollyfish Sep 25, 2015
bb2a8b8
Merge pull request #213 from mbuchthal/carousel-dots
mbuchthal Sep 25, 2015
85ae4a5
Change width of App Support ul, mobile view
toalina Sep 25, 2015
51e8164
Merge pull request #214 from mbuchthal/app_support_email
mollyfish Sep 25, 2015
8785924
Adjust size of carousel arrows
mollyfish Sep 25, 2015
617c195
Merge pull request #215 from mbuchthal/carousel-arrows
toalina Sep 25, 2015
38feb20
Adjust position of animated dots
mollyfish Sep 25, 2015
183290f
fixed dropdown menu
Brian11f Sep 25, 2015
c004d7c
Merge pull request #217 from mbuchthal/accent-bar
mollyfish Sep 25, 2015
0eae704
Merge pull request #216 from mbuchthal/animated-dots
mbuchthal Sep 25, 2015
ac4fd89
add additional media queries for background divs and style sections t…
mbuchthal Sep 25, 2015
c9cfe3d
add additional style for iphone
mbuchthal Sep 25, 2015
8cc6198
center pricing button in mobile view
mbuchthal Sep 25, 2015
444ab29
remove arrow from get free on small devices. fix on the download our …
mbuchthal Sep 25, 2015
736d199
Merge pull request #221 from mbuchthal/getfreearrow
mollyfish Sep 25, 2015
640a4d1
Reposition marketplace links for more space on mobile
mollyfish Sep 25, 2015
276098c
Position get it free arrow
mollyfish Sep 25, 2015
9912bbb
Rename download links file to marketplace links.
mollyfish Sep 25, 2015
a8ffd8c
Merge pull request #223 from mbuchthal/button-space
Brian11f Sep 25, 2015
3a255fd
fixed dropdown menu
Brian11f Sep 25, 2015
ad11cf6
Modify margin in Download Our App section, mobile view
toalina Sep 25, 2015
485ee09
Changed filename so main.scss would find it
mollyfish Sep 25, 2015
7509e04
fixed dropdown menu
Brian11f Sep 25, 2015
881947a
Merge pull request #224 from mbuchthal/sass-bug
Brian11f Sep 25, 2015
5a54986
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 25, 2015
3f15218
move picture to why choose element to allow for overlap
mbuchthal Sep 25, 2015
2d745af
fixed dropdown menu
Brian11f Sep 25, 2015
939974e
Modify Video section spacing and Download our App spacing
toalina Sep 25, 2015
746484f
Set media call to disappear arrows in mobile
mollyfish Sep 25, 2015
dcf102a
Merge pull request #226 from mbuchthal/newfeature-picturefix
Brian11f Sep 25, 2015
fa0b70b
small skew fix
mbuchthal Sep 25, 2015
697730d
Merge pull request #228 from mbuchthal/arrow-hide
Brian11f Sep 25, 2015
fbdf6fa
small skew fix merge conflict
mbuchthal Sep 25, 2015
7126a43
Merge pull request #229 from mbuchthal/skewfix_5
mollyfish Sep 25, 2015
5d234a9
Modify Download Our App section margins
toalina Sep 25, 2015
38f134b
Merge pull request #230 from mbuchthal/download_app_spacing
mollyfish Sep 25, 2015
4587d54
fixed dropdown menu
Brian11f Sep 25, 2015
d911cd6
Merge pull request #231 from mbuchthal/accent-bar
mollyfish Sep 25, 2015
ece0fa9
fix skew
mbuchthal Sep 25, 2015
ad82232
Merge pull request #232 from mbuchthal/skewfix_6
Brian11f Sep 25, 2015
52404d5
Set dark theme color to be a function of theme color
mollyfish Sep 25, 2015
96ca659
Merge pull request #233 from mbuchthal/colors
Brian11f Sep 25, 2015
b44aa49
Add animate effect to searchbox
toalina Sep 25, 2015
5b44498
Add padding to searchbox-input
toalina Sep 25, 2015
3df0186
added jiggle to send button
Brian11f Sep 25, 2015
7ea7688
Change video heading to white
mollyfish Sep 25, 2015
5a26141
Merge pull request #234 from mbuchthal/search_jq
mollyfish Sep 25, 2015
b86be2b
Merge pull request #236 from mbuchthal/video-color
toalina Sep 25, 2015
88e8627
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 25, 2015
8790937
fix skew
mbuchthal Sep 25, 2015
4d905b9
added jiggle to send button
Brian11f Sep 25, 2015
7e6f24b
Merge pull request #235 from mbuchthal/jiggle-send-button
mbuchthal Sep 25, 2015
2bbb412
Merge pull request #237 from mbuchthal/skewfix_7
Brian11f Sep 25, 2015
b8dfa63
added jiggle to send button
Brian11f Sep 25, 2015
464cca7
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 25, 2015
4b60db4
another skew fix
mbuchthal Sep 25, 2015
d426d35
Merge pull request #238 from mbuchthal/jiggle-send-button
toalina Sep 25, 2015
9a7abd5
Merge pull request #239 from mbuchthal/skewfix_8
toalina Sep 25, 2015
b9678b3
Bug fixes in styleguide
mollyfish Sep 25, 2015
0d81215
Merge pull request #240 from mbuchthal/styleguide
mbuchthal Sep 25, 2015
8389526
Remove commented code and whitespaces from Sass files
toalina Sep 25, 2015
5c9922b
cleaning up files
Brian11f Sep 25, 2015
2cee608
Merge branch 'master' of https://github.com/mbuchthal/project_week_on…
Brian11f Sep 25, 2015
15d6f76
clean out html and commented code
mbuchthal Sep 25, 2015
5ceba52
Merge pull request #241 from mbuchthal/clean_up_sass
Brian11f Sep 25, 2015
0f3b48e
Merge pull request #242 from mbuchthal/cleaningupphotos
toalina Sep 25, 2015
67ebdb2
Make html snippets for each component
mollyfish Sep 25, 2015
6c79c8b
Merge pull request #243 from mbuchthal/breakdown-view
Brian11f Sep 25, 2015
1ecab72
Fix guide sass error
mollyfish Sep 25, 2015
184a7f1
Merge pull request #245 from mbuchthal/guide
Brian11f Sep 25, 2015
cd1e996
html fix
mbuchthal Sep 25, 2015
68057ac
Fix backgroun dcolor in styleguide
mollyfish Sep 25, 2015
d29aae9
Merge pull request #246 from mbuchthal/guide
Brian11f Sep 25, 2015
1d0a91b
merge conflict
mbuchthal Sep 25, 2015
430bbac
Merge pull request #244 from mbuchthal/file_reorg
mollyfish Sep 25, 2015
8d65ca9
sass bug fix
mollyfish Sep 25, 2015
84ecdfa
Merge pull request #247 from mbuchthal/sass
mbuchthal Sep 25, 2015
b0761a6
Update README.md
toalina Sep 25, 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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,10 @@ Icon
Network Trash Folder
Temporary Items
.apdisk

#Node Modules
node_modules/

public/css/**/*.css

playground.html
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("public/sass/**/*.scss")
.pipe(sass().on("error", sass.logError))
.pipe(gulp.dest("./public/css/"));
});

gulp.task("watch", ["sass"], function() {
gulp.watch("public/sass/**/*.scss", ["sass"]);
});
31 changes: 6 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
# Welcome to Project Week: One
# Code Fellows Front-End DA - Project Week: One
## Mark Buchthal, Brian Fink, Molly Kent, & Alina To

You are completing your first month in the Code Fellows Front-End Development Accelerator. Now it's time to exercise all the new things you have learned.
### Description

### Here is the scenario:

You are a 4 person team and the next project you are to deliver is the front-end prototype for a new app branding marketing site. The expectation is that you can deliver a fully functional, mobile first, and desktop RWD version of the provided comp.

Again, the design team came up short and there is no mobile comp, so please use your best judgement for how this will work, look and feel on a handheld mobile device and tablet.

Think COMPONENT ARCHITECTURE! Think about breaking the UI up into it's smallest parts and building up from there.

### Fork and build

You know the drill, fork the repo and let it take on a life of it's own, you are on control of your own destiny!

### Be agile

It is HIGHLY suggested that you come up with a plan of attack. It's a four person team (2 pairs, no solo work!), so planning will help reduce the amount of over-lap work. Assign some responsibilities of things to be completed that can be addressed while others are addressing other needs of the project.

QA IS ESSENTIAL! Make sure that all your work is being reviewed as your progress. Catch bugs early and solve problems before they get too big.
For our Project Week: One, we created a front-end prototype for a new app branding marketing site. We were given a comp for full desktop view, and created a fully-functional prototype following mobile-first approach, tailored for handheld mobile device, tablet, and desktop RWD views.

Besides semantically correct HTML, we focused heavily on Sass architecture. We built smaller components, then built up surrounding pieces from there. As a four person team, we made a plan based on defining component pieces, then delegated responsibilities among the group. When we ran into overlap issues, we resolved them cooperatively. Along the way, we tested on mobile (Safari and Chrome), tablet (Safari), and desktop (Safari, Chrome, and Firefox).

## From our initial assignment repo:
### The comp

See the the `comps/` directory. Choose the one that you want to execute on and DO IT!
Expand All @@ -44,9 +31,3 @@ There are three individual deliverables:
1. Update top nav and link to each section of the view / smooth scrolling a +
1. jQuery plug-ins are optional, but limited to one per project
1. Deployed to http://surge.sh/

## Project week demo

Projects are due to be completed by Friday NOON! Take lunch and we will have demo reviews at 3pm. Please no commits after NOON or we will have to be angry O_O

Demos your completed project; things you learned and approaches you took to solve the problem will be expected to be presented.
24 changes: 24 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "project_week_one",
"version": "0.1.0",
"description": "prototype from comp",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/mbuchthal/project_week_one.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/mbuchthal/project_week_one/issues"
},
"homepage": "https://github.com/mbuchthal/project_week_one#readme",
"devDependencies": {
"express": "^4.13.3",
"gulp": "^3.9.0",
"gulp-sass": "^2.0.4"
}
}
48 changes: 48 additions & 0 deletions public/app-download.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!doctype html>
<html class="no-js" lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>App Download</title>
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link href="https://fonts.googleapis.com/css?family=Raleway:400,300,600" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300italic,500" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="css/gallery.build.css">
<link rel="stylesheet" href="css/gallery.theme.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>

<section class="download-app-section">
<div class="download-img">
<img src="assets/backgroundBlueIphone.png" alt="">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is broken in "production" (looks like the server 404's). Works locally, so it's probably a path-related issue.

Additionally, your naming here is a little inconsistent -- you have backgroundBlueIphone.png for this, but simply htcPhone.png for the other.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 what @miketierney said

<img src="assets/htcPhone.png" alt="">
</div>
<div class="download-link-form">
<div class="download-link">

<h1><span>Download</span> Our App<span class="accent-bar-L"></span></h1>
<span class="drawn-arrow-blk-rotate"></span>
<p>Choose your native platform and download the app FREE!</p>
<div class="download-link-wrapper">
<a href="#" class="lg-eclipse-border">
<span class="icon-google-play">Google Play</span>
</a>
<a href="#" class="lg-eclipse-border">
<span class="icon-apple">iOS App Store</span>
</a>
</div>
</div>
<form action="" class="download-form quickform"><fieldset><legend>Subscribe To Newsletter</legend><input type="email" placeholder=" Enter your email address"/><button type="submit" class="sm-button-eclipse-border jiggle-effect">SUBMIT</button></fieldset></form>
</div>
</section>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/deps/jquery.js"><\/script>')</script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/video.js"></script>
<script type="text/javascript" src="js/smooth-scroll.js"></script>
<script type="text/javascript" src="js/deps/slick.js"></script>
<script type="text/javascript" src="js/nav-search.js"></script>
</body>
</html>
66 changes: 66 additions & 0 deletions public/app-reviews.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<!doctype html>
<html class="no-js" lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>App Reviews</title>
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link href="https://fonts.googleapis.com/css?family=Raleway:400,300,600" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300italic,500" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="css/gallery.build.css">
<link rel="stylesheet" href="css/gallery.theme.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>

<section id="about-nav" class="why-choose">

<div class="app-review-wrapper">
<div class="arrow-position-wrapper">
<span class="sm-semicircular-eclipse-border"><span class="icon-quotes"></span></span>
<h2 id="reviews-nav" class="center-align">App Reviews</h2>
<h4>Read What Our Happy Customers Are Saying</h4>
<span class="drawn-arrow-wh">&nbsp;</span>
</div>

<div class="review-gallery">
<div>
<p>Eleifend morbi orci velit porttitor sed imperdiet ac ullamcorper Fusce eget tortor vel magna iaculis convallis. Aeneaneros vitae metus pellentesque tincidunt.Cum sociis natoque penatibus et magnis dis parturient montes turpis donec tincidunt tellus.</p>
<figure class="profile">
<span class="circle">
<img src="images/edison.jpg" alt="Portrait of Thomas Edison">
</span>
<figcaption><span class="name">Thomas Edison</span>Inventor : The Lightbulb</figcaption>
</figure>
</div>
<div>
<p>Eleifend morbi orci velit porttitor sed imperdiet ac ullamcorper Fusce eget tortor vel magna iaculis convallis. Aeneaneros vitae metus pellentesque tincidunt.Cum sociis natoque penatibus et magnis dis parturient montes turpis donec tincidunt tellus.</p>
<figure class="profile">
<span class="circle">
<img src="images/buchanan.jpg" alt="Portrait of James Buchanan">
</span>
<figcaption><span class="name">James Buchanan</span>Winner : Best Hair</figcaption>
</figure>
</div>
<div>
<p>Eleifend morbi orci velit porttitor sed imperdiet ac ullamcorper Fusce eget tortor vel magna iaculis convallis. Aeneaneros vitae metus pellentesque tincidunt.Cum sociis natoque penatibus et magnis dis parturient montes turpis donec tincidunt tellus.</p>
<figure class="profile">
<span class="circle">
<img src="images/stanton.jpg" alt="Portrait of Elizabeth Cady Stanton">
</span>
<figcaption><span class="name">Elizabeth Stanton</span>Champion : Women's Suffrage</figcaption>
</figure>
</div>
</div>
</section>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/deps/jquery.js"><\/script>')</script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/video.js"></script>
<script type="text/javascript" src="js/smooth-scroll.js"></script>
<script type="text/javascript" src="js/deps/slick.js"></script>
<script type="text/javascript" src="js/nav-search.js"></script>
</body>
</html>
57 changes: 57 additions & 0 deletions public/app-support.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<!doctype html>
<html class="no-js" lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>App Support</title>
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link href="https://fonts.googleapis.com/css?family=Raleway:400,300,600" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300italic,500" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="css/gallery.build.css">
<link rel="stylesheet" href="css/gallery.theme.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>

<section id="support-nav" class="app-support clearfix">
<h1>App Support<span class="accent-bar-C"></span></h1>
<ul>
<li class="clearfix">
<span class="icon-location sm-circular-eclipse-border"></span>
<h3>Address</h3>
<address>121 King Street, Melbourne<br/>Victoria, Australia 3000</address>
</li>
<li class="clearfix">
<span class="icon-phone sm-circular-eclipse-border"></span>
<h3>Free Helpline</h3>
<a href="tel:+001800345333700">(001) 800 345 333700</a>
<a href="tel:+002600345333700">(002) 600 345 333700</a>
</li>
<li class="clearfix">
<span class="icon-mail sm-circular-eclipse-border"></span>
<h3>Email</h3>
<a href="mailto:[email protected]">[email protected]</a>
<a href="mailto:[email protected]">[email protected]</a>
</li>
</ul>

<form id="helpform" class="fullform">
<p>Nullam id odio quis risus placerat aliquam. Cum sociis natoque penatibus et magnis dis part urient montes nascetur ridiculus mus curabitur tellus lacus.</p>
<input type="text" placeholder=" Full Name" name="help-name" id="help-name">
<input type="email" placeholder=" Email" name="help-email" id="help-email">
<textarea name="message" form="helpform" rows="8">Message</textarea>
<button type="submit" class="sm-button-eclipse-border jiggle-effect">SEND</button>
</form>
</section>


<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/deps/jquery.js"><\/script>')</script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/video.js"></script>
<script type="text/javascript" src="js/smooth-scroll.js"></script>
<script type="text/javascript" src="js/deps/slick.js"></script>
<script type="text/javascript" src="js/nav-search.js"></script>
</body>
</html>
4 changes: 4 additions & 0 deletions public/assets/arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/assets/arrowblack.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/backgroundBlueIphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions public/assets/behance.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/googleLogo-wh.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/googleLogo.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/head-iphone.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/htcPhone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading