Theme Variables Updated

yohangz · Jan 29, 2019 · ef9a8ea · ef9a8ea
1 parent b940fce
commit ef9a8ea
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/projects/ornamentum/src/styles/themes/data-table/_aegean.theme.variables.scss b/projects/ornamentum/src/styles/themes/data-table/_aegean.theme.variables.scss
@@ -60,6 +60,7 @@ $data-table-container-box-shadow-value: 0 0.1rem 0.2rem rgba(0, 0, 0, 0.3) !defa
 //Data Table Top Header Styles
 $data-table-top-header-background: #396996 !default;
 $data-table-top-header-border: #ddd !default;
+$data-table-top-header-border-radius-value: 0 !default;
 $data-table-top-header-text-color: #fff !default;
 
 //Data Table Dropdown Styles
@@ -123,6 +124,7 @@ $data-table-no-records-button-border-radius-value: 0.2rem !default;
 //Data Table Pagination Style
 $data-table-pagination-background: #fff !default;
 $data-table-pagination-border: #ddd !default;
+$data-table-pagination-border-radius-value: 0 !default;
 $data-table-pagination-range-text-color: #444 !default;
 $data-table-pagination-range-value-text-color: #3b78e7 !default;
 $data-table-pagination-input-border: #ddd !default;

diff --git a/projects/ornamentum/src/styles/themes/data-table/_base.theme.variables.scss b/projects/ornamentum/src/styles/themes/data-table/_base.theme.variables.scss
@@ -57,6 +57,7 @@ $data-table-container-box-shadow-value: none !default;
 //Data Table Top Header Styles
 $data-table-top-header-background: #ddd !default;
 $data-table-top-header-border: #ccc !default;
+$data-table-top-header-border-radius-value: 0 !default;
 $data-table-top-header-text-color: #222 !default;
 
 //Data Table Dropdown Styles
@@ -119,6 +120,7 @@ $data-table-no-records-button-border-radius-value: 0.2rem !default;
 //Data Table Pagination Style
 $data-table-pagination-background: #fff !default;
 $data-table-pagination-border: #ddd !default;
+$data-table-pagination-border-radius-value: 0 !default;
 $data-table-pagination-range-text-color: #333 !default;
 $data-table-pagination-range-value-text-color: #3b78e7 !default;
 $data-table-pagination-input-border: #ddd !default;

diff --git a/projects/ornamentum/src/styles/themes/data-table/_dark.theme.variables.scss b/projects/ornamentum/src/styles/themes/data-table/_dark.theme.variables.scss
@@ -58,6 +58,7 @@ $data-table-container-box-shadow-value: none !default;
 //Data Table Top Header Styles
 $data-table-top-header-background: #3c3f41 !default;
 $data-table-top-header-border: #3e3e3e !default;
+$data-table-top-header-border-radius-value: 0 !default;
 $data-table-top-header-text-color: #cacaca !default;
 
 //Data Table Dropdown Styles
@@ -121,6 +122,7 @@ $data-table-no-records-button-border-radius-value: 0.2rem !default;
 //Data Table Pagination Style
 $data-table-pagination-background: #3c3f41 !default;
 $data-table-pagination-border: #333 !default;
+$data-table-pagination-border-radius-value: 0 !default;
 $data-table-pagination-range-text-color: #cacaca !default;
 $data-table-pagination-range-value-text-color: #cacaca !default;
 $data-table-pagination-input-border: #333 !default;

diff --git a/projects/ornamentum/src/styles/themes/data-table/_flat.theme.variables.scss b/projects/ornamentum/src/styles/themes/data-table/_flat.theme.variables.scss
@@ -53,13 +53,14 @@ $loading-animation: '<svg enable-background="new 0 0 0 0" version="1.1" viewBox=
 $delete-color: #d32f2f !default;
 
 //Data Table Container Styles
-$data-table-container-border: 0.07rem solid #eaeaea !default;
-$data-table-container-border-radius-value: 0 !default;
-$data-table-container-box-shadow-value: none !default;
+$data-table-container-border: 0.07rem solid #c1c1c1 !default;
+$data-table-container-border-radius-value: 5px !default;
+$data-table-container-box-shadow-value: 1px 2px 5px rgba(0, 0, 0, .5) !default;
 
 //Data Table Top Header Styles
 $data-table-top-header-background: #00529f !default;
 $data-table-top-header-border: #8aa7dc !default;
+$data-table-top-header-border-radius-value: 5px 5px 0 0 !default;
 $data-table-top-header-text-color: #fff !default;
 
 //Data Table Dropdown Styles
@@ -123,6 +124,7 @@ $data-table-no-records-button-border-radius-value: 0.2rem !default;
 //Data Table Pagination Style
 $data-table-pagination-background: #00529f !default;
 $data-table-pagination-border: transparent !default;
+$data-table-pagination-border-radius-value: 0 0 5px 5px !default;
 $data-table-pagination-range-text-color: #fff !default;
 $data-table-pagination-range-value-text-color: #fff !default;
 $data-table-pagination-input-border: #fff !default;

diff --git a/projects/ornamentum/src/styles/themes/data-table/_ornamentum.theme.variables.scss b/projects/ornamentum/src/styles/themes/data-table/_ornamentum.theme.variables.scss
@@ -58,6 +58,7 @@ $data-table-container-box-shadow-value: none !default;
 //Data Table Top Header Styles
 $data-table-top-header-background: #7b2222 !default;
 $data-table-top-header-border: transparent !default;
+$data-table-top-header-border-radius-value: 0 !default;
 $data-table-top-header-text-color: #f5f5f5 !default;
 
 //Data Table Dropdown Styles
@@ -121,6 +122,7 @@ $data-table-no-records-button-border-radius-value: 0.2rem !default;
 //Data Table Pagination Style
 $data-table-pagination-background: #7b2222 !default;
 $data-table-pagination-border: #000 !default;
+$data-table-pagination-border-radius-value: 0 !default;
 $data-table-pagination-range-text-color: #f5f5f5 !default;
 $data-table-pagination-range-value-text-color: #fff !default;
 $data-table-pagination-input-border: #000 !default;

diff --git a/projects/ornamentum/src/styles/themes/data-table/base.theme.scss b/projects/ornamentum/src/styles/themes/data-table/base.theme.scss
@@ -155,6 +155,7 @@
 }
 
 .ng-data-table-top-header-container {
+  @include border-radius($data-table-top-header-border-radius-value);
   @include display-flex;
   @include align-items(center);
   @include justify-content(space-between);
@@ -651,7 +652,7 @@
   @include display-flex;
   @include font-size(0.7, 1.4);
   @include justify-content(space-between);
-
+  @include border-radius($data-table-pagination-border-radius-value);
   background: $data-table-pagination-background;
   border: 0;
   border-top: 0.05rem solid $data-table-pagination-border;

diff --git a/src/app/overview/components/data-table-demo/data-table-demo.component.html b/src/app/overview/components/data-table-demo/data-table-demo.component.html
@@ -3,7 +3,7 @@
   [title]="'Sales Products'"
   [dataSource]="dataSource"
   [limit]="14"
-  [minHeight]="200"
+  [minHeight]="400"
   [minWidth]="1080"
   [showHeader]="true"
   [pageable]="true"