Fix Conflicts:

css/main.css

css/main.css

@@ -78,10 +78,13 @@
   font-family: 'Ubuntu', Helvetica, sans-serif !important;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  color: #2C3E50;
+}
+
 h1 {
   font-weight: 100;
   font-size: 24px;
-  color: #2C3E50;
   margin-bottom: 1rem;
 }
 
@@ -93,7 +96,6 @@ h2 {
 h3 {
   font-weight: 300;
   font-size: 16px;
-  color: #fff;
 }
 
 h4 {
@@ -103,6 +105,7 @@ h4 {
 body, html{
   height:100%;
   width:100%;
+  color: #2C3E50;
 }
 
 .off-canvas-wrap, .inner-wrap{
@@ -256,62 +259,56 @@ a:hover {
 }
 
 .last-transactions {
-  border: 1px solid #eee;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  -ms-border-radius: 3px;
-  border-radius: 3px;
-  margin-bottom: 1.25rem;
-  background-color: #fff;
+  margin-bottom: 2rem;
+  background-color: #E8EAEF;
 }
 
 .last-transactions-header {
-  padding: 10px 0;
-  overflow: hidden;
+  padding: 1rem 0;
+  height: 50px;
 }
 
 .last-transactions-footer {
-  padding: 10px 0;
+  padding: 1rem 0;
   overflow: hidden;
 }
 
 .last-transactions-content {
-  background-color: #FDFCFC;
   overflow: hidden;
-  padding: 10px 0;
+  padding: 1rem;
+  background: #CED3DB;
 }
 
 .last-transactions-content .box-status {
-  text-align: center;
-  font-size: 14;
+  font-size: 13px;
+  width: 35px;
 }
 
 .last-transactions-content .box-copayer {
-  width: 60px;
+  width: 100px;
   margin-right: 20px;
   float: left;
   text-align: center;
 }
 
 .last-transactions-content .copayer-ico {
-  width: 30px;
-  height: 30px;
-}
-
-.last-transactions-content .box-copayer .icon-inactive {
-  color: #4C5B69;
+  width: 45px;
+  height: 45px;
+  border: 2px solid #7A8C9B;
 }
 
 .last-transactions-content .box-copayer .icon-active {
-  color: #ccc;
+  color: #fff;
 }
 
 .last-transactions-content .box-copayer .icon-active-check {
-  color: #3FBC9C;
+  background-color: #3FBC9C;
+  color: #fff;
 }
 
 .last-transactions-content .box-copayer .icon-active-x {
-  color: #C0392B;
+  background-color: #C0392B;
+  color: #fff;
 }
 
 .input-note {
@@ -630,17 +627,27 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .dr-notification-image.dr-notification-type-success {
-  color: #B4D455;
+  color: #1ABC9C;
 }
 
 .dr-notification-image.success {
-  color: #B4D455;
+  color: #1ABC9C;
 }
 
 .success { 
   color: #1ABC9C;
 }
 
+.label.success { 
+  background-color: #1ABC9C;
+}
+
+.label.alert {
+  background-color: #C0392A;
+  padding: 0.3rem 0.4rem;
+  font-weight: 700;
+}
+
 .dr-notification-text {
   font-size: 12px;
   line-height: 120%;
@@ -662,7 +669,7 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
 }
 
 .tooltip { 
-  background: #16A085; 
+  background: #1ABC9C; 
   color: #fff; 
   font-weight: normal; 
   font-size: 14px; 
@@ -863,6 +870,10 @@ button.gray:focus,
   color: #2C3E50;
 }
 
+button, .button, p {
+  margin: 0;
+}
+
 .side-nav {padding: 0;}
 
 .side-nav li {
@@ -935,6 +946,19 @@ button.gray:focus,
   padding: 0.2rem 0.4rem;
 }
 
+.box-status {
+  float: right;
+}
+
+.icon-status { 
+  background-color: #34495E;
+  color: #7A8C9E;
+  border-radius: 100%;
+  padding: 0.17rem 0.3rem;
+  float: left;
+  margin-bottom: 0.2rem;
+}
+
 .has-error {
   color: #C0392A;
 }
@@ -967,8 +991,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   opacity: 0.6;
 }
 
+.black {
+  background-color: #2C3E50;
+}
+
 .text-light {font-weight: 100;}
 .text-gray {color: #8597A7;}
+.text-black {color: #2C3E50;}
 .text-primary {color: #1ABC9C;}
 .text-secondary {color: #3498DB;}
 .text-white {color: #fff;}
@@ -976,6 +1005,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
 
 .footer-setup a.text-gray:hover {color: #fff;}
 a.text-gray:hover {color: #2C3E50;}
+a.text-black:hover {color: #213140;}
 a.text-primary:hover {color: #50E3C2;}
 a.text-secondary:hover {color: #4A90E2;}
 a.text-white:hover {color: #ccc;}
@@ -1006,6 +1036,35 @@ a.text-white:hover {color: #ccc;}
   border: 0;
 }
 
+.box-setup h3 {
+  color: #fff;
+}
+
+.joyride-tip-guide {
+  width: 150px;
+  background: #213140;
+  top: -20px !important;
+  left: 50px !important;
+  -moz-box-shadow:    1px 1px 3px 0px rgba(0,0,0,0.40);
+  box-shadow:         1px 1px 3px 0px rgba(0,0,0,0.40);
+}
+
+.joyride-tip-guide .joyride-nub.left {
+  border-color: #213140 !important;
+  border-top-color: transparent !important;
+  border-left-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+
+.joyride-content-wrapper {
+  padding: 0.8rem
+}
+
+.joyride-tip-guide p {
+  margin: 0;
+  color: #8597A7;
+}
+
 .panel qrcode {
   float: left;
   width: 160px;