fix merge conflicts

4 files changed, 116 insertions, 122 deletions

diff --git a/ui/app/css/itcss/components/header.scss b/ui/app/css/itcss/components/header.scss
deleted file mode 100644
index 3ccfd5c15..000000000
--- a/ui/app/css/itcss/components/header.scss
+++ /dev/null
@@ -1,113 +0,0 @@
-.app-header {
-  align-items: center;
-  background: $gallery;
-  position: relative;
-  z-index: $header-z-index;
-  display: flex;
-  flex-flow: column nowrap;
-  width: 100%;
-  flex: 0 0 auto;
-
-  @media screen and (max-width: 575px) {
-    padding: 12px;
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, .08);
-    z-index: $mobile-header-z-index;
-  }
-
-  @media screen and (min-width: 576px) {
-    height: 75px;
-    justify-content: center;
-
-    &--back-drop {
-      &::after {
-        content: '';
-        position: absolute;
-        width: 100%;
-        height: 32px;
-        background: $gallery;
-        bottom: -32px;
-      }
-    }
-  }
-
-  &__metafox {
-    cursor: pointer;
-  }
-
-  &__beta-label {
-    font-family: Roboto;
-    text-transform: uppercase;
-    font-weight: 500;
-    font-size: .8rem;
-    color: $buttercup;
-    margin-left: 5px;
-    line-height: initial;
-
-    @media screen and (max-width: 575px) {
-      display: none;
-    }
-  }
-
-  &__contents {
-    display: flex;
-    justify-content: space-between;
-    flex-flow: row nowrap;
-    width: 100%;
-
-    @media screen and (max-width: 575px) {
-      height: 100%;
-    }
-
-    @media screen and (min-width: 576px) {
-      width: 85vw;
-    }
-
-    @media screen and (min-width: 769px) {
-      width: 80vw;
-    }
-
-    @media screen and (min-width: 1281px) {
-      width: 62vw;
-    }
-  }
-
-  &__logo-container {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    cursor: pointer;
-  }
-
-  &__account-menu-container {
-    display: flex;
-    flex-flow: row nowrap;
-    align-items: center;
-  }
-}
-
-.app-header h1 {
-  font-family: Roboto;
-  text-transform: uppercase;
-  font-weight: 400;
-  font-size: 1.1rem;
-  position: relative;
-  padding-left: 15px;
-  color: #5b5d67;
-
-  @media screen and (max-width: 575px) {
-    display: none;
-  }
-}
-
-h2.page-subtitle {
-  text-transform: uppercase;
-  color: #aeaeae;
-  font-size: 1em;
-  margin: 12px;
-}
-
-.network-component-wrapper {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss
index 96ad5fe64..821a6b612 100644
--- a/ui/app/css/itcss/components/index.scss
+++ b/ui/app/css/itcss/components/index.scss
@@ -1,7 +1,5 @@
 @import './buttons.scss';
 
-@import './header.scss';
-
 @import './footer.scss';
 
 @import './network.scss';
diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index b12afb124..9c639e147 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -162,19 +162,99 @@
 }
 
 .hw-connect {
+  width: 100%;
+
   &__header {
     &__title {
       margin-top: 5px;
       margin-bottom: 15px;
       font-size: 22px;
-      text-align: center;
     }
 
     &__msg {
       font-size: 14px;
       color: #9b9b9b;
       margin-top: 10px;
-      margin-bottom: 0px;
+      margin-bottom: 20px;
+    }
+  }
+
+  &__btn-wrapper {
+    flex: 1;
+    flex-direction: row;
+    display: flex;
+  }
+
+  &__connect-btn {
+    background-color: #259De5;
+    color: #fff;
+    border: none;
+    width: 315px;
+    min-height: 54px;
+    font-weight: 300;
+    font-size: 14px;
+    margin-bottom: 20px;
+    margin-top: 20px;
+    border-radius: 5px;
+    display: flex;
+    flex: 1;
+    margin-left: 20px;
+    margin-right: 20px;
+    justify-content: center;
+    text-transform: uppercase;
+  }
+
+  &__connect-btn.disabled {
+    cursor: not-allowed;
+    opacity: .5;
+  }
+
+  &__btn {
+    background: #fbfbfb;
+    border: 1px solid #e5e5e5;
+    height: 100px;
+    width: 150px;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 5px;
+
+    &__img {
+      width: 95px;
+    }
+  }
+
+  &__btn.selected {
+    border: 2px solid #00a8ee;
+    width: 149px;
+  }
+
+  &__btn:first-child {
+    margin-right: 15px;
+    margin-left: 20px;
+  }
+
+  &__btn:last-child {
+    margin-right: 20px;
+  }
+
+  &__hdPath {
+    display: flex;
+    flex-direction: row;
+    margin-top: 15px;
+    margin-bottom: 30px;
+    font-size: 14px;
+
+    &__title {
+      display: flex;
+      margin-top: 10px;
+      margin-right: 15px;
+    }
+
+    &__select {
+      display: flex;
+      flex: 1;
     }
   }
 
@@ -201,6 +281,13 @@
     font-size: 18px;
   }
 
+  &__unlock-title {
+    padding-top: 10px;
+    font-weight: 400;
+    font-size: 22px;
+    margin-bottom: 15px;
+  }
+
   &__msg {
     font-size: 14px;
     color: #9b9b9b;
@@ -213,8 +300,6 @@
   }
 
   &__footer {
-    width: 100%;
-
     &__title {
       padding-top: 15px;
       padding-bottom: 12px;
@@ -228,6 +313,9 @@
       color: #9b9b9b;
       margin-top: 12px;
       margin-bottom: 27px;
+      width: 100%;
+      display: block;
+      margin-left: 20px;
     }
 
     &__link {
@@ -236,10 +324,10 @@
     }
   }
 
-  &__get-trezor {
+  &__get-hw {
     width: 100%;
-    padding-bottom: 20px;
-    padding-top: 20px;
+    padding-bottom: 10px;
+    padding-top: 10px;
 
     &__msg {
       font-size: 14px;
@@ -361,6 +449,7 @@
   margin-top: 10px;
 
   &__button {
+    background: #fff;
     height: 19px;
     display: flex;
     color: #33a4e7;
@@ -390,6 +479,8 @@
 
   &.account-list {
     height: auto;
+    padding-left: 20px;
+    padding-right: 20px;
   }
 
   &__buttons {
@@ -412,6 +503,7 @@
     min-height: 54px;
     font-weight: 300;
     font-size: 14px;
+    margin-bottom: 20px
   }
 
   &__button.unlock {
diff --git a/ui/app/css/itcss/components/send.scss b/ui/app/css/itcss/components/send.scss
index e9c872ea7..806ac8536 100644
--- a/ui/app/css/itcss/components/send.scss
+++ b/ui/app/css/itcss/components/send.scss
@@ -626,6 +626,23 @@
       top: 18px;
       right: 12px;
     }
+
+    &__qr-code {
+      position: absolute;
+      top: 13px;
+      right: 33px;
+      cursor: pointer;
+      padding: 8px 5px 5px;
+      border-radius: 4px;
+    }
+
+    &__qr-code:hover {
+      background: #f1f1f1;
+    }
+
+    &__input.with-qr {
+      padding-right: 65px;
+    }
   }
 
   &__to-autocomplete, &__memo-text-area, &__hex-data {