From 92c8417a9ae1fc65a9475ee62b4270972f9869b1 Mon Sep 17 00:00:00 2001 From: mustafahlvc Date: Mon, 14 Aug 2017 18:18:01 +0300 Subject: [PATCH] Perfect Scrollbar enabled, missing attrs added + darken navbar bg color --- package-lock.json | 78 +----- src/app/app.module.ts | 8 +- src/app/core/modules/shared.module.ts | 6 +- .../dashboards/project/project.component.html | 232 +++++++++--------- .../file-manager/file-manager.component.html | 5 +- .../sidenavs/details/details.component.scss | 2 +- .../datatable/ngx-datatable.component.html | 2 +- .../price-tables/price-tables.component.html | 2 +- .../pages/profile/profile.component.html | 4 +- .../pages/search/search.component.html | 4 +- .../content/ui/colors/colors.component.html | 2 +- .../content/ui/forms/forms.component.html | 2 +- .../helper-classes.component.html | 4 +- .../content/ui/icons/icons.component.html | 4 +- .../page-layouts/blank/blank.component.html | 4 +- .../fullwidth-2/fullwidth-2.component.html | 4 +- .../left-sidenav-2.component.html | 4 +- .../right-sidenav-2.component.html | 4 +- .../simple/fullwidth/fullwidth.component.html | 4 +- .../left-sidenav-2.component.html | 4 +- .../right-sidenav-2.component.html | 4 +- .../simple/tabbed/tabbed.component.html | 4 +- .../ui/typography/typography.component.html | 4 +- src/app/main/main.component.html | 2 +- 24 files changed, 171 insertions(+), 222 deletions(-) diff --git a/package-lock.json b/package-lock.json index 051fc20f..c090b0a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1180,6 +1180,7 @@ "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, + "optional": true, "requires": { "align-text": "0.1.4", "lazy-cache": "1.0.4" @@ -1189,7 +1190,8 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true + "dev": true, + "optional": true } } }, @@ -2850,26 +2852,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", + "cross-spawn": "3.0.1", "get-stream": "3.0.0", "is-stream": "1.1.0", "npm-run-path": "2.0.2", "p-finally": "1.0.0", "signal-exit": "3.0.2", "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.2.14" - } - } } }, "exit": { @@ -5931,15 +5920,7 @@ "dev": true, "requires": { "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - } + "path-exists": "2.1.0" } }, "lodash": { @@ -8100,6 +8081,7 @@ "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, + "optional": true, "requires": { "align-text": "0.1.4" } @@ -8442,21 +8424,6 @@ } } }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -9352,48 +9319,28 @@ "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=" }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "0.5.6", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - } + "dev": true }, "wordwrap": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" }, "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=" } } }, @@ -10114,7 +10061,8 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true + "dev": true, + "optional": true }, "wordwrap": { "version": "0.0.3", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b0518f40..1900abdd 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,16 +11,16 @@ import 'hammerjs'; import { SharedModule } from './core/modules/shared.module'; import { AppComponent } from './app.component'; import { ProjectModule } from './main/content/apps/dashboards/project/project.module'; -// import { PerfectScrollbarConfigInterface, PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; +import { PerfectScrollbarConfigInterface, PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.module'; import { PagesModule } from './main/content/pages/pages.module'; import { UIModule } from './main/content/ui/ui.module'; import { ComponentsModule } from './main/content/components/components.module'; -/*const PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { +const PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { suppressScrollX: true -};*/ +}; const appRoutes: Routes = [ { @@ -67,7 +67,7 @@ const appRoutes: Routes = [ InMemoryWebApiModule.forRoot(FuseFakeDbService, {delay: 125}), - // PerfectScrollbarModule.forRoot(PERFECT_SCROLLBAR_CONFIG), + PerfectScrollbarModule.forRoot(PERFECT_SCROLLBAR_CONFIG), FuseMainModule, diff --git a/src/app/core/modules/shared.module.ts b/src/app/core/modules/shared.module.ts index 13609877..3bf0051e 100644 --- a/src/app/core/modules/shared.module.ts +++ b/src/app/core/modules/shared.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { MaterialModule } from './material.module'; import { FlexLayoutModule } from '@angular/flex-layout'; -// import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; +import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; import { ColorPickerModule } from 'ngx-color-picker'; import { NgxDnDModule } from '@swimlane/ngx-dnd'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; @@ -36,7 +36,7 @@ import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-do CommonModule, FormsModule, FusePipesModule, - // PerfectScrollbarModule, + PerfectScrollbarModule, ReactiveFormsModule, ColorPickerModule, NgxDnDModule, @@ -52,7 +52,7 @@ import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-do FusePipesModule, FuseCountdownComponent, FuseHljsComponent, - // PerfectScrollbarModule, + PerfectScrollbarModule, ReactiveFormsModule, ColorPickerModule, NgxDnDModule, diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index ef7cdf63..d83c5a77 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -690,136 +690,138 @@ - -
+
+ +
- - + + - -
+ +
-
+
-
{{dateNow | date: 'EEEE'}}, {{dateNow | date: 'h'}}:{{dateNow | date: 'm'}}:{{dateNow | date: 'ss'}}
+
{{dateNow | date: 'EEEE'}}, {{dateNow | date: 'h'}}:{{dateNow | date: 'm'}}:{{dateNow | date: 'ss'}}
-
- - - - - -
-
-
-
- {{dateNow | date: 'MMMM'}} -
- -
- {{dateNow | date: 'd'}} -
- -
- {{dateNow | date: 'y'}} -
-
- - -
- - - - - - - - - - -
- -
- -
- place - {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].name}} -
- -
- - - - - -
-
- -
- -
- - - {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].temp[widgets.weatherWidget.tempUnit]}} - - ° - C -
-
- -
-
- - - {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].windSpeed[widgets.weatherWidget.speedUnit]}} - - {{widgets.weatherWidget.speedUnit}} -
- -
- - {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].windDirection}} -
- -
- - {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].rainProbability}} -
-
- -
-
- {{day.name}} -
- - {{day.temp[widgets.weatherWidget.tempUnit]}} - ° - {{widgets.weatherWidget.tempUnit}} + + +
+ +
+
+ {{dateNow | date: 'MMMM'}} +
+ +
+ {{dateNow | date: 'd'}} +
+ +
+ {{dateNow | date: 'y'}} +
+
+ +
+ - + + -
- - - + + + +
+ +
+ +
+ place + {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].name}} +
+ +
+ + + + + +
+
+ +
+ +
+ + + {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].temp[widgets.weatherWidget.tempUnit]}} + + ° + C +
+
+ +
+
+ + + {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].windSpeed[widgets.weatherWidget.speedUnit]}} + + {{widgets.weatherWidget.speedUnit}} +
+ +
+ + {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].windDirection}} +
+ +
+ + {{widgets.weatherWidget.locations[widgets.weatherWidget.currentLocation].rainProbability}} +
+
+ +
+
+ {{day.name}} +
+ + {{day.temp[widgets.weatherWidget.tempUnit]}} + ° + {{widgets.weatherWidget.tempUnit}} +
+
+
+ + + +
+ + + + + +
+
- diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html index 2d869a12..ae17ad2e 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.html +++ b/src/app/main/content/apps/file-manager/file-manager.component.html @@ -10,7 +10,7 @@ -
+
@@ -64,7 +64,7 @@ -
+
@@ -80,5 +80,4 @@ -
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss index a9ebdd0b..9e664d18 100644 --- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss +++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss @@ -12,7 +12,7 @@ } > .content { - flex: 1 0 auto; + flex: 1; .file-details { diff --git a/src/app/main/content/components/datatable/ngx-datatable.component.html b/src/app/main/content/components/datatable/ngx-datatable.component.html index d0dca1ab..ccc416a1 100644 --- a/src/app/main/content/components/datatable/ngx-datatable.component.html +++ b/src/app/main/content/components/datatable/ngx-datatable.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/main/content/components/price-tables/price-tables.component.html b/src/app/main/content/components/price-tables/price-tables.component.html index 443a847f..e636ab8a 100644 --- a/src/app/main/content/components/price-tables/price-tables.component.html +++ b/src/app/main/content/components/price-tables/price-tables.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/main/content/pages/profile/profile.component.html b/src/app/main/content/pages/profile/profile.component.html index 8681ba64..01edc781 100644 --- a/src/app/main/content/pages/profile/profile.component.html +++ b/src/app/main/content/pages/profile/profile.component.html @@ -1,4 +1,4 @@ -
+
-
\ No newline at end of file +
diff --git a/src/app/main/content/pages/search/search.component.html b/src/app/main/content/pages/search/search.component.html index e8c795b6..119be965 100644 --- a/src/app/main/content/pages/search/search.component.html +++ b/src/app/main/content/pages/search/search.component.html @@ -1,4 +1,4 @@ -
+
-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/colors/colors.component.html b/src/app/main/content/ui/colors/colors.component.html index 855189fa..b2dc5486 100644 --- a/src/app/main/content/ui/colors/colors.component.html +++ b/src/app/main/content/ui/colors/colors.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/main/content/ui/forms/forms.component.html b/src/app/main/content/ui/forms/forms.component.html index 06dc3b1a..859230d2 100644 --- a/src/app/main/content/ui/forms/forms.component.html +++ b/src/app/main/content/ui/forms/forms.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.html b/src/app/main/content/ui/helper-classes/helper-classes.component.html index a2da4397..e8d21168 100644 --- a/src/app/main/content/ui/helper-classes/helper-classes.component.html +++ b/src/app/main/content/ui/helper-classes/helper-classes.component.html @@ -1,4 +1,4 @@ -
+
@@ -35,4 +35,4 @@
-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/icons/icons.component.html b/src/app/main/content/ui/icons/icons.component.html index f951c217..422f430b 100644 --- a/src/app/main/content/ui/icons/icons.component.html +++ b/src/app/main/content/ui/icons/icons.component.html @@ -1,4 +1,4 @@ -
+
@@ -54,4 +54,4 @@
-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.html b/src/app/main/content/ui/page-layouts/blank/blank.component.html index ac9651b7..53b0ba78 100644 --- a/src/app/main/content/ui/page-layouts/blank/blank.component.html +++ b/src/app/main/content/ui/page-layouts/blank/blank.component.html @@ -1,5 +1,5 @@ -
+

Blank Page

-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html index 68212d69..8c117a8d 100644 --- a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html @@ -1,4 +1,4 @@ -
+
@@ -36,4 +36,4 @@
-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html index 576e24fa..2d82e85a 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html @@ -1,4 +1,4 @@ -
+
@@ -65,4 +65,4 @@ -
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html index d387bc1f..4063ffe5 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html @@ -1,4 +1,4 @@ -
+
@@ -65,4 +65,4 @@ -
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html index 55a3714a..ebde62ff 100644 --- a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html +++ b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html @@ -1,4 +1,4 @@ -
+
@@ -14,4 +14,4 @@
-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html index f480d06a..79c888b0 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html @@ -1,4 +1,4 @@ -
+
@@ -43,4 +43,4 @@ -
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html index e5f54c47..96903b39 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html @@ -1,4 +1,4 @@ -
+
@@ -43,4 +43,4 @@ -
\ No newline at end of file +
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html index 16ad9f2b..d42786e9 100644 --- a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html @@ -1,4 +1,4 @@ -
+
@@ -34,4 +34,4 @@
-
\ No newline at end of file +
diff --git a/src/app/main/content/ui/typography/typography.component.html b/src/app/main/content/ui/typography/typography.component.html index 0ba101f4..bbfa8e2d 100644 --- a/src/app/main/content/ui/typography/typography.component.html +++ b/src/app/main/content/ui/typography/typography.component.html @@ -1,4 +1,4 @@ -
+
@@ -47,4 +47,4 @@
-
\ No newline at end of file +
diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html index fa46a296..d96e65ef 100644 --- a/src/app/main/main.component.html +++ b/src/app/main/main.component.html @@ -10,7 +10,7 @@
- +