Merge branch 'master' of https://github.com/bitpay/copay

src/sass/directives/directives.scss

@@ -1 +1 @@
-@import "gravatar"
+@import "gravatar";

src/sass/variables.scss

@@ -43,8 +43,8 @@ $v-wallet-color-map: (
   13: (color: #7a8c9e, name: 'Light Slate Grey')
 ) !default;
 
-/* Theme */ 
-$v-default-wallet-color-index:                       6 !default; // See $v-wallet-color-map
+/* Theme */
+$v-default-wallet-color-index:                       8 !default; // See $v-wallet-color-map
 $v-subtle-box-shadow:                                0 1px 2px rgba(0, 0, 0, 0.25) !default;
 $v-hovering-box-shadow:                              0px 6px 12px 0px rgba(0, 0, 0, 0.3) !default;
 $v-subtle-radius:                                    3px !default;

src/sass/views/bitpayCard.scss

@@ -88,14 +88,18 @@
       margin: 0;
       border: 0;
 
-      &.send .svg #-Transaction-icons {
+      &.send svg .nc-icon-wrapper g,
+      &.send svg .nc-icon-wrapper path,
+      &.send .tx-icon .houston {
       }
-      &.receive .svg #-Transaction-icons,
+      &.receive svg .nc-icon-wrapper g,
+      &.receive svg .nc-icon-wrapper path,
       &.receive .tx-icon .houston {
         stroke: #09C286;
         color: #09C286;
       }
-      &.pending .svg #-Transaction-icons,
+      &.pending svg .nc-icon-wrapper g,
+      &.pending svg .nc-icon-wrapper path,
       &.pending .tx-icon .houston {
         stroke: $v-bitcoin-orange;
         color: $v-bitcoin-orange;
@@ -154,11 +158,13 @@
   }
   .tx-message {
     margin-right: 1rem;
+    text-transform: capitalize;
   }
   .tx-location {
     margin-right: 1rem;
     font-size: 12.5px;
     color: $v-light-gray;
+    text-transform: capitalize;
   }
   .tx-amount {
     font-size: 16px;

src/sass/views/includes/checkBar.scss

@@ -0,0 +1,62 @@
+#check-bar {
+  $bar-widths: (
+    // defined by user, example:
+    //   error: 10%,
+    //   warn: 37%,
+    //   info: 65%,
+    //   debug: 90%
+  );
+  .item {
+    padding: 40px;
+  }
+  .checkbox-icon {
+    width: 22px;
+    height: 22px;
+  }
+  .checkbox-icon:after {
+    border: none;
+  }
+  .check-bar {
+    position: relative;
+    .initial-bar-default {
+      border: 2px solid $v-success-color;
+      width: 0%;
+      top: 40px;
+      z-index: 99;
+      border-radius: 10px;
+      position: absolute;
+    }
+    .initial-bar {
+    }
+    @each $name, $bar-width in $bar-widths {
+      .fill-bar-#{$name} {
+        width: $bar-width !important;
+        transition: width .2s;
+      }
+    }
+    .base-bar {
+      position: absolute;
+      width: 100%;
+      border-bottom: 2px solid #f2f2f2;
+      top: 41px;
+      z-index: 98;
+      left: 0px;
+    }
+    &.list {
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+      .custom-checkbox {
+        text-align: -webkit-center;
+        .item {
+          border-style: none;
+          z-index: 999;
+          background-color: inherit;
+        }
+        label {
+          padding-top: 5px;
+        }
+      }
+    }
+  }
+}

src/sass/views/includes/logOptions.scss

