From 617fa716a7fab1429dc3b0fbf41a7eb84f24ad2c Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 12 May 2017 12:26:12 +0100 Subject: [PATCH 1/2] Changes to right side menu Added potential to link --- src/app/layouts/full-layout.component.html | 96 ++++------------------ 1 file changed, 15 insertions(+), 81 deletions(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index a439450..71fffde 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -41,10 +41,10 @@
Settings
- Profile - Setting - Payments42 - Projects42 + User Settings + Transaction History + Points History42 + Notifications42
Lock account Logout @@ -163,90 +163,24 @@ -
- Today +
+ User Settings
-
-
- admin@bootstrapmaster.com -
-
Meeting with Lucas
-   1 - 3pm -   Palo Alto, CA -
-
-
-
- admin@bootstrapmaster.com -
-
Skype with Megan
-   4 - 5pm -   On-line +
+ Transaction History
-
- Tomorrow +
+ Points History
-
-
New UI Project - deadline
-   10 - 11pm -   creativeLabs HQ -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
+
+ Notifications
-
-
-
#10 Startups.Garden Meetup
-   1 - 3pm -   Palo Alto, CA -
-
-
-
Team meeting
-   4 - 6pm -   creativeLabs HQ -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
- admin@bootstrapmaster.com -
-
-
-
+ + + From bf1638e2e17ba9f905d16aceadb36e9568d77eab Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 12 May 2017 17:07:18 +0100 Subject: [PATCH 2/2] Changes to top bar --- src/app/dashboard/dashboard.component.html | 21 +++++++------------ src/app/dashboard/dashboard.component.ts | 8 ++++---- src/app/layouts/full-layout.component.html | 15 +++----------- src/app/widgets/widgets.component.html | 24 +++++++++++----------- src/app/widgets/widgets.component.ts | 10 ++++----- src/scss/core/_breadcrumb-menu.scss | 4 ++++ 6 files changed, 35 insertions(+), 47 deletions(-) diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 3947d28..b2b88c4 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -13,8 +13,8 @@ Something else here
-

9.823

-

Members online

+

£183.98

+

Money spent this week

9.823

-

Members online

+

Money spent last week

9.823

-

Members online

+

Points earned this week

9.823

-

Members online

+

Points earned last week

-

Traffic

+

Customers

November 2015
@@ -148,15 +148,8 @@
    -
  • -
    Visits
    - 29.703 Users (40%) -
    -
    -
    -
  • -
    Unique
    +
    Customers
    24.093 Users (20%)
    diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 93c2701..622854c 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -45,7 +45,7 @@ export class DashboardComponent implements OnInit { // lineChart1 public lineChart1Data: Array = [ { - data: [65, 59, 84, 84, 51, 55, 40], + data: [44.72, 29.97, 16.65, 30.99, 47.75, 6.95, 6.95], label: 'Series A' } ]; @@ -68,8 +68,8 @@ export class DashboardComponent implements OnInit { display: false, ticks: { display: false, - min: 40 - 5, - max: 84 + 5, + min: 5 - 5, + max: 50 + 5, } }], }, @@ -467,7 +467,7 @@ export class DashboardComponent implements OnInit { for (let i = 0; i <= this.mainChartElements; i++) { this.mainChartData1.push(this.random(50, 200)); this.mainChartData2.push(this.random(80, 100)); - this.mainChartData3.push(65); + this.mainChartData3.push(this.random(50, 200)); } } } diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 71fffde..d12013d 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -16,15 +16,6 @@
    -
  • - 5 -
    • -
  • - -
    • -
  • - -
  • admin@bootstrapmaster.com @@ -147,9 +138,9 @@
  • - -  Dashboard -  Settings +  Money Spent this Month: £364.45 + <  Add Transaction +  Points Total: 206
    • diff --git a/src/app/widgets/widgets.component.html b/src/app/widgets/widgets.component.html index 140ff1e..4e030f0 100644 --- a/src/app/widgets/widgets.component.html +++ b/src/app/widgets/widgets.component.html @@ -115,7 +115,7 @@
    - SALE + Money spent this week $1.890,65
    @@ -155,7 +155,7 @@
    - SALE + Money spent last week $1.890,65
    @@ -168,23 +168,23 @@
    diff --git a/src/app/widgets/widgets.component.ts b/src/app/widgets/widgets.component.ts index 3e751ee..9a3c37a 100644 --- a/src/app/widgets/widgets.component.ts +++ b/src/app/widgets/widgets.component.ts @@ -36,7 +36,7 @@ export class WidgetsComponent { // lineChart1 public lineChart1Data: Array = [ { - data: [65, 59, 84, 84, 51, 55, 40], + data: [80, 59, 84, 84, 51, 55, 40], label: 'Series A' } ]; @@ -220,11 +220,11 @@ export class WidgetsComponent { // lineChart4 public lineChart4Data: Array = [ { - data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9], + data: [4, 18, 9, 17, 80, 22, 11], label: 'Series A' } ]; - public lineChart4Labels: Array = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + public lineChart4Labels: Array = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; public lineChart4Options: any = { maintainAspectRatio: false, scales: { @@ -259,7 +259,7 @@ export class WidgetsComponent { label: 'Series A' } ]; - public barChart2Labels: Array = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + public barChart2Labels: Array = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; public barChart2Options: any = { maintainAspectRatio: false, scales: { @@ -338,7 +338,7 @@ export class WidgetsComponent { // lineChart5 public lineChart5Data: Array = [ { - data: [65, 59, 84, 84, 51, 55, 40], + data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9], label: 'Series A' } ]; diff --git a/src/scss/core/_breadcrumb-menu.scss b/src/scss/core/_breadcrumb-menu.scss index 508f7c1..eff8f3e 100644 --- a/src/scss/core/_breadcrumb-menu.scss +++ b/src/scss/core/_breadcrumb-menu.scss @@ -15,6 +15,10 @@ .btn.btn-secondary { color: $text-muted; border: 0; + display: block; +float: center; +position: relative; +width: 100%; &:hover, &.active { color: $body-color;