Selaa lähdekoodia

Merge branch 'development' of onunez/soma-frontend into master

Oscar José Nuñez Chávez 5 vuotta sitten
vanhempi
commit
bcc4d6551d

+ 2 - 2
src/app/components/assets/assets.component.ts

@@ -910,9 +910,9 @@ export class AssetsComponent implements OnInit {
                 data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
                 data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
               var total = 0;
               var total = 0;
 
 
-              for (var i = 0; i < data.datasets.length; i++)
+              for (var i = 1; i < data.datasets.length; i++) {
                 total += +data.datasets[i].data[tooltipItem.index];
                 total += +data.datasets[i].data[tooltipItem.index];
-
+              }
               if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
               if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
                 return label + " : " + value;
                 return label + " : " + value;
               } else {
               } else {

+ 1 - 1
src/app/components/login/login.component.html

@@ -3,7 +3,7 @@
     <div class="vertical-align-middle auth-main">
     <div class="vertical-align-middle auth-main">
       <div class="auth-box">
       <div class="auth-box">
         <div class="top">
         <div class="top">
-          <img alt="INVERLEC - DENMARK" src="./assets/img/denmark-logo.png" />
+          <img alt="INVERLEC - DENMARK" src="./assets/img/inverlec_logo.png" />
         </div>
         </div>
         <div class="card">
         <div class="card">
           <div class="header">
           <div class="header">

+ 70 - 0
src/app/components/login/login.component.scss

@@ -10,6 +10,75 @@
   vertical-align: middle;
   vertical-align: middle;
 }
 }
 
 
+.auth-box {
+  width: 400px;
+  height: auto;
+  margin-left: 130px;
+
+  .card {
+    padding: 25px;
+  }
+}
+
+.auth-main::before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 450px;
+  height: 100%;
+  z-index: -1;
+  background: #f0f0f0;
+}
+
+.auth-main:after {
+  content: "";
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: -2;
+  background: #223d7d;
+  //background: url(../../assets/images/auth_bg.jpg) no-repeat top left fixed;
+}
+
+.card {
+  background: #fff;
+  transition: 0.5s;
+  border: 0;
+  margin-bottom: 30px;
+  border-radius: 0.55rem;
+  position: relative;
+  width: 100%;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1);
+}
+
+@media screen and (max-width: 640px) {
+  .auth-box {
+    width: 90%;
+  }
+}
+
+@media screen and (max-width: 992px) {
+  .auth-box {
+    width: 80%;
+    margin: 0 auto;
+  }
+}
+
+/*.vertical-align-wrap {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  display: table;
+}
+
+.vertical-align-middle {
+  display: table-cell;
+  vertical-align: middle;
+}
+
 .auth-box {
 .auth-box {
   width: 450px;
   width: 450px;
   height: auto;
   height: auto;
@@ -81,3 +150,4 @@
     margin: 0 auto;
     margin: 0 auto;
   }
   }
 }
 }
+*/

BIN
src/assets/img/_denmark-logo.png


BIN
src/assets/img/_denmark-small-logo.png


BIN
src/assets/img/denmark-logo.png


BIN
src/assets/img/denmark-small-logo.png


BIN
src/assets/img/favicon2.ico


BIN
src/favicon.ico


BIN
src/favicon2.ico