purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-01-10 12:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

color tweaks

Browse Source
This commit is contained in:
Sercan Yemen 2017-07-29 15:26:46 +03:00
parent da433711be
commit 6f7809ac3e
16 changed files with 73 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/app/core/components/navigation/navigation.model.ts
View File

@ -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'
}
];
}
}

38
src/app/core/scss/partials/_colors.scss
View File

@ -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;

1
src/app/core/scss/partials/_typography.scss
View File

@ -46,6 +46,7 @@ h6, .h6 {
// Links
a {
color: mat-color($accent);
text-decoration: none;
&:hover, &:active {

37
src/app/core/scss/variables/_theme.scss
View File

@ -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).

2
src/app/main/pages/authentication/forgot-password/forgot-password.component.html
View File

@ -22,7 +22,7 @@
</md-error>
</md-input-container>
<button md-raised-button class="submit-button" color="primary"
<button md-raised-button class="submit-button" color="accent"
aria-label="SEND RESET LINK" [disabled]="forgotPasswordForm.invalid">
SEND RESET LINK
</button>

2
src/app/main/pages/authentication/lock/lock.component.html
View File

@ -31,7 +31,7 @@
</md-error>
</md-input-container>
<button md-raised-button class="submit-button" color="primary"
<button md-raised-button class="submit-button" color="accent"
aria-label="UNLOCK" [disabled]="lockForm.invalid">
UNLOCK
</button>

2
src/app/main/pages/authentication/login-2/login-2.component.html
View File

@ -56,7 +56,7 @@
</a>
</div>
<button md-raised-button color="primary" class="submit-button" aria-label="LOGIN"
<button md-raised-button color="accent" class="submit-button" aria-label="LOGIN"
[disabled]="loginForm.invalid">
LOGIN
</button>

2
src/app/main/pages/authentication/login/login.component.html
View File

@ -39,7 +39,7 @@
</a>
</div>
<button md-raised-button color="primary" class="submit-button" aria-label="LOG IN"
<button md-raised-button color="accent" class="submit-button" aria-label="LOG IN"
[disabled]="loginForm.invalid">
LOGIN
</button>

2
src/app/main/pages/authentication/register-2/register-2.component.html
View File

@ -66,7 +66,7 @@
<a href="#">terms and conditions</a>
</div>
<button md-raised-button color="primary" class="submit-button" aria-label="CREATE AN ACCOUNT"
<button md-raised-button color="accent" class="submit-button" aria-label="CREATE AN ACCOUNT"
[disabled]="registerForm.invalid">
CREATE AN ACCOUNT
</button>

2
src/app/main/pages/authentication/register/register.component.html
View File

@ -49,7 +49,7 @@
<a href="#">terms and conditions</a>
</div>
<button md-raised-button color="primary" class="submit-button" aria-label="CREATE AN ACCOUNT"
<button md-raised-button color="accent" class="submit-button" aria-label="CREATE AN ACCOUNT"
[disabled]="registerForm.invalid">
CREATE AN ACCOUNT
</button>

2
src/app/main/pages/authentication/reset-password/reset-password.component.html
View File

@ -36,7 +36,7 @@
</md-error>
</md-input-container>
<button md-raised-button class="submit-button" color="primary"
<button md-raised-button class="submit-button" color="accent"
aria-label="RESET MY PASSWORD" [disabled]="resetPasswordForm.invalid">
RESET MY PASSWORD
</button>

2
src/app/main/pages/coming-soon/coming-soon.component.html
View File

@ -35,7 +35,7 @@
</md-error>
</md-input-container>
<button md-raised-button color="primary" class="subscribe-button" aria-label="SUBSCRIBE"
<button md-raised-button color="accent" class="subscribe-button" aria-label="SUBSCRIBE"
[disabled]="comingSoonForm.invalid">
SUBSCRIBE
</button>

10
src/app/main/pages/profile/tabs/about/about.component.html
View File

@ -4,7 +4,7 @@
<div class="profile-box info-box general" fxLayout="column">
<header>
<header class="md-accent-bg">
<div class="title">General Information</div>
</header>
@ -38,7 +38,7 @@
<div class="profile-box info-box work" fxLayout="column">
<header>
<header class="md-accent-bg">
<div class="title">Work</div>
</header>
@ -67,7 +67,7 @@
<div class="profile-box info-box contact" fxLayout="column">
<header>
<header class="md-accent-bg">
<div class="title">Contact</div>
</header>
@ -104,7 +104,7 @@
<div class="profile-box friends" fxLayout="column">
<header fxLayout="row" fxLayoutAlign="space-between center">
<header class="md-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
<div class="title">Friends</div>
<div class="more secondary-text">
<span>See 454 more...</span>
@ -121,7 +121,7 @@
<div class="profile-box groups" fxLayout="column">
<header fxLayout="row" fxLayoutAlign="space-between center">
<header class="md-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
<div class="title">Joined Groups</div>
<div class="more secondary-text">
<span>See 6 more...</span>

1
src/app/main/pages/profile/tabs/about/about.component.scss
View File

@ -93,7 +93,6 @@
header {
padding: 16px;
background: mat-color($primary);
.title {
font-size: 17px;

2
src/app/main/pages/profile/tabs/timeline/timeline.component.html
View File

@ -136,7 +136,7 @@
fxFlexOrder.gt-sm="2">
<div class="profile-box latest-activity" fxLayout="column">
<header fxLayout="row" fxLayoutAlign="space-between center">
<header class="md-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
<div class="title">Latest Activity</div>
<div class="more secondary-text">See All</div>
</header>

4
src/app/main/pages/profile/tabs/timeline/timeline.component.scss
View File

@ -225,10 +225,6 @@
.latest-activity {
header {
background: mat-color($primary);
}
.content {
background-color: #FFF;