Skip to content

Merge Develop to Master#53

Open
Hjkun77 wants to merge 67 commits intomasterfrom
develop
Open

Merge Develop to Master#53
Hjkun77 wants to merge 67 commits intomasterfrom
develop

Conversation

@Hjkun77
Copy link
Collaborator

@Hjkun77 Hjkun77 commented Jan 31, 2019

No description provided.

bfgonzalez and others added 30 commits January 3, 2019 11:34
imported ResourceCard components in Books component instead of importing directly into Community.js
community(feat): incorporate conditional rendering for resources section
community(feat): incorporate conditional rendering for events section
* Finished About Page

* Minor margin fix

* community(feat): incorporate conditional rendering for Events section

* community(fix): fix positioning for RedirectButton in Events section

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* home(fix): fix positioning of journey button for screen sizes <= 320px, 375px, 425px, and 600px
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* incorporate stashed changes and resolve merge conflict

* work(feat): reconfigure element nesting and css styling for easier class selector targeting in the landing, process, services, case studies, and logos sections of the Work page

* work(feat): incorporate responsiveness for landing section of work page

* work(feat): add footer, update year in copyright text to 2019

* work(fix): fix positioning of landing image

* work(feat): incorporate responsiveness for process section of work page across several screen sizes

* work(fix): fix display of process steps on smaller screens

* work(feat): fix height for process section, and incorporate responsiveness for services section across several screen sizes

* work(feat): incorporate responsiveness for case studies section across several screen sizes

* work(feat): incorporate responsiveness for logos section

* navbar(feat): make minor adjustments to width when screen is 1024px wide

* work(fix): adjust positioning of case study images
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* incorporate stashed changes and resolve merge conflict

* work(feat): reconfigure element nesting and css styling for easier class selector targeting in the landing, process, services, case studies, and logos sections of the Work page

* work(feat): incorporate responsiveness for landing section of work page

* work(feat): add footer, update year in copyright text to 2019

* work(fix): fix positioning of landing image

* work(feat): incorporate responsiveness for process section of work page across several screen sizes

* work(fix): fix display of process steps on smaller screens

* work(feat): fix height for process section, and incorporate responsiveness for services section across several screen sizes

* work(feat): incorporate responsiveness for case studies section across several screen sizes

* work(feat): incorporate responsiveness for logos section

* navbar(feat): make minor adjustments to width when screen is 1024px wide

* work(fix): adjust positioning of case study images

* work(fix): fix positioning of images in case studies section
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* community(fix): fix positioning of event image and RedirectButton found in the opportunities section
…46)

* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* incorporate stashed changes and resolve merge conflict

* work(feat): reconfigure element nesting and css styling for easier class selector targeting in the landing, process, services, case studies, and logos sections of the Work page

* work(feat): incorporate responsiveness for landing section of work page

* work(feat): add footer, update year in copyright text to 2019

* work(fix): fix positioning of landing image

* work(feat): incorporate responsiveness for process section of work page across several screen sizes

* work(fix): fix display of process steps on smaller screens

* work(feat): fix height for process section, and incorporate responsiveness for services section across several screen sizes

* work(feat): incorporate responsiveness for case studies section across several screen sizes

* work(feat): incorporate responsiveness for logos section

* navbar(feat): make minor adjustments to width when screen is 1024px wide

* work(fix): adjust positioning of case study images

* work(fix): fix positioning of images in case studies section

* work(feat): fix responsivess for services and case studies sections
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* home(fix): fix positioning of journey button for screen sizes <= 320px, 375px, 425px, and 600px

* home(feat): update images

* home(feat): fix issues w/ responsiveness as a result of updating the images
…and landing image (#49)

* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* community(fix): fix positioning of event image and RedirectButton found in the opportunities section

* community(feat): update images

* community(fix): fix positioning of RedirectButton

* community(fix): fix positioning of landing image
* Carousel operational

* Refactor styles
…51)

* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* community(fix): fix positioning of event image and RedirectButton found in the opportunities section

* community(feat): update images

* community(fix): fix positioning of RedirectButton

* community(fix): fix positioning of landing image

* community-events(fix): fix element positinoing

* member-stories(fix): fix element positioning

* member-stories(fix): fix ms container height

* community-resources(feat): use flexbox instead of grid for element positioning
@Hjkun77 Hjkun77 self-assigned this Jan 31, 2019
Hjkun77 and others added 22 commits January 31, 2019 15:07
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* community(fix): fix positioning of event image and RedirectButton found in the opportunities section

* community(feat): update images

* community(fix): fix positioning of RedirectButton

* community(fix): fix positioning of landing image

* community-events(fix): fix element positinoing

* member-stories(fix): fix element positioning

* member-stories(fix): fix ms container height

* community-resources(feat): use flexbox instead of grid for element positioning

* footer(fix): fix resolution issue of facebook and twitter footer logos
* Finished About Page

* Minor margin fix

* community(feat): incorporate mobile responsiveness for Landing and Events sections for screens <= 320px

* community(feat): further componentize member stories section

* community(feat): incorporate mobile responsiveness for member stories section for screens <= 320px

* community(feat): further componentized events, moved events to state due to utilization of condditional rendering

* community(feat): further componentized opportunities section, clean up some css for events and opportunities sections (made more localized)

* community(feat): further componentize resources section, localize css for member stories, resources, and events

* community(feat): incorporate mobile responsiveness for opportuntunities sections for screens <= 320px

* community(feat): incorporated responsiveness for events section across several screen sizes

* community(feat): incorporate responsiveness for opportunities section across several screen sizes

* community(feat): incorporate responsiveness for member stories section across several screen sizes

* events(feat): adjust image size when screen <= 768px

* community(feat): fix positioning of RedirectButton

* community(feat): incorporate responsiveness for resources section across several screen sizes

* member-stories(feat): minor adjustments for element positioning when screen is <= 320px

* community(feat): add footer

* community(fix): fix positioning of event image and RedirectButton found in the opportunities section

* community(feat): update images

* community(fix): fix positioning of RedirectButton

* community(fix): fix positioning of landing image

* community-events(fix): fix element positinoing

* member-stories(fix): fix element positioning

* member-stories(fix): fix ms container height

* community-resources(feat): use flexbox instead of grid for element positioning

* footer(fix): fix resolution issue of facebook and twitter footer logos

* burger-menu(feat): add initial code for burger menu animation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants