Formulario para plantillas, estructura de catalogos, estilos

src/app/components/catalogs/companies/companies.component.html

@@ -0,0 +1,21 @@
+<h2 class="floating-title">{{ title }}</h2>
+
+<div class="main-content">
+  <div class="container-fluid">
+    <div class="col-12 align-right">
+      <div class="align-container">
+        <nav aria-label="breadcrumb">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item">
+              <a [routerLink]="['/']">Dashboard</a>
+            </li>
+            <li class="breadcrumb-item">Empresas</li>
+          </ol>
+        </nav>
+        <a class="btn btn-primary" [routerLink]="['/companies/new']">
+          Nuevo registro
+        </a>
+      </div>
+    </div>
+  </div>
+</div>

src/app/components/catalogs/companies/companies.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompaniesComponent } from './companies.component';
+
+describe('CompaniesComponent', () => {
+  let component: CompaniesComponent;
+  let fixture: ComponentFixture<CompaniesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CompaniesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CompaniesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/catalogs/companies/companies.component.ts

@@ -0,0 +1,14 @@
+import { Component, OnInit } from "@angular/core";
+
+@Component({
+  selector: "app-companies",
+  templateUrl: "./companies.component.html",
+  styleUrls: ["./companies.component.scss"]
+})
+export class CompaniesComponent implements OnInit {
+  title: string = "Empresas";
+
+  constructor() {}
+
+  ngOnInit() {}
+}

src/app/components/catalogs/companies/new-company/new-company.component.html

@@ -0,0 +1 @@
+<p>new-company works!</p>

src/app/components/catalogs/companies/new-company/new-company.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NewCompanyComponent } from './new-company.component';
+
+describe('NewCompanyComponent', () => {
+  let component: NewCompanyComponent;
+  let fixture: ComponentFixture<NewCompanyComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NewCompanyComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NewCompanyComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/catalogs/companies/new-company/new-company.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-new-company',
+  templateUrl: './new-company.component.html',
+  styleUrls: ['./new-company.component.scss']
+})
+export class NewCompanyComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/components/catalogs/countries/countries.component.html

@@ -0,0 +1 @@
+<p>countries works!</p>

src/app/components/catalogs/countries/countries.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CountriesComponent } from './countries.component';
+
+describe('CountriesComponent', () => {
+  let component: CountriesComponent;
+  let fixture: ComponentFixture<CountriesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CountriesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CountriesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/catalogs/countries/countries.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-countries',
+  templateUrl: './countries.component.html',
+  styleUrls: ['./countries.component.scss']
+})
+export class CountriesComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/components/investment-proposals/investment-proposals.component.html

@@ -13,8 +13,10 @@
               <li class="breadcrumb-item">Propuestas de inversión</li>
             </ol>
           </nav>
-
-          <a class="btn btn-primary" href="#">
+          <a
+            class="btn btn-primary"
+            [routerLink]="['/investment-proposals/new']"
+          >
             Nuevo registro
           </a>
         </div>

src/app/components/investment-proposals/new-investment-proposal/new-investment-proposal.component.html

