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

Master should be what's in production #6

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

Master should be what's in production #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
ac1a4f5
Create OM landing page; Update some content for hero, how it works, a…
yaboi Jul 24, 2018
4e24054
Update color palette. Upate hero, add placeholder 'kit'. Update navig…
yaboi Jul 24, 2018
f3fda0c
Update 'what to expect' section. Add 'social proof', 'subscribe', 'ho…
yaboi Jul 25, 2018
3129cce
Update hero image w/ example from logopony. Add bg image to quote sec…
yaboi Jul 25, 2018
07237a8
Update hero bg gradient to include accent color. Update 'subscribe' s…
yaboi Jul 26, 2018
2c2008b
Update embark section w/ background texture. Update accent color to b…
yaboi Jul 26, 2018
1bc7eb3
refresh content to include more about community, content, and gatheri…
yaboi Jul 27, 2018
71a2fe1
Update footer, create dark logo, update favicon/icon. Add sumo click …
yaboi Jul 27, 2018
a717e2c
Add pre-order page w/ pricing, what to expect, quote, faqs, and insta…
yaboi Jul 28, 2018
32ad2e0
Rearrange pre order page. Add new drawing, not using it.
yaboi Jul 28, 2018
6d99d43
udpate quote on pre order page.
yaboi Jul 28, 2018
5effa87
add Shopify buy button so pre-orders can actually be purchased.
yaboi Jul 29, 2018
4b8c9da
Update images for 4-up (prongs). Add incentive below 'growth tools' s…
yaboi Jul 30, 2018
5ef129a
Replace temp image with real image for 'growth tools' section.
yaboi Jul 31, 2018
148da19
moved common sections (index / pre-order) to include files
yaboi Jul 31, 2018
75c7c2f
move om landing page to 'root' directory
yaboi Jul 31, 2018
d9c559e
test why loader isn't working in prod
yaboi Aug 2, 2018
bfe2ac8
add another console log to try and test page loader
yaboi Aug 2, 2018
318f7e7
remove loader testing. Found issue with instagram widget not loading,…
yaboi Aug 2, 2018
4b76422
disable instagram feeds for now while finding a solution (pay 0 for l…
yaboi Aug 2, 2018
abf737e
add instagram feeds back to page
yaboi Aug 2, 2018
3a68980
remove loader for now because it's not working in production
yaboi Aug 3, 2018
ffdaf3b
update messaging across landing page, pre-order page, and footer. Upd…
yaboi Aug 3, 2018
d4443ae
add temp fix for buy button on home page. script auto adds buy now bu…
yaboi Aug 3, 2018
9d7fec3
update social proof (testimonials) and faqs. Move more sections to in…
yaboi Aug 3, 2018
3d31b84
create include for 'sumo click trigger'. Update all 'join om tribe' c…
yaboi Aug 4, 2018
94c2bc6
update link in footer from 'pre-order your kit' to 'pre-order your box'
yaboi Aug 4, 2018
8c2973a
add click trigger update for powerful gatherings. rename 'om-join-tri…
yaboi Aug 4, 2018
78dc93e
update content based on feedback from Joel.
yaboi Aug 6, 2018
124e1ad
add kayako click trigger functionality so when 'send us a message' or…
yaboi Aug 6, 2018
7ea79b8
update hero header to 'Welcome to OM' and update cta near footer on i…
yaboi Aug 7, 2018
1faa868
update gatherings button to button cta with primary color to help it …
yaboi Aug 7, 2018
e0aa528
add 'about om' header to second footer section
yaboi Aug 7, 2018
6c682ac
fix typos in faq and put period at the end of sentence in how it work…
yaboi Aug 7, 2018
60261e3
move terms and privacy to includes. Update landing page with new sect…
yaboi Aug 8, 2018
a3d727d
drafting out beginning phases of blog post page
yaboi Aug 22, 2018
b486dec
add post content from currently published post as mock data. Added Su…
yaboi Aug 23, 2018
49987ba
add placeholder for comments. Add new section for recommendations, ne…
yaboi Aug 23, 2018
43a3739
remove background image from subscribe section to highlight om tribe …
yaboi Aug 23, 2018
28eff1a
Add category tag to top of post title. Add facebook comments.
yaboi Aug 24, 2018
fbb73bf
made category tag at top of post a link
yaboi Aug 24, 2018
14112f6
update blog header to have featured post shown in hero
yaboi Aug 24, 2018
4524bcb
add static navigation components and use them on blog / post pages. U…
yaboi Aug 24, 2018
9b9ddb4
add picture for background of blog page hero. Update mobile/tablet/de…
yaboi Aug 27, 2018
22da698
update all category styling and added mock categories. Add a few more…
yaboi Aug 28, 2018
9df9db6
Add 'category' page with updates like 'featured in expression' tag in…
yaboi Aug 28, 2018
8dc58d5
update category page hero image to show there will be a different ima…
yaboi Aug 28, 2018
fceb0e2
update navbar (header) to incorporate blog and other things like help…
yaboi Aug 28, 2018
5a3fa9a
Add search icon + modal to navigation
yaboi Sep 5, 2018
b9487d2
move search icon to includes. Add search icon to scrollnav on blog an…
yaboi Sep 6, 2018
c30d176
auto focus first input of modal content. refacrotr modal open/close c…
yaboi Sep 6, 2018
ab21a79
add mock search results after user enters 3 characters. Need to add '…
yaboi Sep 6, 2018
455abf6
add search results page based on help desk hero from scaffold four. N…
yaboi Sep 7, 2018
4ff7dac
add lodash. auto populate search input from querystring params (if th…
yaboi Sep 10, 2018
f9ec766
check for null param on search page so 'undefined' doesn't show in input
yaboi Sep 10, 2018
299f8ba
code clean up
yaboi Sep 11, 2018
c976b2d
comment out 'blog' navigation for now so user can't navigate to it un…
yaboi Sep 11, 2018
fcddf8e
add pr template
yaboi Sep 11, 2018
65f8832
comment out 'search' from navigation for now, too.
yaboi Sep 11, 2018
573ff21
comment out search modal from layout page
yaboi Sep 11, 2018
d3412cc
Merge pull request #1 from OrganicMan/blog-navigation
yaboi Sep 11, 2018
b602e88
Update #2
yaboi Sep 12, 2018
7d31a10
trim gulp compile-html in gulp file. Remove commented lines from gulp…
yaboi Sep 14, 2018
ba305a1
Update #2:
yaboi Sep 14, 2018
105015c
Merge branch 'tree-shaker' of github.com:OrganicMan/mani into tree-sh…
yaboi Sep 14, 2018
f811dc8
update #2:
yaboi Sep 14, 2018
511c50b
Update #2:
yaboi Sep 14, 2018
28f9082
Update #2:
yaboi Sep 14, 2018
3a5a414
Update #2.
yaboi Sep 14, 2018
2927d25
Update #2.
yaboi Sep 15, 2018
7e9575d
Update #2.
yaboi Sep 15, 2018
ddf16ee
Update #2.
yaboi Sep 15, 2018
bb545e8
Update #2.
yaboi Sep 15, 2018
0d8aa4d
Update #2.
yaboi Sep 15, 2018
d07447b
Merge pull request #3 from OrganicMan/tree-shaker
yaboi Sep 15, 2018
0cd078a
Remove white background from container on pre-order page 3-up
yaboi Sep 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#### What's this PR do?
#### Where should the reviewer start?
#### How should this be manually tested?
#### Any background context you want to provide?
#### What are the relevant tickets?
#### Before/After Screenshots (if appropriate)
#### Questions:
- **Is there a blog post?**
- **Does the knowledge base or Wiki need an update?**
- **Does this add new dependencies? Which ones?**
182 changes: 0 additions & 182 deletions assets/colors.html
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions assets/colors.md
View file
Open in desktop

This file was deleted.

Loading