Missing button corrections

fablabbcn · Mar 27, 2024 · 2a8db7a · 2a8db7a
1 parent 6330169
commit 2a8db7a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 29 deletions.
diff --git a/src/app/components/kit/editKit/editKit.html b/src/app/components/kit/editKit/editKit.html
@@ -36,8 +36,8 @@ <h2 class="timeline_stepName timeline-title">
       </div>
       <!-- TODO: Cosmetic Make nicer -->
       <!-- <md-button style="margin-left: auto" class="md-flat md-primary timeline_buttonBack" ng-click="vm.backToDevice()">Back to Device</md-button> -->
-      <md-button ng-show="vm.step===1" class="md-flat md-primary timeline_buttonBack btn-round-new" ng-click="vm.backToProfile()">Back<span class="timeline-btn-extra"> to Profile</span></md-button>
-      <md-button class="md-flat md-primary timeline_buttonSave btn-round-new" ng-click="vm.submitFormAndKit()">Save</md-button>
+      <md-button ng-show="vm.step===1" class="timeline_buttonBack btn-round-new btn-outline-white" ng-click="vm.backToProfile()">Back<span class="timeline-btn-extra"> to Profile</span></md-button>
+      <md-button class="btn-round-new btn-outline-white-blue" ng-click="vm.submitFormAndKit()">Save</md-button>
     </div>
   </section>
   <section class="timeline_content" flex="1">

diff --git a/src/app/components/kit/newKit/newKit.html b/src/app/components/kit/newKit/newKit.html
@@ -6,8 +6,8 @@
           Add your kit
         </div>
       </div>
-      <md-button ng-show="vm.step===1" class="md-flat md-primary timeline_buttonBack btn-round-new" ng-click="vm.backToProfile()">Back<span class="timeline-btn-extra"> to Profile</span></md-button>
-      <md-button class="md-flat md-primary timeline_buttonSave btn-round-new" ng-click="vm.submitStepOne()">Next</md-button>
+      <md-button ng-show="vm.step===1" class="timeline_buttonBack btn-round-new btn-outline-white" ng-click="vm.backToProfile()">Back<span class="timeline-btn-extra"> to Profile</span></md-button>
+      <md-button class="btn-round-new btn-outline-white-blue" ng-click="vm.submitStepOne()">Next</md-button>
     </div>
   </section>
   <section class="timeline_content" flex="1">

diff --git a/src/app/components/upload/upload.html b/src/app/components/upload/upload.html
@@ -2,7 +2,7 @@
 <section class="upload-csv timeline" flex="1" layout="row" layout-align="center center">
   <div class="container" layout="row" layout-align="space-between center">
       <span class="timeline-title">CSV File Upload</span>
-      <md-button style="margin-left: auto" class="md-flat md-primary timeline_buttonBack" ui-sref="layout.home.kit({id: vm.kit.id})" >Back to Kit</md-button>
+      <md-button style="margin-left: auto" class="timeline_buttonBack btn-round-new btn-outline-white" ui-sref="layout.home.kit({id: vm.kit.id})" >Back to Kit</md-button>
 <!-- 	  <md-button style="margin-left: auto" class="md-flat md-primary timeline_buttonBack" ng-click="vm.backToProfile()">Back to Profile</md-button> -->
     </div>
   </div>

diff --git a/src/app/helpers.scss b/src/app/helpers.scss
@@ -126,6 +126,14 @@
   background: white !important;
   color: $off_black;
 }
+.btn-outline-white-blue{
+  border:2px solid white;
+  color: white;
+  padding:10px 29px;
+}
+.btn-outline-white-blue:hover{
+  background: $blue !important;
+}
 .btn-outline-yellow{
   border:2px solid $yellow;
   color: $yellow;
@@ -136,6 +144,7 @@
   color: $off_black;
 }
 .btn-yellow{
+  border:2px solid $yellow;
   background: $yellow;
   color: $off_black;
   padding:12px 29px;
@@ -155,6 +164,7 @@
   color: white;
 }
 .btn-blue{
+  border:2px solid $blue;
   background: $blue;
   color: white;
   padding:12px 29px;
@@ -164,9 +174,21 @@
   color: $blue;
   background: $grey_lighter !important;
 }
+.btn-white-blue{
+  border:2px solid white;
+  background: none;
+  color: white;
+  padding:12px 29px;
+}
+
+.btn-white-blue:hover{
+  color: $blue;
+  background: white !important;
+  border:2px solid $blue;
+}
 
 // TODO: Cosmetic Fix buttons in general
-.btn-round-new{
+.btn-round-new {
   border-radius: 40px;
   font-family: 'Roboto Condensed';
   font-size: 16px;

diff --git a/src/app/index.scss b/src/app/index.scss
@@ -1779,32 +1779,9 @@ footer {
 //   }
 // }
 
-.md-button.timeline_buttonSave {
-  color: white !important;
-  border: 2px solid white !important;
-  width: 130px;
-  height: 44px;
-  border-radius: 22px;
-  font-size: 18px;
-  font-weight: $font-weight-heavy;
-}
-
 .md-button.timeline_buttonBack{
-  color: white !important;
-  border: 2px solid white !important;
-  flex-shrink: 1;
-  flex-basis: 260px;
-  height: 44px;
-  border-radius: 22px;
-  font-size: 18px;
   margin-left: auto;
   margin-right: 20px;
-  font-weight: $font-weight-heavy;
-}
-
-.md-button.timeline_buttonBack:hover {
-  color: black !important;
-  background-color: white !important;
 }
 
 section.relaxed-layout {