@@ -0,0 +1,88 @@
+log-options {
+
+  $border-color: #EFEFEF;
+
+  .bp-action-sheet__sheet {
+    padding-left: 2rem;
+    padding-right: .75rem;
+  }
+
+  .entry {
+    border: 0;
+    padding-right: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-bottom: 1px;
+    overflow: visible;
+
+    > i {
+      color: $v-accent-color;
+      padding: 0 0 5px 0;
+      margin-left: -5px;
+
+      > img {
+        height: 39px;
+        width: 39px;
+        padding: 4px;
+      }
+    }
+  }
+
+  .entry-inner {
+    display: flex;
+    position: relative;
+    padding-top: 16px;
+    padding-bottom: 16px;
+
+    &::after {
+      display: block;
+      position: absolute;
+      width: 100%;
+      height: 1px;
+      background: $border-color;
+      bottom: 0;
+      right: 0;
+      content: '';
+    }
+  }
+  
+  .entry-details {
+    flex-grow: 1;
+
+    .entry-name {
+      padding-bottom: 5px;
+    }
+  }
+
+  #check-bar {
+    $bar-widths: (
+      // Order must match weight, see services/historicLog.js
+      error: 10%,
+      warn: 35%,
+      info: 65%,
+      debug: 90%
+    );
+    .check-bar {
+      .initial-bar {
+        border: 2px solid $v-accent-color;
+      }
+      @each $name, $bar-width in $bar-widths {
+        .fill-bar-#{$name} {
+          width: $bar-width !important;
+        }
+      }
+    }
+
+    .head .checkbox-icon {
+      width: 22px;
+      height: 22px;
+      top: 0;
+    }
+
+    .checkbox-icon {
+      width: 10px;
+      height: 10px;
+      top: 6px;
+    }
+  }
+}

src/sass/views/includes/modals/choose-fee-level.scss

@@ -0,0 +1,57 @@
+#choose-fee-level {
+  @extend .deflash-blue;
+  .selected-fee-level {
+    text-align: center;
+    background: #f9f9f9;
+    font-size: 11px;
+    height: 140px;
+    padding-top: 25px;
+    .row {
+      padding: 0;
+    }
+    .col {
+      padding-top: 15px;
+    }
+    .separator {
+      border-left: 1px solid #d9d9df;
+      height: 75%;
+    }
+    .value {
+      font-size: 20px;
+      margin-bottom: 10px;
+    }
+    .rate .list {
+      margin-bottom: 0;
+    }
+
+    .item-input {
+      input[type="number"] {
+        text-align: right;
+        padding-right: 90px;
+      }
+      .unit {
+        color: #9c9c9c;
+        background: #f2f2f2;
+        position: absolute;
+        right: 0;
+        top: 0;
+        padding: 15px 10px 12px 10px;
+      }
+    }
+  }
+  .error-fee {
+    padding: 8px 10px;
+    color: $v-error-color;
+    font-size: 12px;
+    text-align: center;
+    i {
+      margin-right: 8px;
+    }
+  }
+  .box-notification {
+    margin: 0;
+    padding: 1px;
+    text-align: center;
+  }
+
+}

src/sass/views/tab-settings.scss

@@ -25,6 +25,15 @@
     background-color: #fff;
     font-size:0.9em;
     color: $v-mid-gray;
+    .text {
+      padding-left: 25px;
+    }
+    .icon {
+      position: absolute;
+      img {
+        width: 20px;
+      }
+    }
   }
   &-explanation, &-button-group {
     padding: 0 1rem;
@@ -91,6 +100,10 @@
     .item-button-right > .button {
       top: 16px;
     }
+    .toggle-small.item-toggle .toggle,
+    .item-button-right > .button {
+      top: 25px;
+    }
     .item-button-right > .button {
       font-size: 16px;
     }
@@ -110,6 +123,20 @@
     color: #00901B;
    }
  }
+ .log-bg {
+    background: white;
+  }
+ .log-entry {
+    font-size: 12px;
+    line-height: 18px;
+    border: none;
+  }
+ .log-timestamp {
+    font-weight: bold;
+  }
+ .log-level {
+    font-weight: bold;
+  }
 }
 
 #tab-settings {
@@ -162,6 +189,7 @@
 
 #settings-fee {
   .estimates {
+    min-height: 6rem;
     font-size: 15px;
     color: $v-dark-gray;
     margin-bottom: .5rem;

src/sass/views/views.scss

@@ -34,6 +34,7 @@
 @import "includes/walletActivity";
 @import "includes/wallets";
 @import "includes/modals/modals";
+@import "includes/modals/choose-fee-level";
 @import "includes/clickToAccept";
 @import "includes/incomingDataMenu";
 @import "includes/slideToAccept";
@@ -47,3 +48,5 @@
 @import "integrations/integrations";
 @import "custom-amount";
 @import "includes/pin";
+@import "includes/logOptions";
+@import "includes/checkBar";