Merge branch 'develop'

doc/testing.md

@@ -1,6 +1,6 @@
 # Testing CommitETH
 
-We have a continuously deployed version tracking the `development` branch live at https://commiteth.com:444. It uses the [Ropsten](https://ropsten.io/) Ethereum testnet. Any one is welcome to use it and your help with testing CommitETH is greatly appreciated!
+We have a continuously deployed version tracking the `develop` branch live at https://openbounty.status.im:444. It uses the [Ropsten](https://ropsten.io/) Ethereum testnet. Any one is welcome to use it and your help with testing CommitETH is greatly appreciated!
 
 ### General
 
@@ -14,25 +14,25 @@ The developers can be reached on the `#commiteth` channel in the [Status slack](
 
 ### Signing up
 
-* point your browser to https://commiteth.com:444 and click `Sign in`
+* point your browser to https://openbounty.status.im:444 and click `Sign in`
 * grant CommitETH read access to your public profile
 
-You should now see `Activity`, `Open bounties` and `Manage payouts` tabs. In the upper right hand corner, there should be a dropdown with `Update address` and `Logout`.
+You should now see `Bounties`, `Activity` and `Repositories` tabs. In the upper right hand corner, there should be a dropdown with `My Payment Details` and `Sign Out`.
 
 
 ### Connecting your wallet
 
 (instructions for Metamask)
-* install Metamask + configure your account
+* install Metamask and configure your account
-* select `Update address` from the top-right dropdown and click `Update`
+* select `My Payment Details` from the top-right dropdown, select the account you want to use from the selection list and click `Update`
 
 
 ### Creating bounty issues
 
 Before you can create bounties, you need to have administrative access to one or more repositories. These can be either in the scope of your personal user account or in the scope of a Github orgnazation.
 
-* click the `Repositories tab`
+* click the `Repositories` tab
-* grant CommitETH the needed addtional permissions for managing repository webhooks, adding and modifying comments
+* grant Status Open Bounty the needed addtional permissions for managing repository webhooks, adding and modifying comments
 * now you should see your repositories, click `Add` on one. This should cause the `bounty` label to available in the repository's labels and a new webhook should now exist for the repository.
 * now, add the bounty label to a new or an existing issue. This should cause CommitETH to post a new comment for the issue containing an image with text `Deploying contract, please wait`
 * once the contract has been mined, the comment will be updated to contain the bounty contract's address and a QR code

resources/public/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

resources/public/dest/css/main.css

@@ -795,9 +795,8 @@ li.social-link a {
   text-align: center;
   color: #ffffff; }
 
-.action button {
+.action button,
-  width: 240px;
+.hs_submit .hs-button {
-  height: 45px;
   object-fit: contain;
   border-radius: 8px;
   background-color: #1e3751;
@@ -807,12 +806,14 @@ li.social-link a {
   font-weight: 500;
   line-height: 1.15;
   letter-spacing: 1px;
+  padding: 16px 32px;
   text-align: center;
   text-transform: uppercase;
   color: #ffffff;
   transition: opacity .2s ease; }
 
-.action button:hover {
+.action button:hover,
+.hs_submit .hs-button:hover {
   opacity: 0.5;
   cursor: pointer; }
 
@@ -1521,7 +1522,6 @@ li.social-link a {
 .email-form {
   display: -ms-flexbox;
   display: flex;
-  width: 460px;
   position: relative; }
 
 .email-form.email-form--error .email-form__inner {
@@ -1589,23 +1589,21 @@ li.social-link a {
 .email-form__inner {
   display: -ms-flexbox;
   display: flex;
-  width: 460px;
   position: relative; }
 
-.email-form__input {
+.email-form .hs_email.hs-form-field label {
-  height: 45px;
+  display: none; }
-  line-height: 45px; }
 
-.email-form__input--email {
+.email-form__input--email,
+.email-form .hs_email.hs-form-field input {
   text-align: left;
-  background-color: #F2F6F8;
+  background-color: #4c81b6;
-  color: #49555F;
+  color: #b6cbe1;
-  width: 240px;
+  padding: 16px 15px 15px 15px;
-  padding: 0 15px;
   margin: 0 0 0 0;
   font-family: 'PostGrotesk-Book', sans-serif;
   box-sizing: border-box;
-  border-radius: 8px 0 0 8px;
+  border-radius: 8px;
   transition: background-color .2s ease;
   font-weight: 400;
   font-size: 16px; }
@@ -1617,25 +1615,31 @@ li.social-link a {
   background-repeat: no-repeat;
   background-position: right 10px center; }
 
-.email-form__input--email::-webkit-input-placeholder {
+.email-form__input--email::-webkit-input-placeholder,
-  color: #AEB5BA; }
+.email-form__input--email::-moz-placeholder,
-
-.email-form__input--email::-moz-placeholder {
-  color: #AEB5BA; }
-
 .email-form__input--email:-ms-input-placeholder {
   color: #AEB5BA; }
 
 .email-form__input--email:-moz-placeholder {
   color: rgba(255, 255, 255, 0.6); }
 
+.email-form .hbspt-form {
+  width: 100%; }
+  .email-form .hbspt-form > .submitted-message {
+    color: #ffffff;
+    opacity: 0.6; }
+  .email-form .hbspt-form > form > div {
+    display: inline-block; }
+    .email-form .hbspt-form > form > div > div {
+      margin: 0; }
+
 .email-form input[type="submit"] {
-  width: 220px;
   -ms-flex-negative: 0;
   flex-shrink: 0;
   -ms-flex-positive: 0;
   flex-grow: 0;
-  border-radius: 0 8px 8px 0; }
+  margin-left: 1em;
+  border-radius: 8px; }
 
 @media (max-width: 640px) {
   .email-form, .email-form__inner {
@@ -1645,13 +1649,6 @@ li.social-link a {
   .email-form__inner {
     -ms-flex-direction: column;
     flex-direction: column; }
-  .email-form__input--email {
-    width: 240px;
-    border-radius: 8px;
-    margin: 0 0 16px 0; }
-  .email-form input[type="submit"] {
-    width: 240px;
-    border-radius: 8px; }
   .email-form__responces {
     width: 240px;
     text-align: center;
@@ -1780,6 +1777,9 @@ li.social-link a {
 .footer-link--yt .footer-icon {
   background-image: url(../img/new-site/icon_yt.svg); }
 
+.footer-link--rt .footer-icon {
+  background-image: url(../img/new-site/icon_rt.svg); }
+
 .footer-link a {
   color: white; }
 

resources/public/dest/img/new-site/icon_rt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>icon_sl</title><g fill="#FFF"><path d="M12.632 3.316H7.893a2.365 2.365 0 0 0-2.368 2.369v11.821a2.365 2.365 0 0 0 2.368 2.369 2.366 2.366 0 0 0 2.369-2.369v-2.369h2.37c3.254 0 5.91-2.656 5.91-5.911 0-3.254-2.656-5.91-5.91-5.91z"/><path d="M7.905 19.277a1.771 1.771 0 0 1-1.771-1.771V5.673a1.77 1.77 0 0 1 1.759-1.772h4.739a5.336 5.336 0 0 1 5.325 5.325 5.334 5.334 0 0 1-5.325 5.324H9.676v2.956c0 .967-.794 1.771-1.771 1.771z"/><path d="M7.905 18.68a1.185 1.185 0 0 1-1.185-1.186V5.673c0-.645.517-1.173 1.161-1.185h4.751a4.734 4.734 0 0 1 4.726 4.727 4.74 4.74 0 0 1-4.726 4.726H9.09v3.541c0 .666-.529 1.198-1.185 1.198z"/><path d="M7.905 18.094a.596.596 0 0 1-.598-.6V5.673c0-.322.252-.587.574-.598h4.751a4.144 4.144 0 0 1 4.14 4.14 4.145 4.145 0 0 1-4.14 4.14h-4.13v4.139c0 .334-.264.6-.597.6z"/><path d="M7.905 12.768h4.727a3.556 3.556 0 0 0 3.554-3.552 3.55 3.55 0 0 0-3.554-3.554H7.905v7.106z"/><path d="M8.502 12.182V6.26h4.14a2.953 2.953 0 0 1 2.955 2.956 2.954 2.954 0 0 1-2.955 2.956h-4.14v.01z"/><path d="M9.09 11.595V6.857h3.542a2.366 2.366 0 0 1 2.369 2.369 2.366 2.366 0 0 1-2.369 2.369H9.09z"/><path d="M9.676 11.01V7.444h2.956a1.783 1.783 0 0 1 0 3.566H9.676z"/><path d="M10.262 10.411v-2.38h2.37c.654 0 1.195.53 1.195 1.195 0 .668-.528 1.196-1.195 1.196h-2.37v-.011z"/><path d="M10.861 9.825V8.617h1.771c.333 0 .599.265.599.599a.595.595 0 0 1-.599.598h-1.771v.011z"/><ellipse cx="7.827" cy="5.678" rx="2.369" ry="2.369"/><path d="M18.036 16.137a2.361 2.361 0 1 1-3.863 2.716l-3.542-5.062a2.362 2.362 0 0 1 3.865-2.713l3.54 5.059z"/></g></svg>

resources/public/dest/img/new-site/logo-mask.svg

@@ -0,0 +1 @@
+<svg width="30" height="31" viewBox="0 0 30 31" xmlns="http://www.w3.org/2000/svg"><title>mask</title><path d="M9.73 13.39a17.644 17.644 0 0 0-3.153.267C7.434 5.885 14.033 0 21.892 0 26.703 0 30 2.312 30 7.099c0 4.786-3.957 7.098-9.73 7.098-4.261 0-6.279-.806-10.54-.806zm0 2.79C3.957 16.18 0 18.49 0 23.277s3.297 7.099 8.108 7.099c7.859 0 14.458-5.885 15.315-13.657-1.04.183-2.096.272-3.153.266-4.261 0-6.279-.807-10.54-.807z" fill="#4360DF" fill-rule="evenodd"/></svg>

resources/public/img/icon-rt.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<title>icon_sl</title>
+<g id="Layer_3">
+	<g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M12.632,3.316H7.928c-0.012,0-0.022,0-0.035,0c-1.311,0-2.368,1.058-2.368,2.369v11.821
+					c0,1.311,1.058,2.369,2.368,2.369c1.311,0,2.369-1.059,2.369-2.369v-2.369h2.37c3.254,0,5.91-2.656,5.91-5.911
+					C18.542,5.972,15.886,3.316,12.632,3.316z"/>
+				<path fill="#FFFFFF" d="M7.905,19.277c-0.978,0-1.771-0.793-1.771-1.771V5.673c0-0.977,0.793-1.772,1.759-1.772
+					c0.012,0,0.023,0,0.035,0h4.704c2.933,0,5.325,2.393,5.325,5.325c0,2.934-2.393,5.324-5.325,5.324H9.676v2.956
+					C9.676,18.473,8.882,19.277,7.905,19.277z"/>
+				<path fill="#FFFFFF" d="M7.905,18.68c-0.656,0-1.185-0.531-1.185-1.186V5.673c0-0.645,0.517-1.173,1.161-1.185
+					c0.012,0,0.024,0,0.035,0h4.716c2.61,0,4.726,2.128,4.726,4.727c0,2.599-2.127,4.726-4.726,4.726H9.09v3.541
+					C9.09,18.148,8.561,18.68,7.905,18.68z"/>
+				<path fill="#FFFFFF" d="M7.905,18.094c-0.333,0-0.598-0.266-0.598-0.6V5.673c0-0.322,0.252-0.587,0.574-0.598h0.024h4.727
+					c2.289,0,4.14,1.863,4.14,4.14c0,2.276-1.851,4.14-4.14,4.14H8.502v4.139C8.502,17.828,8.238,18.094,7.905,18.094z"/>
+				<path fill="#FFFFFF" d="M7.905,12.768h4.727c1.954,0,3.554-1.586,3.554-3.552c0-1.966-1.588-3.554-3.554-3.554H7.905V12.768z"/>
+				<path fill="#FFFFFF" d="M8.502,12.182V6.26h4.14c1.634,0,2.955,1.322,2.955,2.956c0,1.633-1.321,2.956-2.955,2.956h-4.14V12.182
+					z"/>
+				<path fill="#FFFFFF" d="M9.09,11.595V6.857h3.542c1.311,0,2.369,1.059,2.369,2.369c0,1.312-1.059,2.369-2.369,2.369H9.09z"/>
+				<path fill="#FFFFFF" d="M9.676,11.01V7.444h2.956c0.978,0,1.782,0.793,1.782,1.782c0,0.989-0.793,1.784-1.782,1.784H9.676z"/>
+				<path fill="#FFFFFF" d="M10.262,10.411v-2.38h2.37c0.654,0,1.195,0.53,1.195,1.195c0,0.668-0.528,1.196-1.195,1.196h-2.37
+					V10.411z"/>
+				<path fill="#FFFFFF" d="M10.861,9.825V8.617h1.771c0.333,0,0.599,0.265,0.599,0.599c0,0.333-0.266,0.598-0.599,0.598h-1.771
+					V9.825z"/>
+				<g>
+					<ellipse fill="#FFFFFF" cx="7.827" cy="5.678" rx="2.369" ry="2.369"/>
+					<path fill="#FFFFFF" d="M18.036,16.137c0.748,1.07,0.495,2.543-0.575,3.291c-1.069,0.746-2.54,0.494-3.288-0.575l-3.542-5.062
+						c-0.748-1.069-0.495-2.541,0.574-3.288c1.07-0.748,2.542-0.494,3.291,0.575L18.036,16.137z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

resources/public/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

resources/sql/queries.sql

@@ -395,7 +395,7 @@ WHERE
 r.repo_id = i.repo_id
 AND i.confirm_hash is null
 AND i.is_open = true
-ORDER BY value_usd desc, updated desc;
+ORDER BY updated desc;
 
 
 

resources/templates/home.html

@@ -8,7 +8,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <link rel="shortcut icon" href="/img/favicon.ico" />
+    <link rel="shortcut icon" href="/favicon.ico" />
 
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>

resources/templates/index.html

@@ -11,19 +11,40 @@
   <meta name="description" content="Status Open Bounty">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <link rel="icon" type="image/png" href="dest/img/new-site/logo-32.png?v=516c1cd" sizes="32x32" />
+  <!-- Hacky favicon generator due to masking bug -->
-  <link rel="icon" type="image/png" href="dest/img/new-site/logo-16.png?v=5108317" sizes="16x16" />
+  <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+  <link rel="manifest" href="/manifest.json">
+  <meta name="msapplication-TileColor" content="#ffffff">
+  <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+  <meta name="theme-color" content="#ffffff">
 
-  <link rel="apple-touch-icon" href="dest/img/new-site/apple-touch-icon-1024.png?v=464c5b1">
+  <!-- <link rel="icon" type="image/png" href="dest/img/new-site/logo-32.png?v=516c1cd" sizes="32x32" />
-  <link rel="apple-touch-icon" sizes="76x76" href="dest/img/new-site/apple-touch-icon-76.png?v=13dde43">
+       <link rel="icon" type="image/png" href="dest/img/new-site/logo-16.png?v=5108317" sizes="16x16" />
-  <link rel="apple-touch-icon" sizes="120x120" href="dest/img/new-site/apple-touch-icon-120.png?v=e3d71d5">
-  <link rel="apple-touch-icon" sizes="152x152" href="dest/img/new-site/apple-touch-icon-152.png?v=1353ddd">
-  <link rel="apple-touch-icon" sizes="180x180" href="dest/img/new-site/apple-touch-icon-180.png?v=401931a">
-  <link rel="mask-icon" href="dest/img/new-site/logo-mask.svg" color="4360DF">
 
-  <!-- favicon.ico in the root directory -->
+       <link rel="apple-touch-icon" href="dest/img/new-site/apple-touch-icon-1024.png?v=464c5b1">
+       <link rel="apple-touch-icon" sizes="76x76" href="dest/img/new-site/apple-touch-icon-76.png?v=13dde43">
+       <link rel="apple-touch-icon" sizes="120x120" href="dest/img/new-site/apple-touch-icon-120.png?v=e3d71d5">
+       <link rel="apple-touch-icon" sizes="152x152" href="dest/img/new-site/apple-touch-icon-152.png?v=1353ddd">
+       <link rel="apple-touch-icon" sizes="180x180" href="dest/img/new-site/apple-touch-icon-180.png?v=401931a">
+       <link rel="mask-icon" href="dest/img/new-site/logo-mask.svg" color="4360DF">
+     -->
+
+  <link rel="shortcut icon" href="/img/favicon.ico" />
   <link rel="stylesheet" href="dest/css/main.css?v=a664cb5">
 
+
   <!-- Facebook Pixel Code -->
   <script>
     !function(f,b,e,v,n,t,s)
@@ -63,7 +84,7 @@
             <div class="nav">
               <a class="nav__item nav__item-features" href="/app">Activity</a>
               <a class="nav__item nav__item-features" href="/app">Open Bounties</a>
-              <a href="/app" id="button-login" class="button">Login -></a>
+              <a href="{{authorize-url}}" id="button-login" class="button">Login -></a>
             </div>
           </div>
         </div>
@@ -84,26 +105,27 @@
           </div>
 
           <div class="action">
-              <img src="assets/organisations.svg" class="logo-organisations">
+            <img src="assets/organisations.svg" class="logo-organisations">
-              <h1>For organizations</h1>
+            <h1>For organizations</h1>
-              <h2>Find talented developers fast</h2>
+            <h2>Find talented developers fast</h2>
-              <p>
+            <p>
-                  Post bounties, build your team and move your project forward today.
+                Post bounties, build your team and move your project forward today.
-              </p>
+            </p>
+
+            <div class="email-form">
               <!--[if lte IE 8]>
               <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2-legacy.js"></script>
               <![endif]-->
               <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js"></script>
               <script>
-                function signup() {
+                hbspt.forms.create({
-                  hbspt.forms.create({
+                  css: '',
-                    portalId: '3954379',
+                  portalId: '3954379',
-                    formId: '9a0a26a8-3163-45a8-a933-774de4853609'
+                  formId: 'b6c83d22-0bcf-4cfa-b9df-88fbaa09dee7'
-                  });
+                });
-                }
               </script>
-              <button onclick="signup()">Sign up for beta</button>
             </div>
+          </div>
 
         </div>
 
@@ -208,15 +230,17 @@
           <ul class="footer-list">
             <li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
             <li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
+            <li class="footer-link footer-link--rt"><a href="https://chat.status.im/#/register" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Riot</span></a></li>
             <li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
             <li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
-            <li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
+            <!-- <li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li> -->
           </ul>
         </div>
         <div class="footer-table__column">
           <h4 class="footer-header">Community</h4>
           <ul class="footer-list">
             <li class="footer-link"><a href="https://wiki.status.im" target="_blank">Wiki</a></li>
+            <li class="footer-link"><a href="https://status.im/privacy-policy.html" target="_blank">Privacy policy</a></li>
             <li class="footer-link"><a href="https://status.im/jobs.html" target="_blank">Jobs</a></li>
           </ul>
         </div>
@@ -260,4 +284,3 @@
 </body>
 
 </html>
-

src/clj/commiteth/routes/home.clj

@@ -23,7 +23,7 @@
                               :on-testnet? (env :on-testnet)}))
 
 (defn landing-page []
-  (layout/render "index.html"))
+  (layout/render "index.html" {:authorize-url (github/signup-authorize-url)}))
 
 (defroutes home-routes
   (GET "/app" {{user :identity} :session}

src/clj/commiteth/routes/redirect.clj

@@ -51,5 +51,11 @@
             (hubspot/create-hubspot-contact (:email user)
                                               (:name user "")
                                               (:login user)))
+            (try
+              (hubspot/create-hubspot-contact (:email user)
+                                                 (:name user "")
+                                                 (:login user))
+              (catch Throwable t
+                (log/error "Failed to create hubspot contact" t))))
           (assoc (found (str (env :server-address) "/app"))
                  :session {:identity user}))))))

src/cljs/commiteth/core.cljs

@@ -36,12 +36,12 @@
 (def user-dropdown-open? (r/atom false))
 
 (defn user-dropdown [user items]
-  (let [menu (if @user-dropdown-open?
+  (let [menu (if @(rf/subscribe [:user-dropdown-open?])
-                  [:div.ui.menu.transition.visible]
+               [:div.ui.menu.transition.visible]
-                  [:div.ui.menu.transition.hidden])
+               [:div.ui.menu.transition.hidden])
         avatar-url (:avatar_url user)]
     [:div.ui.left.item.dropdown
-     {:on-click #(swap! user-dropdown-open? not)}
+     {:on-click #(rf/dispatch [:user-dropdown-open])}
      [:div.item
       [:img.ui.mini.circular.image {:src avatar-url}]]
      [:div.item
@@ -137,9 +137,10 @@
 (defn footer []
   (let [social-links [["icon-fb" "Facebook" "https://www.facebook.com/ethstatus"]
                       ["icon-tw" "Twitter" "https://twitter.com/ethstatus"]
+                      ["icon-rt" "Riot" "https://chat.status.im/#/register"]
                       ["icon-gh" "Github" "https://github.com/status-im"]
                       ["icon-rd" "Reddit" "https://www.reddit.com/r/statusim/"]
-                      ["icon-yt" "YouTube" "https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/"]]]
+                      #_["icon-yt" "YouTube" "https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/"]]]
     [:div.commiteth-footer
      [:div.commiteth-footer-inner
       [:div.commiteth-footer-logo-container
@@ -166,11 +167,14 @@
         [:div.commiteth-footer-header "Community"]
         [:ul.commiteth-footer-list
          [:li.commiteth-footer-link
-            [:a {:href "https://wiki.status.im/"}
+          [:a {:href "https://wiki.status.im/"}
-             "Wiki"]]
+           "Wiki"]]
          [:li.commiteth-footer-link
-            [:a {:href "https://status.im/jobs.html"}
+          [:a {:href "https://status.im/privacy-policy.html"}
-             "Jobs"]]]]
+           "Privacy policy"]]
+         [:li.commiteth-footer-link
+          [:a {:href "https://status.im/jobs.html"}
+           "Jobs"]]]]
        [:div.commiteth-footer-table__column
         [:div.commiteth-footer-header "Language"]
         [:ul.commiteth-footer-list

src/cljs/commiteth/handlers.cljs

@@ -430,3 +430,18 @@
  :metrics-loaded
  (fn [db [_]]
    (dissoc db :metrics-loading?)))
+
+(defn close-dropdown []
+  (dispatch [:user-dropdown-close]))
+
+(reg-event-db
+ :user-dropdown-open
+ (fn [db [_]]
+   (.addEventListener js/window "click" close-dropdown)
+   (assoc db :user-dropdown-open? true)))
+
+(reg-event-db
+ :user-dropdown-close
+ (fn [db [_]]
+   (.removeEventListener js/window "click" close-dropdown)
+   (assoc db :user-dropdown-open? false)))

src/cljs/commiteth/subscriptions.cljs

@@ -75,3 +75,8 @@
  :metrics-loading?
    (fn [db _]
      (:metrics-loading? db)))
+
+(reg-sub
+    :user-dropdown-open?
+  (fn [db _]
+    (:user-dropdown-open? db)))

static_langing_page/dest/css/main.css

@@ -795,9 +795,8 @@ li.social-link a {
   text-align: center;
   color: #ffffff; }
 
-.action button {
+.action button,
-  width: 240px;
+.hs_submit .hs-button {
-  height: 45px;
   object-fit: contain;
   border-radius: 8px;
   background-color: #1e3751;
@@ -807,12 +806,14 @@ li.social-link a {
   font-weight: 500;
   line-height: 1.15;
   letter-spacing: 1px;
+  padding: 16px 32px;
   text-align: center;
   text-transform: uppercase;
   color: #ffffff;
   transition: opacity .2s ease; }
 
-.action button:hover {
+.action button:hover,
+.hs_submit .hs-button:hover {
   opacity: 0.5;
   cursor: pointer; }
 
@@ -1521,7 +1522,6 @@ li.social-link a {
 .email-form {
   display: -ms-flexbox;
   display: flex;
-  width: 460px;
   position: relative; }
 
 .email-form.email-form--error .email-form__inner {
@@ -1589,23 +1589,21 @@ li.social-link a {
 .email-form__inner {
   display: -ms-flexbox;
   display: flex;
-  width: 460px;
   position: relative; }
 
-.email-form__input {
+.email-form .hs_email.hs-form-field label {
-  height: 45px;
+  display: none; }
-  line-height: 45px; }
 
-.email-form__input--email {
+.email-form__input--email,
+.email-form .hs_email.hs-form-field input {
   text-align: left;
-  background-color: #F2F6F8;
+  background-color: #4c81b6;
-  color: #49555F;
+  color: #b6cbe1;
-  width: 240px;
+  padding: 16px 15px 15px 15px;
-  padding: 0 15px;
   margin: 0 0 0 0;
   font-family: 'PostGrotesk-Book', sans-serif;
   box-sizing: border-box;
-  border-radius: 8px 0 0 8px;
+  border-radius: 8px;
   transition: background-color .2s ease;
   font-weight: 400;
   font-size: 16px; }
@@ -1617,25 +1615,31 @@ li.social-link a {
   background-repeat: no-repeat;
   background-position: right 10px center; }
 
-.email-form__input--email::-webkit-input-placeholder {
+.email-form__input--email::-webkit-input-placeholder,
-  color: #AEB5BA; }
+.email-form__input--email::-moz-placeholder,
-
-.email-form__input--email::-moz-placeholder {
-  color: #AEB5BA; }
-
 .email-form__input--email:-ms-input-placeholder {
   color: #AEB5BA; }
 
 .email-form__input--email:-moz-placeholder {
   color: rgba(255, 255, 255, 0.6); }
 
+.email-form .hbspt-form {
+  width: 100%; }
+  .email-form .hbspt-form > .submitted-message {
+    color: #ffffff;
+    opacity: 0.6; }
+  .email-form .hbspt-form > form > div {
+    display: inline-block; }
+    .email-form .hbspt-form > form > div > div {
+      margin: 0; }
+
 .email-form input[type="submit"] {
-  width: 220px;
   -ms-flex-negative: 0;
   flex-shrink: 0;
   -ms-flex-positive: 0;
   flex-grow: 0;
-  border-radius: 0 8px 8px 0; }
+  margin-left: 1em;
+  border-radius: 8px; }
 
 @media (max-width: 640px) {
   .email-form, .email-form__inner {
@@ -1645,13 +1649,6 @@ li.social-link a {
   .email-form__inner {
     -ms-flex-direction: column;
     flex-direction: column; }
-  .email-form__input--email {
-    width: 240px;
-    border-radius: 8px;
-    margin: 0 0 16px 0; }
-  .email-form input[type="submit"] {
-    width: 240px;
-    border-radius: 8px; }
   .email-form__responces {
     width: 240px;
     text-align: center;
@@ -1780,6 +1777,9 @@ li.social-link a {
 .footer-link--yt .footer-icon {
   background-image: url(../img/new-site/icon_yt.svg); }
 
+.footer-link--rt .footer-icon {
+  background-image: url(../img/new-site/icon_rt.svg); }
+
 .footer-link a {
   color: white; }
 

static_langing_page/dest/img/new-site/icon_rt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>icon_sl</title><g fill="#FFF"><path d="M12.632 3.316H7.893a2.365 2.365 0 0 0-2.368 2.369v11.821a2.365 2.365 0 0 0 2.368 2.369 2.366 2.366 0 0 0 2.369-2.369v-2.369h2.37c3.254 0 5.91-2.656 5.91-5.911 0-3.254-2.656-5.91-5.91-5.91z"/><path d="M7.905 19.277a1.771 1.771 0 0 1-1.771-1.771V5.673a1.77 1.77 0 0 1 1.759-1.772h4.739a5.336 5.336 0 0 1 5.325 5.325 5.334 5.334 0 0 1-5.325 5.324H9.676v2.956c0 .967-.794 1.771-1.771 1.771z"/><path d="M7.905 18.68a1.185 1.185 0 0 1-1.185-1.186V5.673c0-.645.517-1.173 1.161-1.185h4.751a4.734 4.734 0 0 1 4.726 4.727 4.74 4.74 0 0 1-4.726 4.726H9.09v3.541c0 .666-.529 1.198-1.185 1.198z"/><path d="M7.905 18.094a.596.596 0 0 1-.598-.6V5.673c0-.322.252-.587.574-.598h4.751a4.144 4.144 0 0 1 4.14 4.14 4.145 4.145 0 0 1-4.14 4.14h-4.13v4.139c0 .334-.264.6-.597.6z"/><path d="M7.905 12.768h4.727a3.556 3.556 0 0 0 3.554-3.552 3.55 3.55 0 0 0-3.554-3.554H7.905v7.106z"/><path d="M8.502 12.182V6.26h4.14a2.953 2.953 0 0 1 2.955 2.956 2.954 2.954 0 0 1-2.955 2.956h-4.14v.01z"/><path d="M9.09 11.595V6.857h3.542a2.366 2.366 0 0 1 2.369 2.369 2.366 2.366 0 0 1-2.369 2.369H9.09z"/><path d="M9.676 11.01V7.444h2.956a1.783 1.783 0 0 1 0 3.566H9.676z"/><path d="M10.262 10.411v-2.38h2.37c.654 0 1.195.53 1.195 1.195 0 .668-.528 1.196-1.195 1.196h-2.37v-.011z"/><path d="M10.861 9.825V8.617h1.771c.333 0 .599.265.599.599a.595.595 0 0 1-.599.598h-1.771v.011z"/><ellipse cx="7.827" cy="5.678" rx="2.369" ry="2.369"/><path d="M18.036 16.137a2.361 2.361 0 1 1-3.863 2.716l-3.542-5.062a2.362 2.362 0 0 1 3.865-2.713l3.54 5.059z"/></g></svg>

static_langing_page/index.html

@@ -11,15 +11,35 @@
   <meta name="description" content="Status Open Bounty">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <link rel="icon" type="image/png" href="dest/img/new-site/logo-32.png?v=516c1cd" sizes="32x32" />
+  <!-- Hacky favicon generator due to masking bug -->
-  <link rel="icon" type="image/png" href="dest/img/new-site/logo-16.png?v=5108317" sizes="16x16" />
+  <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+  <link rel="manifest" href="/manifest.json">
+  <meta name="msapplication-TileColor" content="#ffffff">
+  <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+  <meta name="theme-color" content="#ffffff">
 
-  <link rel="apple-touch-icon" href="dest/img/new-site/apple-touch-icon-1024.png?v=464c5b1">
+  <!-- <link rel="icon" type="image/png" href="dest/img/new-site/logo-32.png?v=516c1cd" sizes="32x32" />
-  <link rel="apple-touch-icon" sizes="76x76" href="dest/img/new-site/apple-touch-icon-76.png?v=13dde43">
+       <link rel="icon" type="image/png" href="dest/img/new-site/logo-16.png?v=5108317" sizes="16x16" />
-  <link rel="apple-touch-icon" sizes="120x120" href="dest/img/new-site/apple-touch-icon-120.png?v=e3d71d5">
+
-  <link rel="apple-touch-icon" sizes="152x152" href="dest/img/new-site/apple-touch-icon-152.png?v=1353ddd">
+       <link rel="apple-touch-icon" href="dest/img/new-site/apple-touch-icon-1024.png?v=464c5b1">
-  <link rel="apple-touch-icon" sizes="180x180" href="dest/img/new-site/apple-touch-icon-180.png?v=401931a">
+       <link rel="apple-touch-icon" sizes="76x76" href="dest/img/new-site/apple-touch-icon-76.png?v=13dde43">
-  <link rel="mask-icon" href="dest/img/new-site/logo-mask.svg" color="4360DF">
+       <link rel="apple-touch-icon" sizes="120x120" href="dest/img/new-site/apple-touch-icon-120.png?v=e3d71d5">
+       <link rel="apple-touch-icon" sizes="152x152" href="dest/img/new-site/apple-touch-icon-152.png?v=1353ddd">
+       <link rel="apple-touch-icon" sizes="180x180" href="dest/img/new-site/apple-touch-icon-180.png?v=401931a">
+       <link rel="mask-icon" href="dest/img/new-site/logo-mask.svg" color="4360DF">
+     -->
 
   <!-- favicon.ico in the root directory -->
   <link rel="stylesheet" href="dest/css/main.css?v=a664cb5">
@@ -63,7 +83,7 @@
             <div class="nav">
               <a class="nav__item nav__item-features" href="/app">Activity</a>
               <a class="nav__item nav__item-features" href="/app">Open Bounties</a>
-              <a href="/app" id="button-login" class="button">Login -></a>
+              <a href="{{authorize-url}}" id="button-login" class="button">Login -></a>
             </div>
           </div>
         </div>
@@ -84,26 +104,27 @@
           </div>
 
           <div class="action">
-              <img src="assets/organisations.svg" class="logo-organisations">
+            <img src="assets/organisations.svg" class="logo-organisations">
-              <h1>For organizations</h1>
+            <h1>For organizations</h1>
-              <h2>Find talented developers fast</h2>
+            <h2>Find talented developers fast</h2>
-              <p>
+            <p>
-                  Post bounties, build your team and move your project forward today.
+                Post bounties, build your team and move your project forward today.
-              </p>
+            </p>
+
+            <div class="email-form">
               <!--[if lte IE 8]>
               <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2-legacy.js"></script>
               <![endif]-->
               <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js"></script>
               <script>
-                function signup() {
+                hbspt.forms.create({
-                  hbspt.forms.create({
+                  css: '',
-                    portalId: '3954379',
+                  portalId: '3954379',
-                    formId: '9a0a26a8-3163-45a8-a933-774de4853609'
+                  formId: 'b6c83d22-0bcf-4cfa-b9df-88fbaa09dee7'
-                  });
+                });
-                }
               </script>
-              <button onclick="signup()">Sign up for beta</button>
             </div>
+          </div>
 
         </div>
 
@@ -208,15 +229,17 @@
           <ul class="footer-list">
             <li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
             <li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
+            <li class="footer-link footer-link--rt"><a href="https://chat.status.im/#/register" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Riot</span></a></li>
             <li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
             <li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
-            <li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
+            <!-- <li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li> -->
           </ul>
         </div>
         <div class="footer-table__column">
           <h4 class="footer-header">Community</h4>
           <ul class="footer-list">
             <li class="footer-link"><a href="https://wiki.status.im" target="_blank">Wiki</a></li>
+            <li class="footer-link"><a href="https://status.im/privacy-policy.html" target="_blank">Privacy policy</a></li>
             <li class="footer-link"><a href="https://status.im/jobs.html" target="_blank">Jobs</a></li>
           </ul>
         </div>

static_langing_page/src/img/new-site/icon_rt.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<title>icon_sl</title>
+<g id="Layer_3">
+	<g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M12.632,3.316H7.928c-0.012,0-0.022,0-0.035,0c-1.311,0-2.368,1.058-2.368,2.369v11.821
+					c0,1.311,1.058,2.369,2.368,2.369c1.311,0,2.369-1.059,2.369-2.369v-2.369h2.37c3.254,0,5.91-2.656,5.91-5.911
+					C18.542,5.972,15.886,3.316,12.632,3.316z"/>
+				<path fill="#FFFFFF" d="M7.905,19.277c-0.978,0-1.771-0.793-1.771-1.771V5.673c0-0.977,0.793-1.772,1.759-1.772
+					c0.012,0,0.023,0,0.035,0h4.704c2.933,0,5.325,2.393,5.325,5.325c0,2.934-2.393,5.324-5.325,5.324H9.676v2.956
+					C9.676,18.473,8.882,19.277,7.905,19.277z"/>
+				<path fill="#FFFFFF" d="M7.905,18.68c-0.656,0-1.185-0.531-1.185-1.186V5.673c0-0.645,0.517-1.173,1.161-1.185
+					c0.012,0,0.024,0,0.035,0h4.716c2.61,0,4.726,2.128,4.726,4.727c0,2.599-2.127,4.726-4.726,4.726H9.09v3.541
+					C9.09,18.148,8.561,18.68,7.905,18.68z"/>
+				<path fill="#FFFFFF" d="M7.905,18.094c-0.333,0-0.598-0.266-0.598-0.6V5.673c0-0.322,0.252-0.587,0.574-0.598h0.024h4.727
+					c2.289,0,4.14,1.863,4.14,4.14c0,2.276-1.851,4.14-4.14,4.14H8.502v4.139C8.502,17.828,8.238,18.094,7.905,18.094z"/>
+				<path fill="#FFFFFF" d="M7.905,12.768h4.727c1.954,0,3.554-1.586,3.554-3.552c0-1.966-1.588-3.554-3.554-3.554H7.905V12.768z"/>
+				<path fill="#FFFFFF" d="M8.502,12.182V6.26h4.14c1.634,0,2.955,1.322,2.955,2.956c0,1.633-1.321,2.956-2.955,2.956h-4.14V12.182
+					z"/>
+				<path fill="#FFFFFF" d="M9.09,11.595V6.857h3.542c1.311,0,2.369,1.059,2.369,2.369c0,1.312-1.059,2.369-2.369,2.369H9.09z"/>
+				<path fill="#FFFFFF" d="M9.676,11.01V7.444h2.956c0.978,0,1.782,0.793,1.782,1.782c0,0.989-0.793,1.784-1.782,1.784H9.676z"/>
+				<path fill="#FFFFFF" d="M10.262,10.411v-2.38h2.37c0.654,0,1.195,0.53,1.195,1.195c0,0.668-0.528,1.196-1.195,1.196h-2.37
+					V10.411z"/>
+				<path fill="#FFFFFF" d="M10.861,9.825V8.617h1.771c0.333,0,0.599,0.265,0.599,0.599c0,0.333-0.266,0.598-0.599,0.598h-1.771
+					V9.825z"/>
+				<g>
+					<ellipse fill="#FFFFFF" cx="7.827" cy="5.678" rx="2.369" ry="2.369"/>
+					<path fill="#FFFFFF" d="M18.036,16.137c0.748,1.07,0.495,2.543-0.575,3.291c-1.069,0.746-2.54,0.494-3.288-0.575l-3.542-5.062
+						c-0.748-1.069-0.495-2.541,0.574-3.288c1.07-0.748,2.542-0.494,3.291,0.575L18.036,16.137z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

static_langing_page/src/scss/actions.scss

@@ -57,9 +57,8 @@
   color: #ffffff;
 }
 
-.action button {
+.action button,
-    width: 240px;
+.hs_submit .hs-button {
-    height: 45px;
     object-fit: contain;
     border-radius: 8px;
     background-color: #1e3751;
@@ -69,13 +68,15 @@
     font-weight: 500;
     line-height: 1.15;
     letter-spacing: 1px;
+    padding: 16px 32px;
     text-align: center;
     text-transform: uppercase;
     color: #ffffff;
     transition: opacity .2s ease;
 }
 
-.action button:hover {
+.action button:hover,
+.hs_submit .hs-button:hover {
     opacity: 0.5;
     cursor: pointer;
   }

static_langing_page/src/scss/email-form.scss

@@ -1,6 +1,5 @@
 .email-form {
   display: flex;
-  width: 460px;
   position: relative;
 }
 
@@ -78,25 +77,23 @@
 
 .email-form__inner {
   display: flex;
-  width: 460px;
   position: relative;
 }
 
-.email-form__input {
+.email-form .hs_email.hs-form-field label {
-  height: 45px;
+  display: none;
-  line-height: 45px;
 }
 
-.email-form__input--email {
+.email-form__input--email,
+.email-form .hs_email.hs-form-field input {
   text-align: left;
-  background-color: #F2F6F8;
+  background-color: #4c81b6;
-  color: #49555F;
+  color: #b6cbe1;
-  width: 240px;
+  padding: 16px 15px 15px 15px;
-  padding: 0 15px;
   margin: 0 0 0 0;
   font-family: 'PostGrotesk-Book', sans-serif;
   box-sizing: border-box;
-  border-radius: 8px 0 0 8px;
+  border-radius: 8px;
 
   transition: background-color .2s ease;
   font-weight: 400;
@@ -121,14 +118,8 @@ input.email-form__input--email:disabled {
 
 }
 
-.email-form__input--email::-webkit-input-placeholder {
+.email-form__input--email::-webkit-input-placeholder,
-  color: #AEB5BA;
+.email-form__input--email::-moz-placeholder,
-}
-
-.email-form__input--email::-moz-placeholder {
-  color: #AEB5BA;
-}
-
 .email-form__input--email:-ms-input-placeholder {
   color: #AEB5BA;
 }
@@ -137,11 +128,28 @@ input.email-form__input--email:disabled {
   color: rgba(255, 255, 255, .6);
 }
 
+.email-form .hbspt-form {
+  width: 100%;
+
+  & > .submitted-message {
+    color: #ffffff;
+    opacity: 0.6;
+  }
+
+  & > form > div {
+    display: inline-block;
+
+    & > div {
+      margin: 0;
+    }
+  }
+}
+
 .email-form input[type="submit"] {
-  width: 220px;
   flex-shrink: 0;
   flex-grow: 0;
-  border-radius: 0 8px 8px 0;
+  margin-left: 1em;
+  border-radius: 8px;
 }
 
 .email-form input[type="submit"]:hover {
@@ -170,17 +178,6 @@ input.email-form__input--email:disabled {
     flex-direction: column;
   }
 
-  .email-form__input--email {
-    width: 240px;
-    border-radius: 8px;
-    margin: 0 0 16px 0;
-  }
-
-  .email-form input[type="submit"] {
-    width: 240px;
-    border-radius: 8px;
-  }
-
   .email-form__responces {
     width: 240px;
     text-align: center;

static_langing_page/src/scss/footer.scss

@@ -118,6 +118,10 @@
   background-image: url(../img/new-site/icon_yt.svg);
 }
 
+.footer-link--rt .footer-icon {
+    background-image: url(../img/new-site/icon_rt.svg);
+}
+
 .footer-link a {
   color: $colorWhite;
 }