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

Dev #32

Merged
merged 70 commits into from
Mar 6, 2019
Merged

Dev #32

merged 70 commits into from
Mar 6, 2019

Conversation

erintait
Copy link
Owner

@erintait erintait commented Mar 6, 2019

No description provided.

erintait and others added 30 commits November 5, 2018 16:13
@erintait
added name
4d8f56f
@erintait
images added, some basic css done
4d04b91
@erintait
Merge pull request #1 from erintait/images-added
a7fcf4e 
images added, some basic css done
@erintait
adjusted about me and contact formatting
c1973a1
@erintait
Merge pull request #2 from erintait/about-me
95cb419 
adjusted about me and contact formatting
@erintait
removed unneeded commented code
f19c8c5
@erintait
Merge pull request #3 from erintait/comments
48b52d1 
removed unneeded commented code
@erintait
added some icons to skills, restructuring skills section, added subti…
1ee1287 
…tle to projects
@erintait
added several skills to skills section
5dd4b6a
@erintait
skills section finished, need to fix alignment of github icon
f8c768d
@erintait
Merge pull request #4 from erintait/projects
7d876bb 
Skills section complete
@erintait
added favicon and image of myself
92766f2
@erintait
Merge pull request #5 from erintait/about-me
8c030d1 
added favicon and image of myself
@erintait
changed logo in header
58bc877
@erintait
added several carousel images, favicon
a2aa6a4
@erintait
Merge pull request #6 from erintait/modal
b84298e 
Modal
@erintait
adjusted about me header
7bd31c7
@erintait
re-added footer, made small css adjustments to footer
e19cef8
@erintait
Merge pull request #7 from erintait/about-me-header
5995e1b 
About me header
@erintait
worked around modal, adjusted skills section, fixed bug with portfoli…
4f0f095 
…o section
@erintait
Merge pull request #8 from erintait/modal
44d2a20 
no longer using modal
@erintait
adjusted alignment of project titles and icons
878ebe1
@erintait
Merge pull request #9 from erintait/project-titles
ed0cac0 
adjusted alignment of project titles and icons
@erintait
email
f278c5a
@erintait
Merge pull request #10 from erintait/email
4c24c09 
email
@erintait
adjusted contact form header css and css on portfolio titles and icons
76e2860
@erintait
Merge pull request #11 from erintait/contact-css
0c3c379 
adjusted contact form header css and css on portfolio titles and icons
@erintait
removed some unnecessary files, adjusted logo in nav
f00dc32
@erintait
Merge pull request #12 from erintait/nav-adjustments
4492a5f 
removed some unnecessary files, adjusted logo in nav
@erintait
added media queries for portfolio icons
804b5ad
erintait and others added 28 commits March 3, 2019 23:02
@erintait
Merge pull request #19 from erintait/unnecessary-files
a16f91b 
removed several unnecessary files
@erintait
changed text on button in contact form
a2dd603
@erintait
removed some unneeded code from main and index files
4ae7112
@erintait
added offline check for contact form
914362f
@erintait
Merge pull request #20 from erintait/contact-form-changes
aa91059 
Contact form changes
@erintait
offline error handling working
c90449d
@erintait
Merge pull request #21 from erintait/contact-form-changes
94ba1e1 
offline error handling working
@erintait
fixed contact form issue, comment changed to message
ef87f1f
@erintait
Merge pull request #22 from erintait/contact-form-changes
97c1d53 
fixed contact form issue, comment changed to message
@erintait
fixed contact form message bug
e588f5b
@erintait
Merge pull request #23 from erintait/contact-form-changes
adc4df2 
fixed contact form message bug
@erintait
added trim function for whitespace
278a0ee
@erintait
successfully trimming whitespace from either end of the strings for c…
b22d85b 
…ontact form
@erintait
Merge pull request #24 from erintait/contact-form-changes
3a1ac30 
Contact form changes
@erintait
removing click on contact button
85e32ae
@erintait
removed unneeded code
a9b65ba
@erintait
Merge pull request #25 from erintait/contact-form-changes
7980be9 
Contact form changes
@erintait
trying to get removal of click handler to work
123453f
@erintait
Merge pull request #26 from erintait/contact-form-changes
8bd93ed 
trying to get removal of click handler to work
@erintait
still trying to fix contact form button
a2d9f98
@erintait
Merge pull request #27 from erintait/contact-form-changes
41cd8e5 
still trying to fix contact form button
@erintait
adding disabled property
13e9135
@erintait
adding disabled property
e021c05
@erintait
Merge pull request #28 from erintait/contact-form-changes
50ed592 
Contact form changes
@erintait
adding and removed disabled property for contact button
4a79e01
@erintait
Merge pull request #29 from erintait/contact-form-changes
ac5d1ba 
adding and removed disabled property for contact button
@erintait
added text shadow to hero image h1
19b316d
@erintait
Merge pull request #31 from erintait/h1shadow
f0a030c 
added text shadow to hero image h1
@erintait erintait merged commit 8937f22 into master Mar 6, 2019
@erintait erintait deleted the dev branch March 6, 2019 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@erintait