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.

Sign up for GitHub

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

Jump to bottom

w3-a3__MollyKentAlinaTo__DONE #19

Open
wants to merge 189 commits into
base: master
Choose a base branch
from
Open

w3-a3__MollyKentAlinaTo__DONE #19

wants to merge 189 commits into from

Conversation

toalina
Copy link

@toalina toalina commented Sep 14, 2015

Week 3 Project COMPLETED.

  1. Included all revisions from week 2 feedback from Jed (i.e. Reorganized HTML, deleted extra classes, etc.)
  2. Sass:
    • Configured Gulpfile.js, Sass, and .gitignore
    • Refactored CSS files into SCSS files
    • Reorganized SCSS file system (with a main.scss and _(partial files).scss)
    • NOTE: Unmerged branch (file_reorg) contains continued refactor and reorganization of SCSS files (into sub directories) -- We didn't merge this because it is not done, but we wanted to turn in a functioning final product for Week 3 assignment. We would appreciate feedback on unmerged branch as well!
  3. Added jQuery features:
    • Smooth scroll applied to top nav links (Top Nav), sign up links (Services), contact us link (About).
    • Image carousel (Portfolio)
    • Filter behavior on secondary nav (Portfolio) with fade in/out effects
    • Figure carousel (Team / Clients)
    • Map hover effect (Contact)
    • Inactive form alert (Contact)

@blackfalcon @miketierney @jedfoster

carousel_dots

filter_before

filter_after

map_before

map_after

alert_popup_before

alert_popup_after

mollyfish and others added 30 commits September 8, 2015 08:34
@mollyfish
initial commit
63b0310
@mollyfish
finished pulling images
7b6837d
@toalina
Merge pull request #2 from mollyfish/images
7362bdb 
finished pulling images
@toalina
Images are in, start HTML setup
309e260
@mollyfish
Merge pull request #3 from mollyfish/htmlsetup
7b42c0f 
Images are in, start HTML setup
@mollyfish
Initial commit. Add Procfile and server.js
2cc12a2
@mollyfish
create gitignore, install express
fcd1505
@mollyfish
restructure file directories, launch server and access from mobile de…
fedd3d1 
…vice
@toalina
Merge pull request #10 from mollyfish/9_simple_server
bcde9f4 
9 simple server
@toalina
Add CSS and change HTML in Services section
04b156f
@mollyfish
Close #10 Add 404 page and fine tune server behavior
7d56c0e
@toalina
Merge pull request #12 from mollyfish/10_add_404
20341b7 
Close #10 Add 404 page and fine tune server behavior
@toalina
Modify CSS in Services section
a2772b6
@toalina
Modify CSS in Services and modify gitignore
08e889e
@toalina
Merge branch 'master' into servicescss
63afcdb 
Fix merge, merge master into servicescss
@mollyfish
Merge pull request #13 from mollyfish/servicescss
f3109e0 
Servicescss
@toalina
Remove the now ignored directory node_modules
e062245
@toalina
Remove the now ignored directory node_modules
282eddc
@mollyfish
Close #4 add flex box, continue with Portfolio section
9afafb1
@toalina
Merge pull request #14 from mollyfish/4_add_flexbox
68ad64a 
Close #4 add flex box, continue with Portfolio section
@mollyfish
Complete basic layout of Portfolio section
8b00cd9
@mollyfish
Close #8 portfolio submodules and layout
5bafa69
@toalina
Merge pull request #25 from mollyfish/8_portfolio_submodules
b759cef 
8 portfolio submodules
@mollyfish
Add icon font library
cb12e89
@mollyfish
Add hover behavior with icon to Portfolio link images
73be2ad
@mollyfish
Replace tiny icon images with proper social media icons, format hover…
8e24ed1 
… behavior
@toalina
Change About section progress bars, adjust About section layout
77e4b29
@toalina
Start CSS on Contact section form, incomplete
a1066ba
@mollyfish
Merge pull request #26 from mollyfish/aboutprogressbar
338a039 
Change About section progress bars, adjust About section layout
@mollyfish
Finalize social icons in Team section, finish Team section layout
9b45e27
toalina and others added 23 commits September 17, 2015 10:52
@toalina
Add alert popup when submitting form
6576495
@mollyfish
Merge pull request #101 from mollyfish/contact_alert
6a71819 
Add alert popup when submitting form
@mollyfish
Add carousel functionality to Portfolio top image
f31ccf9
@mollyfish
Resolve merge conflict in index.html
9421575
@toalina
Merge pull request #102 from mollyfish/carousel
7a2a108 
Add carousel functionality to Portfolio top image
@toalina
Convert signup and contact us buttons to anchor links.
a1a2c37
@mollyfish
Merge pull request #103 from mollyfish/signup_links
0c997a3 
Convert signup and contact us buttons to anchor links.
@toalina
Rename top_nav.js to smooth_scroll.js
63012b2
@mollyfish
Merge pull request #104 from mollyfish/smooth_scroll
612807c 
Rename top_nav.js to smooth_scroll.js
@toalina
Add slidedown and slideup to contact info figcaption
b5a4e08
@mollyfish
Add carousel functionality to Clients, refactor _slider.scss
be5d647
@toalina
Merge pull request #106 from mollyfish/slider
7f9993f 
Add carousel functionality to Clients, refactor _slider.scss
@mollyfish
Refactored Clients carousel to include prev/next icons
7a8098d
@mollyfish
Merge pull request #105 from mollyfish/contact_map_hover
4ddfa5b 
Add slidedown and slideup to contact info figcaption
@toalina
Merge pull request #107 from mollyfish/slider
de22874 
Refactored Clients carousel to include prev/next icons
@mollyfish
Fix portfolio h1 color
c724aea
@toalina
Merge pull request #108 from mollyfish/colorbug
9dc6bdd 
Fix portfolio h1 color
@mollyfish
Fix Safari flexbox bug in Portfolio section
6871565
@toalina
Add data-attributes to Portfolio gallery items
e3d75f3
@toalina
Add effects to fadeIn and fadeOut filtered gallery items
f4d2e2f
@toalina
Merge pull request #110 from mollyfish/safari_flex_fix
8040c9e 
Fix Safari flexbox bug in Portfolio section
@toalina
Cleaned up whitespaces
7cd1c8f
@mollyfish
Merge pull request #111 from mollyfish/portfolio_filter
02250c2 
Portfolio filter
@toalina toalina changed the title w3-a3__MollyKentAlinaTo__wip w3-a3__MollyKentAlinaTo__DONE Sep 18, 2015
@jedfoster jedfoster self-assigned this Oct 22, 2015
jedfoster
jedfoster reviewed Oct 22, 2015
View reviewed changes
public/index.html
<!-- services -->
<article class="services" id="services">
<div class="horizontal-rules">
<span class="rule-L-long">&nbsp;</span>
Copy link

Choose a reason for hiding this comment

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

What happened to the :before and :after pseudo-content on this? Separate elements is a step backward from what you had previously. Was there a reason for the change?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jedfoster jedfoster

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@toalina @jedfoster @mollyfish