@@ -0,0 +1,223 @@
+<h2 class="floating-title">{{ title }}</h2>
+
+<div class="main-content">
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-12 align-right">
+        <div class="align-container">
+          <nav aria-label="breadcrumb">
+            <ol class="breadcrumb">
+              <li class="breadcrumb-item">
+                <a [routerLink]="['/']">Dashboard</a>
+              </li>
+              <li class="breadcrumb-item">
+                <a [routerLink]="['/investment-proposals']">
+                  Propuestas de inversión
+                </a>
+              </li>
+              <li class="breadcrumb-item">Nueva</li>
+            </ol>
+          </nav>
+        </div>
+      </div>
+
+      <br />
+    </div>
+    <br />
+    <div class="row justify-content-center">
+      <div class="col-12">
+        <div class="align-container">
+          <div class="card">
+            <div class="card-header card-header-icon card-header-rose">
+              <div class="card-icon"><i class="material-icons">map</i></div>
+              <h4 class="card-title">
+                Nueva propuesta de inversión -
+                <small class="category">Complete la información</small>
+              </h4>
+            </div>
+            <div class="card-body">
+              <div class="align-container">
+                <form
+                  class="form-auth-small ng-untouched ng-pristine ng-valid"
+                  [formGroup]="investmentProposalForm"
+                  (ngSubmit)="createOrganization()"
+                >
+                  <div class="row">
+                    <div class="col-xl-4 col-lg-6 col-sm-12 pr-xl-5">
+                      <div class="form-group">
+                        <label for="name">Asunto: </label>
+                        <input
+                          type="text"
+                          formControlName="name"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.name.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.name.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.name.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <label for="country">Monto inversión: </label>
+                        <input
+                          type="text"
+                          formControlName="country"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.country.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.country.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.country.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <label for="city">Ingresos esperados: </label>
+                        <input
+                          type="text"
+                          formControlName="city"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.city.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.city.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.city.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-xl-4 col-lg-6 col-sm-12 pr-xl-5">
+                      <div class="form-group">
+                        <label for="contactName">Precio: </label>
+                        <input
+                          type="text"
+                          formControlName="contactName"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.contactName.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.contactName.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.contactName.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <label for="contactNumber">Nombre: </label>
+                        <input
+                          type="text"
+                          formControlName="contactNumber"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.contactNumber.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.contactNumber.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.contactNumber.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <label for="name">Rendimiento: </label>
+                        <input
+                          type="text"
+                          formControlName="name"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.name.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.name.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.name.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-xl-4 col-lg-6 col-sm-12">
+                      <div class="form-group">
+                        <label for="country">Fecha: </label>
+                        <input
+                          type="text"
+                          formControlName="country"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.country.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.country.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.country.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group">
+                        <label for="city">Plazo: </label>
+                        <input
+                          type="text"
+                          formControlName="city"
+                          class="form-control"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.city.errors
+                          }"
+                        />
+                        <div
+                          *ngIf="submitted && f.city.errors"
+                          class="invalid-feedback"
+                        >
+                          <div *ngIf="f.city.errors.required">
+                            Campo requerido
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <br />
+                  <button class="btn btn-primary">
+                    Guardar propuesta de inversión
+                  </button>
+                  <!--<div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/components/investment-proposals/new-investment-proposal/new-investment-proposal.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NewInvestmentProposalComponent } from './new-investment-proposal.component';
+
+describe('NewInvestmentProposalComponent', () => {
+  let component: NewInvestmentProposalComponent;
+  let fixture: ComponentFixture<NewInvestmentProposalComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NewInvestmentProposalComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NewInvestmentProposalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/investment-proposals/new-investment-proposal/new-investment-proposal.component.ts

@@ -0,0 +1,69 @@
+import { Component, OnInit } from "@angular/core";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import Swal from "sweetalert2";
+import * as CryptoJS from "crypto-js";
+
+@Component({
+  selector: "app-new-investment-proposal",
+  templateUrl: "./new-investment-proposal.component.html",
+  styleUrls: ["./new-investment-proposal.component.scss"]
+})
+export class NewInvestmentProposalComponent implements OnInit {
+  title: string = "Nueva propuesta de inversión";
+  investmentProposalForm: FormGroup;
+  submitted: boolean = false;
+  role_number: any;
+
+  constructor(private formBuilder: FormBuilder) {}
+
+  ngOnInit() {
+    this.investmentProposalForm = this.formBuilder.group({
+      name: ["", Validators.required],
+      address: ["", Validators.required],
+      city: ["", Validators.required],
+      country: ["", Validators.required],
+      contactName: ["", Validators.required],
+      contactNumber: ["", Validators.required]
+    });
+  }
+
+  get f() {
+    return this.investmentProposalForm.controls;
+  }
+
+  createOrganization() {
+    this.submitted = true;
+
+    // stop here if form is invalid
+    if (this.investmentProposalForm.invalid) {
+      return;
+    }
+
+    /*this.orgService.createOrganization(
+      {
+        name: this.f.name.value,
+        address: this.f.address.value,
+        city: this.f.city.value,
+        country: this.f.country.value,
+        contactName: this.f.contactName.value,
+        contactNumber: this.f.contactNumber.value,
+        assets: [""],
+      }
+    )
+      .subscribe(success => {
+        if (success) {
+          Swal.fire({
+            allowOutsideClick: false,
+            type: 'success',
+            showCancelButton: false,
+            title: 'Exito',
+            confirmButtonText: 'El registro ha sido guardado'
+          }).then((result) => {
+            if (result.value) {
+              window.location.href = "#/organizations";
+            }
+          });
+        }
+      });*/
+  }
+}

src/app/components/shared/footer/footer.component.html

@@ -1,8 +1,13 @@
-<div class="row align-container">
-  <div class="col-12">
-    <div class="card">
-      <div class="card-body">
-        <p class="card-text">&copy; 2019-2020 - INVERLEC. <a href="#/terms">Términos y condiciones.</a> </p>
+<div class="container-fluid">
+  <div class="row align-container">
+    <div class="col-12">
+      <div class="card">
+        <div class="card-body">
+          <p class="card-text">
+            &copy; 2019-2020 - INVERLEC.
+            <a href="#/terms">Términos y condiciones.</a>
+          </p>
+        </div>
       </div>
     </div>
   </div>

src/app/components/shared/sidebar/sidebar.component.html

@@ -34,21 +34,33 @@
       </a>
     </li>
     <li class="nav-item" routerlinkactive="active">
-      <a class="nav-link" data-toggle="collapse" href="#tables">
-        <i class="material-icons"> grid_on </i>
+      <a class="nav-link" data-toggle="collapse" href="#catalogs">
+        <i class="material-icons">grid_on</i>
         <p>Catálogos<b class="caret"></b></p>
       </a>
-      <div class="collapse" id="tables">
+      <div class="collapse" id="catalogs">
         <ul class="nav">
           <li class="nav-item" routerlinkactive="active">
-            <a class="nav-link" href="">
-              <span class="sidebar-mini"> C1 </span>
-              <span class="sidebar-normal"> Catalogo </span>
+            <a class="nav-link" href="#/companies">
+              <span class="sidebar-mini">EMP</span>
+              <span class="sidebar-normal">Empresas</span>
             </a>
           </li>
           <li class="nav-item" routerlinkactive="active">
-            <a class="nav-link" href="">
-              <span class="sidebar-mini"> C2 </span>
+            <a class="nav-link" href="#">
+              <span class="sidebar-mini">PAI</span>
+              <span class="sidebar-normal">Países</span>
+            </a>
+          </li>
+          <li class="nav-item" routerlinkactive="active">
+            <a class="nav-link" href="#">
+              <span class="sidebar-mini">EMI</span>
+              <span class="sidebar-normal">Emisores</span>
+            </a>
+          </li>
+          <li class="nav-item" routerlinkactive="active">
+            <a class="nav-link" href="#">
+              <span class="sidebar-mini">C2</span>
               <span class="sidebar-normal">Catalogo</span>
             </a>
           </li>

src/app/layouts/admin/admin.component.html

@@ -1,55 +1,11 @@
 <div class="wrapper">
-    <div class="sidebar" data-color="blue" data-background-color="white" >
-        <app-sidebar></app-sidebar>
-        <div class="sidebar-background" ></div>
-    </div>
-    <div class="main-panel">
-      <app-navbar></app-navbar>
-      <router-outlet></router-outlet>
-      <app-footer></app-footer>
-    </div>
-    <!--
-    <div class="fixed-plugin">
-        <div class="dropdown show-dropdown">
-            <a href="#" data-toggle="dropdown" aria-expanded="true">
-                <i class="fa fa-cog fa-2x"> </i>
-            </a>
-            <ul class="dropdown-menu" x-placement="bottom-start">
-                <li class="header-title"> Sidebar Filters</li>
-                <li class="adjustments-line">
-                    <a href="javascript:void(0)" class="switch-trigger active-color">
-                        <div class="ml-auto mr-auto">
-                            <span class="badge filter badge-white" data-color="white"></span>
-                            <span class="badge filter badge-yellow" data-color="yellow"></span>
-                            <span class="badge filter badge-blue active" data-color="blue"></span>
-                            <span class="badge filter badge-green" data-color="green"></span>
-                            <span class="badge filter badge-black" data-color="black"></span>
-                        </div>
-                        <div class="clearfix"></div>
-                    <div class="ripple-container"></div></a>
-                </li>
-                <li class="header-title">Images</li>
-                <li>
-                    <a class="img-holder switch-trigger" href="javascript:void(0)">
-                        <img src="./assets/img/sidebar-1.jpg" alt="">
-                    </a>
-                </li>
-                <li>
-                    <a class="img-holder switch-trigger" href="javascript:void(0)">
-                        <img src="./assets/img/sidebar-2.jpg" alt="">
-                    <div class="ripple-container"></div></a>
-                </li>
-                <li>
-                    <a class="img-holder switch-trigger" href="javascript:void(0)">
-                        <img src="./assets/img/sidebar-3.jpg" alt="">
-                    </a>
-                </li>
-                <li class="active">
-                    <a class="img-holder switch-trigger" href="javascript:void(0)">
-                        <img src="./assets/img/sidebar-4.jpg" alt="">
-                    </a>
-                </li>
-            </ul>
-        </div>
-    </div> -->
+  <div class="sidebar" data-color="blue" data-background-color="white">
+    <app-sidebar></app-sidebar>
+    <div class="sidebar-background"></div>
+  </div>
+  <div class="main-panel">
+    <app-navbar></app-navbar>
+    <router-outlet></router-outlet>
+    <app-footer></app-footer>
+  </div>
 </div>

src/app/layouts/admin/admin.module.ts

@@ -29,12 +29,17 @@ import { MatPasswordStrengthModule } from "@angular-material-extensions/password
 import { BreadcrumbModule, IconsModule } from "angular-bootstrap-md";
 import { TermsComponent } from "@app/components/terms/terms.component";
 import { InvestmentProposalsComponent } from "@app/components/investment-proposals/investment-proposals.component";
+import { NewInvestmentProposalComponent } from "@app/components/investment-proposals/new-investment-proposal/new-investment-proposal.component";
+
 import { InvestmentsComponent } from "@app/components/investments/investments.component";
 import { ArbitrationsComponent } from "@app/components/arbitrations/arbitrations.component";
 import { PerformancesComponent } from "@app/components/performances/performances.component";
 
 import { UsersComponent } from "@app/components/users/users.component";
 import { NewUserComponent } from "@app/components/users/new-user/new-user.component";
+import { CountriesComponent } from "@app/components/catalogs/countries/countries.component";
+import { CompaniesComponent } from "@app/components/catalogs/companies/companies.component";
+import { NewCompanyComponent } from "@app/components/catalogs/companies/new-company/new-company.component";
 
 @NgModule({
   imports: [
@@ -63,11 +68,15 @@ import { NewUserComponent } from "@app/components/users/new-user/new-user.compon
     ProfileComponent,
     TermsComponent,
     InvestmentProposalsComponent,
+    NewInvestmentProposalComponent,
     InvestmentsComponent,
     ArbitrationsComponent,
     PerformancesComponent,
     UsersComponent,
-    NewUserComponent
+    NewUserComponent,
+    CountriesComponent,
+    CompaniesComponent,
+    NewCompanyComponent
   ]
 })
 export class AdminModule {}

src/app/layouts/admin/admin.routing.ts

@@ -7,11 +7,16 @@ import { AuthGuard } from "@app/services/auth.guard";
 import { TermsComponent } from "@app/components/terms/terms.component";
 import { InvestmentsComponent } from "@app/components/investments/investments.component";
 import { InvestmentProposalsComponent } from "@app/components/investment-proposals/investment-proposals.component";
+import { NewInvestmentProposalComponent } from "@app/components/investment-proposals/new-investment-proposal/new-investment-proposal.component";
+
 import { ArbitrationsComponent } from "@app/components/arbitrations/arbitrations.component";
 import { PerformancesComponent } from "@app/components/performances/performances.component";
 
 import { UsersComponent } from "@app/components/users/users.component";
 import { NewUserComponent } from "@app/components/users/new-user/new-user.component";
+import { CountriesComponent } from "@app/components/catalogs/countries/countries.component";
+import { CompaniesComponent } from "@app/components/catalogs/companies/companies.component";
+import { NewCompanyComponent } from "@app/components/catalogs/companies/new-company/new-company.component";
 
 export const AdminLayoutRoutes: Routes = [
   {
@@ -34,6 +39,16 @@ export const AdminLayoutRoutes: Routes = [
       roles: [2, 3]
     }
   },
+  {
+    path: "investment-proposals/new",
+    component: NewInvestmentProposalComponent,
+    //canActivate: [AuthGuard],
+    data: {
+      title: "Nueva propuestas de inversión",
+      breadcrumb: "Nueva propuestas de inversión",
+      roles: [2, 3]
+    }
+  },
   {
     path: "investments",
     component: InvestmentsComponent,
@@ -84,5 +99,25 @@ export const AdminLayoutRoutes: Routes = [
       breadcrumb: "Nuevo usuario",
       roles: [3]
     }
+  },
+  {
+    path: "companies",
+    component: CompaniesComponent,
+    //canActivate: [AuthGuard],
+    data: {
+      title: "Empresas",
+      breadcrumb: "Empresas",
+      roles: [3]
+    }
+  },
+  {
+    path: "companies/new",
+    component: NewCompanyComponent,
+    //canActivate: [AuthGuard],
+    data: {
+      title: "Nueva empresa",
+      breadcrumb: "Nueva empresa",
+      roles: [3]
+    }
   }
 ];

src/assets/scss/core/_sidebar-and-main-panel.scss

@@ -10,7 +10,7 @@
   bottom: 0;
   left: 0;
   z-index: 2;
-  width: 260px;
+  width: 240px;
   background: #23272d;
   @include shadow-big();
 
@@ -46,7 +46,7 @@
     position: relative;
     height: calc(100vh - 75px);
     overflow: auto;
-    width: 260px;
+    width: 240px;
     z-index: 4;
     background: $sidebar-color;
 
@@ -140,10 +140,6 @@
         }
       }
 
