Commit graph

134 commits

Author SHA1 Message Date
Chuck Williams
b88da87ca7 Implements Contact Email Form with merge from master
Merge branch 'master' into feature/send-contact-email

* master:
  cleanup on news posts to invoke and include in build
  fix minor typo
  updated ruby version
  Adds address to contact page.
  -- wallets/index.html: Pulls all electrum wallets -- fixes padding for EXODUS logo -- fixes extra curly brace on homepage
  News post +video (#116)
  News post +video

Conflicts:
	_includes/hero/contact.html
2017-02-11 01:30:19 -07:00
Chuck Williams
073acc5a76 Adds address to contact page. 2017-02-10 21:52:19 -07:00
Chuck Williams
a761932ce5 WIP: send-contact-email. 2017-02-09 01:03:37 -07:00
Chuck Williams
1c1ad79fe0 adds target="_blank" to Merchants -> "Get Listed" Button 2017-02-06 22:33:57 -07:00
Madeleine Shang
ace9a7702d Merge remote-tracking branch 'upstream/master'
final merge before PR
2017-02-06 01:42:30 +00:00
Andy Freer
9794f0e2f7 Update: Route footer contact link to mailto
..until contact page is wired up
2017-02-06 01:27:12 +00:00
Andy Freer
0be669f99b Update merchants.html
Add woocommerce btn
2017-02-06 01:06:21 +00:00
andyfreer
ed2d55c6d9 Update: Evolution page 2017-02-06 00:40:31 +00:00
Madeleine Shang
c014270d0d Merge remote-tracking branch 'upstream/master'
merge for contact us link
2017-02-05 23:48:57 +00:00
Madeleine Shang
9365bdaf70 temp hide contact form and replace with contact us link 2017-02-05 23:48:43 +00:00
andyfreer
a91446af47 Update: Wallets page info and modal content 2017-02-05 23:17:33 +00:00
Madeleine Shang
5d44f0e35f add success message + effect 2017-02-05 23:17:22 +00:00
Madeleine Shang
15aeb408c6 Merge remote-tracking branch 'upstream/master'
interim merge for commit (hooking up contact form)
2017-02-05 22:46:26 +00:00
Madeleine Shang
67c8d7923e hooking up the contact form, need to fininsh ajax request 2017-02-05 22:46:13 +00:00
Andy Freer
a30e70db5e Add: Mobile Nav evo link 2017-02-05 20:56:49 +00:00
Andy Freer
f5dd2cdc25 Add: Nav evo link 2017-02-05 20:56:01 +00:00
Madeleine Shang
225d114af9 remove other language options from mobile and desktop nav -for now 2017-02-05 20:55:24 +00:00
Andy Freer
8a63380589 Merge pull request #94 from VitaliyTr/master
fixed wallet images if not core
2017-02-05 18:48:47 +00:00
VitaliyTr
2fbbcfec31 fixed wallet images if not core 2017-02-06 01:47:11 +07:00
Andy Freer
55ab237631 Update: blog.html
Removed as per issue #50
2017-02-05 17:41:44 +00:00
Andy Freer
ca57556d1e Merge pull request #90 from VitaliyTr/master
added woocomerce
2017-02-05 16:52:57 +00:00
andyfreer
fd85d63ab0 Update: Nav reduction
Remove Update, Evo links and lang text
2017-02-05 16:51:19 +00:00
andyfreer
c238bd7db6 Add: Contribute button on Community page title 2017-02-05 16:49:48 +00:00
andyfreer
8082d373b6 Add: Home 12.1 button on title 2017-02-05 16:49:25 +00:00
andyfreer
cf7a93c4c0 Fix: hero overlay 2017-02-05 16:45:04 +00:00
andyfreer
c1d1297509 Update: hero img for Wallets and Network pages 2017-02-05 16:15:24 +00:00
VitaliyTr
5a164bb629 fixed links and styles on wallets 2017-02-05 23:10:55 +07:00
VitaliyTr
712b81fa31 added woocomerce 2017-02-05 21:16:04 +07:00
Chuck Williams
443e06f609 Adds "Evolution" link to top nav (mobile|desktop) 2017-02-05 01:10:16 -07:00
VitaliyTr
dd9694af57 fixed update page 2017-02-05 14:15:38 +07:00
Chuck Williams
c13795b35d Merge commit 'b34d07995a'
* commit 'b34d07995a':
  change get listed on merchant hero
2017-02-04 21:31:21 -07:00
0xfff
92af9d8d0e [Fix] MobileNav: Make logo scroll with menu to prevent overlapping 2017-02-05 12:38:54 +09:00
Madeleine Shang
b34d07995a change get listed on merchant hero 2017-02-04 20:48:06 +00:00
VitaliyTr
dfbeb339fc hard reset; deleted modification then added back 2017-02-04 02:38:26 +07:00
VitaliyTr
42dd5fc78c merged 2017-02-03 22:31:40 +07:00
Chuck Williams
e3fe661f8d refactors paths:
-- "/currency" --> "/network"
-- "/participate" --> "/contribute"
-- does NOT refactor corresponding yaml keys
2017-02-02 23:16:53 -07:00
Chuck Williams
2252470ba9 Lots of cleanup:
-- resolves image paths for blog posts - all language specific posts will use common /assets/img/blog path. language specific images can be specified in the front-matter if necessary.
-- adds language for "platform not detected" message
-- removes redundant "What is Dash" from header navigation
2017-02-02 22:49:14 -07:00
VitaliyTr
f9ea8a6254 added styles 2017-02-03 04:49:38 +07:00
VitaliyTr
e3338a3277 Merge branch 'master' of https://github.com/dashpay/dash-website 2017-02-02 16:07:47 +07:00
VitaliyTr
1b22e59e3c fixed styles and tasks 2017-02-02 16:06:46 +07:00
Chuck Williams
ead15adb8a Documents existing image path functionality for blog posts.
-- updates wallet hero links
2017-02-02 02:01:35 -07:00
VitaliyTr
5afdb0485e fixed tasks from google sheets 2017-02-02 03:59:09 +07:00
Chuck Williams
df757d920c --Improves platform detection for linux on /get-dash/index.html
--Adds friendly "platform not detected" message styled with callout.
--Hardens "download button" init code and removes unnecessary execution
--console-log cleanup
2017-01-31 23:09:13 -07:00
Chuck Williams
031cf91dd4 Implements OS detection & cleanup on /get-dash/index.html 2017-01-31 00:18:40 -07:00
VitaliyTr
cd6cbd6697 merged 2017-01-28 00:43:57 +07:00
VitaliyTr
8345ffa8ec added new images and contact form 2017-01-28 00:36:29 +07:00
Chuck Williams
f71fc75876 Wallets:
-- adds accessibility tags wallet tabs & panels
-- adds conditional modal treatment for "dash-core" vendor_id's
-- activates modal buttons
-- presentation / style cleanup on modals (incomplete)
-- wallet modal action buttons are now the first "link"
2017-01-27 05:02:18 -07:00
VitaliyTr
60e3ec20a8 added variable for sorting out all types of promo content 2017-01-25 17:49:58 +07:00
VitaliyTr
a1e8deecc0 added first data for graphic page 2017-01-25 16:54:01 +07:00
VitaliyTr
50a0e8071e added graphic page 2017-01-25 02:07:16 +07:00