Merge remote-tracking branch 'origin/master' into SAN-2725-new-container

Author: Nathan219

.jshintrc

@@ -4,6 +4,7 @@
   "browser": true,
   "undef": true,
   "nonbsp": true,
+  "latedef": false,
   "quotmark": "single",
   "curly": true,
   "globalstrict": true,

CODE-STYLE.md

@@ -179,3 +179,9 @@ div(
   baz = "baz"
 )
 ```
+
+## Naming
+PSA - new naming standards for views and directives… instead of `viewFancySelect` it’s `fancySelectView` we are trying to slowly migrate all our views to have view at the end rather than the beginning.
+
+And for modals its `newContainerModalView` instead of `viewNewContainerModal`
+

Gruntfile.js

@@ -506,6 +506,19 @@ module.exports = function(grunt) {
     'compress:build',
     'concurrent'
   ]);
+  grunt.registerTask('server', [
+    'copy',
+    'sass:dev',
+    'autoprefixer',
+    'jade2js',
+    'jshint:dev',
+    'autoBundleDependencies',
+    'generateConfigs',
+    'browserify:watch',
+    'jade:compile',
+    'compress:build',
+    'concurrent'
+  ]);
   grunt.registerTask('deploy', [
     'copy',
     'sass:dev',
@@ -530,4 +543,4 @@ module.exports = function(grunt) {
     'jade:compile',
     'compress:build'
   ]);
-};
+};

client/assets/images/logos/credit-cards/logo-cc-amex.svg

@@ -19,8 +19,20 @@
     width: $input-xxs;
   }
 
-  // blue
-  &.blue::after {
+  // colors
+  &.badge-blue::after {
     background: $blue;
   }
+
+  &.badge-green::after {
+    background: $green;
+  }
+
+  &.badge-orange::after {
+    background: $orange;
+  }
+
+  &.badge-red::after {
+    background: $red;
+  }
 }

client/assets/images/logos/credit-cards/logo-cc-jcb.svg

@@ -263,12 +263,12 @@
 
   &.btn {
 
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       color: $blue;
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       color: $blue;
@@ -284,13 +284,13 @@
 
   &.btn {
 
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       background: $white;
       border-color: $gray-light;
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       background: $white;
@@ -325,12 +325,12 @@
   &.btn {
 
     // states
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       background: #8ae09c; // rgba($green,.6);
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       background: $green;
@@ -353,12 +353,12 @@
 
   &.btn {
 
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       background: $orange-lighter;
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       background: $orange;
@@ -376,12 +376,12 @@
     border-color: $white;
     color: $white;
 
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       background: rgba($white,.1);
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       background: $white;
@@ -411,12 +411,12 @@
     border-color: $red-dark;
     color: $white;
 
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       background: $red-light;
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       background: $red-dark;
@@ -432,12 +432,12 @@
   &.btn {
     background: $white;
 
-    &:hover:not([disabled]),
+    &:hover:not([disabled]):not(.disabled),
     &.hover {
       border-color: $gray-light;
     }
 
-    &:active:not([disabled]),
+    &:active:not([disabled]):not(.disabled),
     &.active,
     &.active:hover {
       border-color: $purple-light;

client/assets/images/logos/credit-cards/logo-cc-mastercard.svg

@@ -140,6 +140,7 @@
       background: transparent;
       flex: 1 1 auto;
       height: $input-sm;
+      min-width: 0;
       width: 100%;
     }
   }
@@ -167,8 +168,8 @@
     }
 
     .icons-notification {
-      border-color: $white;
-      color: $white;
+      background: $white;
+      color: $red;
     }
   }
 
@@ -180,10 +181,20 @@
   .icons-arrow-down {
     width: 21px;
   }
+
+  .icons-notification {
+    background: $orange;
+    border-radius: 50%;
+    color: $white;
+    height: 15px;
+    margin: 0 0 0 8px;
+    top: 9px;
+    width: 15px;
+  }
 }
 
 // dns button
-.btn-dns {
+.btn.btn-dns {
   color: $gray-light;
   font-size: 14px;
   font-weight: $weight-bold;
@@ -196,11 +207,11 @@
     background: transparent;
     border: 0;
 
-    &:hover {
+    &:hover:not([disabled]):not(.disabled) {
       background: transparent;
     }
 
-    &:active {
+    &:active:not([disabled]):not(.disabled) {
       background: transparent;
     }