-      &:first-child > a {
-        margin: 0 15px;
-      }
-
       &:hover > a,
       & .dropdown-menu a:hover,
       & .dropdown-menu a:focus,
@@ -205,14 +201,14 @@
 
   .nav li a,
   .nav li .dropdown-menu a {
-    margin: 10px 15px 0;
+    margin: 10px 10px 0;
     border-radius: $border-radius-base;
     color: $gray-light;
     padding-left: 10px;
     padding-right: 10px;
     text-transform: capitalize;
     font-size: $font-paragraph - 1;
-    padding: 10px 12px;
+    padding: 4px 12px;
   }
 
   .sidebar-background {
@@ -409,8 +405,8 @@
 
   .main-content {
     margin-top: 30px;
-    padding: 20px 10px;
-    min-height: calc(100vh - 123px);
+    padding: 10px 0;
+    min-height: calc(100vh - 150px);
   }
 
   .footer {
@@ -507,7 +503,7 @@
     }
 
     .sidebar:hover {
-      width: 260px;
+      width: 240px;
 
       .logo {
         a.logo-normal {
@@ -517,7 +513,7 @@
       }
 
       .sidebar-wrapper {
-        width: 260px;
+        width: 240px;
 
         > .nav li > a p,
         > .nav [data-toggle="collapse"] ~ div > ul > li > a .sidebar-normal,

src/assets/scss/core/mixins/_variables.scss

@@ -2,24 +2,24 @@
 //
 //## For each of Bootstrap's buttons, define text, background and border color.
 
-$opacity-gray-3:             rgba(222,222,222, .3) !default;
-$opacity-gray-5:             rgba(222,222,222, .5) !default;
-$opacity-gray-8:             rgba(222,222,222, .8) !default;
+$opacity-gray-3: rgba(222, 222, 222, 0.3) !default;
+$opacity-gray-5: rgba(222, 222, 222, 0.5) !default;
+$opacity-gray-8: rgba(222, 222, 222, 0.8) !default;
 
-$opacity-5:                  rgba(255,255,255, .5) !default;
-$opacity-8:                  rgba(255,255,255, .8) !default;
+$opacity-5: rgba(255, 255, 255, 0.5) !default;
+$opacity-8: rgba(255, 255, 255, 0.8) !default;
 
-$opacity-1:                  rgba(255,255,255, .1) !default;
-$opacity-2:                  rgba(255,255,255, .2) !default;
+$opacity-1: rgba(255, 255, 255, 0.1) !default;
+$opacity-2: rgba(255, 255, 255, 0.2) !default;
 
 //== Components
 //
 
-$topbar-x:             topbar-x !default;
-$topbar-back:          topbar-back !default;
-$bottombar-x:          bottombar-x !default;
-$bottombar-back:       bottombar-back !default;
+$topbar-x: topbar-x !default;
+$topbar-back: topbar-back !default;
+$bottombar-x: bottombar-x !default;
+$bottombar-back: bottombar-back !default;
 
 // Sidebar variables
-$sidebar-width:              calc(100% - 260px) !default;
-$sidebar-mini-width:         calc(100% - 80px) !default;
+$sidebar-width: calc(100% - 240px) !default;
+$sidebar-mini-width: calc(100% - 80px) !default;

src/assets/scss/core/variables/_modals.scss

@@ -11,7 +11,7 @@ $modal-content-xs-box-shadow: $bmd-shadow-24dp !default;
 //$modal-content-border-color:                   rgba(0,0,0,.2) !default;
 //
 //$modal-backdrop-bg:           #000 !default;
-$modal-backdrop-opacity: .26 !default; // .5
+$modal-backdrop-opacity: 0.26 !default; // .5
 //$modal-header-border-color:   #e5e5e5 !default;
 //$modal-footer-border-color:   $modal-header-border-color !default;
 //
@@ -19,16 +19,16 @@ $modal-backdrop-opacity: .26 !default; // .5
 //$modal-md:                    600px !default;
 //$modal-sm:                    300px !default;
 
-$transition-ease-in:              ease-in !default;
-$transition-ease-out:             ease-out !default;
-$ultra-fast-transition-time:      60ms  !default;
-$navbar-padding-a:               10px 15px;
-$padding-zero:                   0px !default;
-$sidebar-width:               calc(100% - 260px) !default;
-$sidebar-mini-width:         calc(100% - 80px) !default;
-$topbar-back:          topbar-back !default;
-$bottombar-back:       bottombar-back !default;
-$topbar-x:             topbar-x !default;
-$bottombar-x:          bottombar-x !default;
-$margin-bottom:                0 0 10px 0 !default;
-$margin-base-vertical:         15px !default;
+$transition-ease-in: ease-in !default;
+$transition-ease-out: ease-out !default;
+$ultra-fast-transition-time: 60ms !default;
+$navbar-padding-a: 10px 15px;
+$padding-zero: 0px !default;
+$sidebar-width: calc(100% - 240px) !default;
+$sidebar-mini-width: calc(100% - 80px) !default;
+$topbar-back: topbar-back !default;
+$bottombar-back: bottombar-back !default;
+$topbar-x: topbar-x !default;
+$bottombar-x: bottombar-x !default;
+$margin-bottom: 0 0 10px 0 !default;
+$margin-base-vertical: 15px !default;