diff --git a/src/app/core/components/navigation/navigation.model.ts b/src/app/core/components/navigation/navigation.model.ts index f34ccfe9..4e2ae775 100644 --- a/src/app/core/components/navigation/navigation.model.ts +++ b/src/app/core/components/navigation/navigation.model.ts @@ -257,23 +257,6 @@ export class FuseNavigation } ] }, - { - 'title' : 'Tables', - 'type' : 'nav-collapse', - 'icon' : 'border_all', - 'children': [ - { - 'title': 'Simple Table', - 'type' : 'nav-item', - 'url' : '/ui/tables/simple-table' - }, - { - 'title': 'Data Table', - 'type' : 'nav-item', - 'url' : '/ui/tables/data-table' - } - ] - }, { 'title' : 'Page Layouts', 'type' : 'nav-collapse', @@ -369,47 +352,17 @@ export class FuseNavigation 'type' : 'subheader' }, { - 'title' : 'Charts', + 'title' : 'Datatable', 'type' : 'nav-collapse', - 'icon' : 'poll', + 'icon' : 'border_all', 'children': [ { - 'title': 'nvD3', + 'title': 'Smart Table', 'type' : 'nav-item', - 'url' : '/components/charts/nvd3' + 'url' : '/component/tables/smart-table' } ] }, - { - 'title': 'Collapse', - 'type' : 'nav-item', - 'icon' : 'add_box', - 'url' : '/components/collapse' - }, - { - 'title': 'Modal', - 'type' : 'nav-item', - 'icon' : 'picture_in_picture', - 'url' : '/components/modal' - }, - { - 'title': 'Popovers', - 'type' : 'nav-item', - 'icon' : 'chat_buble', - 'url' : '/components/popovers' - }, - { - 'title': 'Snackbar', - 'type' : 'nav-item', - 'icon' : 'call_to_action', - 'url' : '/components/snackbar' - }, - { - 'title': 'Tooltips', - 'type' : 'nav-item', - 'icon' : 'live_help', - 'url' : '/components/tooltips' - } ]; } } diff --git a/src/app/core/scss/partials/_colors.scss b/src/app/core/scss/partials/_colors.scss index c58e8ca0..585b545f 100644 --- a/src/app/core/scss/partials/_colors.scss +++ b/src/app/core/scss/partials/_colors.scss @@ -1,23 +1,23 @@ $matColorsMap: ( - red: $mat-red, - pink:$mat-pink, - purple:$mat-purple, - deep-purple:$mat-deep-purple, - indigo:$mat-indigo, - blue:$mat-blue, - light-blue:$mat-light-blue, - cyan:$mat-cyan, - teal:$mat-teal, - green:$mat-green, - light-green:$mat-light-green, - lime:$mat-lime, - yellow:$mat-yellow, - amber:$mat-amber, - orange:$mat-orange, - deep-orange:$mat-deep-orange, - brown:$mat-brown, - grey:$mat-grey, - blue-grey:$mat-blue-grey + red: $mat-red, + pink:$mat-pink, + purple:$mat-purple, + deep-purple:$mat-deep-purple, + indigo:$mat-indigo, + blue:$mat-blue, + light-blue:$mat-light-blue, + cyan:$mat-cyan, + teal:$mat-teal, + green:$mat-green, + light-green:$mat-light-green, + lime:$mat-lime, + yellow:$mat-yellow, + amber:$mat-amber, + orange:$mat-orange, + deep-orange:$mat-deep-orange, + brown:$mat-brown, + grey:$mat-grey, + blue-grey:$mat-blue-grey ); $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400, A700; diff --git a/src/app/core/scss/partials/_typography.scss b/src/app/core/scss/partials/_typography.scss index 74bebc5f..78fc574d 100644 --- a/src/app/core/scss/partials/_typography.scss +++ b/src/app/core/scss/partials/_typography.scss @@ -46,6 +46,7 @@ h6, .h6 { // Links a { + color: mat-color($accent); text-decoration: none; &:hover, &:active { diff --git a/src/app/core/scss/variables/_theme.scss b/src/app/core/scss/variables/_theme.scss index 4586e614..7018af23 100644 --- a/src/app/core/scss/variables/_theme.scss +++ b/src/app/core/scss/variables/_theme.scss @@ -1,8 +1,41 @@ @import '~@angular/material/theming'; +$mat-fusedark: ( + 50: #ececee, + 100: #c5c6cb, + 200: #9ea1a9, + 300: #7d818c, + 400: #5c616f, + 500: #3c4252, + 600: #353a48, + 700: #2d323e, + 800: #262933, + 900: #1e2129, + A100: #c5c6cb, + A200: #9ea1a9, + A400: #5c616f, + A700: #2d323e, + contrast: ( + 50: $black-87-opacity, + 100: $black-87-opacity, + 200: $black-87-opacity, + 300: white, + 400: white, + 500: $white-87-opacity, + 600: $white-87-opacity, + 700: $white-87-opacity, + 800: $white-87-opacity, + 900: $white-87-opacity, + A100: $black-87-opacity, + A200: $white-87-opacity, + A400: $white-87-opacity, + A700: $white-87-opacity, + ) +); + // Palettes -$primary: mat-palette($mat-indigo); -$accent: mat-palette($mat-blue, A200, A100, A400); +$primary: mat-palette($mat-fusedark); +$accent: mat-palette($mat-blue, 600, 400, 700); $warn: mat-palette($mat-red); // Create the theme object (a Sass map containing all of the palettes). diff --git a/src/app/main/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/pages/authentication/forgot-password/forgot-password.component.html index 1c7b3cdf..f95e311b 100644 --- a/src/app/main/pages/authentication/forgot-password/forgot-password.component.html +++ b/src/app/main/pages/authentication/forgot-password/forgot-password.component.html @@ -22,7 +22,7 @@ - diff --git a/src/app/main/pages/authentication/lock/lock.component.html b/src/app/main/pages/authentication/lock/lock.component.html index 66dc6be4..dcdd83fa 100644 --- a/src/app/main/pages/authentication/lock/lock.component.html +++ b/src/app/main/pages/authentication/lock/lock.component.html @@ -31,7 +31,7 @@ - diff --git a/src/app/main/pages/authentication/login-2/login-2.component.html b/src/app/main/pages/authentication/login-2/login-2.component.html index a73d9df4..2a39a8d7 100644 --- a/src/app/main/pages/authentication/login-2/login-2.component.html +++ b/src/app/main/pages/authentication/login-2/login-2.component.html @@ -56,7 +56,7 @@ - diff --git a/src/app/main/pages/authentication/login/login.component.html b/src/app/main/pages/authentication/login/login.component.html index 33818ed2..4f030829 100644 --- a/src/app/main/pages/authentication/login/login.component.html +++ b/src/app/main/pages/authentication/login/login.component.html @@ -39,7 +39,7 @@ - diff --git a/src/app/main/pages/authentication/register-2/register-2.component.html b/src/app/main/pages/authentication/register-2/register-2.component.html index 800c869d..98bb9e64 100644 --- a/src/app/main/pages/authentication/register-2/register-2.component.html +++ b/src/app/main/pages/authentication/register-2/register-2.component.html @@ -66,7 +66,7 @@ terms and conditions - diff --git a/src/app/main/pages/authentication/register/register.component.html b/src/app/main/pages/authentication/register/register.component.html index 82367534..7fe77d7c 100644 --- a/src/app/main/pages/authentication/register/register.component.html +++ b/src/app/main/pages/authentication/register/register.component.html @@ -49,7 +49,7 @@ terms and conditions - diff --git a/src/app/main/pages/authentication/reset-password/reset-password.component.html b/src/app/main/pages/authentication/reset-password/reset-password.component.html index 0a25a144..095e9d28 100644 --- a/src/app/main/pages/authentication/reset-password/reset-password.component.html +++ b/src/app/main/pages/authentication/reset-password/reset-password.component.html @@ -36,7 +36,7 @@ - diff --git a/src/app/main/pages/coming-soon/coming-soon.component.html b/src/app/main/pages/coming-soon/coming-soon.component.html index 17e20a5f..dcf0fa23 100644 --- a/src/app/main/pages/coming-soon/coming-soon.component.html +++ b/src/app/main/pages/coming-soon/coming-soon.component.html @@ -35,7 +35,7 @@ - diff --git a/src/app/main/pages/profile/tabs/about/about.component.html b/src/app/main/pages/profile/tabs/about/about.component.html index 2c5c18cc..4d3880e0 100644 --- a/src/app/main/pages/profile/tabs/about/about.component.html +++ b/src/app/main/pages/profile/tabs/about/about.component.html @@ -4,7 +4,7 @@
-
+
General Information
@@ -38,7 +38,7 @@
-
+
Work
@@ -67,7 +67,7 @@
-
+
Contact
@@ -104,7 +104,7 @@
-
+
Friends
See 454 more... @@ -121,7 +121,7 @@
-
+
Joined Groups
See 6 more... diff --git a/src/app/main/pages/profile/tabs/about/about.component.scss b/src/app/main/pages/profile/tabs/about/about.component.scss index f6e48ded..011f40d9 100644 --- a/src/app/main/pages/profile/tabs/about/about.component.scss +++ b/src/app/main/pages/profile/tabs/about/about.component.scss @@ -93,7 +93,6 @@ header { padding: 16px; - background: mat-color($primary); .title { font-size: 17px; diff --git a/src/app/main/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/pages/profile/tabs/timeline/timeline.component.html index 230832cd..9a476895 100644 --- a/src/app/main/pages/profile/tabs/timeline/timeline.component.html +++ b/src/app/main/pages/profile/tabs/timeline/timeline.component.html @@ -136,7 +136,7 @@ fxFlexOrder.gt-sm="2">
-
+
Latest Activity
See All
diff --git a/src/app/main/pages/profile/tabs/timeline/timeline.component.scss b/src/app/main/pages/profile/tabs/timeline/timeline.component.scss index 38b49cbb..95bff062 100644 --- a/src/app/main/pages/profile/tabs/timeline/timeline.component.scss +++ b/src/app/main/pages/profile/tabs/timeline/timeline.component.scss @@ -225,10 +225,6 @@ .latest-activity { - header { - background: mat-color($primary); - } - .content { background-color: #FFF;