diff --git a/matsen-tool/src/app/_views/account/login.component.html b/matsen-tool/src/app/_views/account/login.component.html
index 04f5089..81ba8b1 100644
--- a/matsen-tool/src/app/_views/account/login.component.html
+++ b/matsen-tool/src/app/_views/account/login.component.html
@@ -1,5 +1,5 @@
-
\ No newline at end of file
diff --git a/matsen-tool/src/app/_views/home/home.component.scss b/matsen-tool/src/app/_views/home/home.component.scss
index 5ad2ff6..f9cb343 100644
--- a/matsen-tool/src/app/_views/home/home.component.scss
+++ b/matsen-tool/src/app/_views/home/home.component.scss
@@ -7,8 +7,6 @@
.card {
width: 100%;
text-decoration: none;
- border-radius: 0;
- border: none;
border-top: 3px solid #c1c1c1;
}
.card-body {
diff --git a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html
index b7ac32f..7f87bb5 100644
--- a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html
+++ b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html
@@ -22,7 +22,7 @@
{{ 'overview.logo' | translate }}
-
|
@@ -33,7 +33,7 @@
{{ partnerColumnHeadline }}
- {{ element.name }}
+ {{ element.name }}
|
@@ -58,6 +58,16 @@
+
+
+ {{ 'overview.details' | translate }}
+ |
+
+
+ |
+
+
diff --git a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts
index 239e8a6..c9b6553 100644
--- a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts
+++ b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts
@@ -52,7 +52,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
private translateService: TranslateService,
protected appHelperService: AppHelperService,
) {
- this.displayedColumns = ['pos', 'image', 'name', 'address', 'website'];
+ this.displayedColumns = ['pos', 'image', 'name', 'address', 'website', 'details'];
this.sort = new MatSort();
this.partnersSub = new Subscription();
this.partners = [];
diff --git a/matsen-tool/src/app/_views/products/product-list/product-list.component.html b/matsen-tool/src/app/_views/products/product-list/product-list.component.html
index 358dc67..4c39ad8 100644
--- a/matsen-tool/src/app/_views/products/product-list/product-list.component.html
+++ b/matsen-tool/src/app/_views/products/product-list/product-list.component.html
@@ -24,7 +24,7 @@
{{ 'overview.image' | translate }}
-
+
|
@@ -34,7 +34,7 @@
{{ 'overview.productname' | translate }}
- {{ element.name }}
+ {{ element.name }}
|
@@ -56,6 +56,16 @@
+
+
+ {{ 'overview.details' | translate }}
+ |
+
+
+ |
+
+
diff --git a/matsen-tool/src/app/_views/products/product-list/product-list.component.ts b/matsen-tool/src/app/_views/products/product-list/product-list.component.ts
index 9c4b2ae..24ee6b3 100644
--- a/matsen-tool/src/app/_views/products/product-list/product-list.component.ts
+++ b/matsen-tool/src/app/_views/products/product-list/product-list.component.ts
@@ -47,7 +47,7 @@ export class ProductListComponent implements OnInit, AfterViewInit {
protected appHelperService: AppHelperService,
) {
this.sort = new MatSort();
- this.displayedColumns = ['pos', 'image', 'name', 'storage', 'number'];
+ this.displayedColumns = ['pos', 'image', 'name', 'storage', 'number', 'details'];
this.productsSub = new Subscription();
this.products = [];
diff --git a/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html b/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html
index 5781256..47323fb 100644
--- a/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html
+++ b/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html
@@ -44,7 +44,7 @@
{{ 'overview.productname' | translate }}
- {{ element.productName }}
+ {{ element.productName }}
|
diff --git a/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html b/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html
index 077c03b..33c6327 100644
--- a/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html
+++ b/matsen-tool/src/app/_views/user/user-detail/user-detail.component.html
@@ -32,14 +32,14 @@
-
-
+
+
diff --git a/matsen-tool/src/assets/scss/_basics.scss b/matsen-tool/src/assets/scss/_basics.scss
index 740f07c..dfa56cc 100644
--- a/matsen-tool/src/assets/scss/_basics.scss
+++ b/matsen-tool/src/assets/scss/_basics.scss
@@ -89,15 +89,21 @@ img {
background: #f6f6f6;
}
+.card {
+ border-radius: 0;
+ border: none;
+ .card-header:first-child {
+ border-radius: 0;
+ }
+}
+
.spt-sidebar {
//background: #2b3a44;
padding: 0;
.card {
background: transparent;
color: #fff;
- border: none;
border-bottom: 1px solid #fff;
- border-radius: 0;
width: 100%;
text-decoration: none;
.card-body {
@@ -241,8 +247,6 @@ img {
.posts .post,
.tasks {
.card {
- border: none;
- border-radius: 0;
background: #fafafa;
.spt-border {
border-left: 1px solid #c1c1c1;
@@ -269,8 +273,6 @@ img {
padding-bottom: 20px;
}
.card {
- border: none;
- border-radius: 0;
background: #f2f2f2;
border-top: 2px solid #c1c1c1;
margin-top: 20px;
diff --git a/matsen-tool/src/assets/scss/_button.scss b/matsen-tool/src/assets/scss/_button.scss
index 6e94a40..930596d 100644
--- a/matsen-tool/src/assets/scss/_button.scss
+++ b/matsen-tool/src/assets/scss/_button.scss
@@ -7,9 +7,11 @@
.btn-primary {
background-color: $color-matsen;
border-color: $color-matsen;
- &:hover {
- background-color: #b71e18;
- border-color: #b71e18;
+ &:hover,
+ &:focus,
+ &:active {
+ background-color: $color-matsen-dark !important;
+ border-color: $color-matsen-dark !important;
}
}
diff --git a/matsen-tool/src/assets/scss/_form.scss b/matsen-tool/src/assets/scss/_form.scss
index ce2e667..539361a 100644
--- a/matsen-tool/src/assets/scss/_form.scss
+++ b/matsen-tool/src/assets/scss/_form.scss
@@ -1,3 +1,7 @@
+.form-control {
+ border-radius: 0;
+}
+
.spt-form {
.delete-image {
display: flex;
diff --git a/matsen-tool/src/assets/scss/_text.scss b/matsen-tool/src/assets/scss/_text.scss
index c4e7c26..1616e10 100644
--- a/matsen-tool/src/assets/scss/_text.scss
+++ b/matsen-tool/src/assets/scss/_text.scss
@@ -45,6 +45,7 @@ strong {
font-family: "Montserrat", "Helvetica Neue", sans-serif !important;
}
+.login-form h1,
.home-container .mat-h1,
.home-container .mat-headline-5,
.home-container .mat-typography .mat-h1,
@@ -88,7 +89,14 @@ dl,
color: $color-matsen;
@include transition();
&:hover {
- color: #b71e18;
+ color: $color-matsen-dark;
}
}
+}
+.btn-link {
+ color: $color-matsen;
+ @include transition();
+ &:hover {
+ color: $color-matsen-dark;
+ }
}
\ No newline at end of file
diff --git a/matsen-tool/src/assets/scss/_variables.scss b/matsen-tool/src/assets/scss/_variables.scss
index 1c7ae57..37d39e3 100644
--- a/matsen-tool/src/assets/scss/_variables.scss
+++ b/matsen-tool/src/assets/scss/_variables.scss
@@ -1 +1,2 @@
-$color-matsen: rgba(229,38,30,1);
\ No newline at end of file
+$color-matsen: rgba(229,38,30,1);
+$color-matsen-dark: rgba(160,27,21,1);
\ No newline at end of file