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

Used 'Muli' as the primary font

Browse Source 
Increased the font-weight 500s to 600s
Small tweaks
This commit is contained in:
sercan 2018-09-24 11:18:07 +03:00
parent 790549a92d
commit 5251a6305f
8 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/@fuse/components/sidebar/sidebar.component.ts
View File

@ -1,5 +1,5 @@
import { import {
ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnDestroy, OnInit, Output, Renderer2, RendererStyleFlags2, ViewEncapsulation ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnDestroy, OnInit, Output, Renderer2, ViewEncapsulation
} from '@angular/core'; } from '@angular/core';
import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations'; import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
import { ObservableMedia } from '@angular/flex-layout'; import { ObservableMedia } from '@angular/flex-layout';
@ -320,6 +320,7 @@ export class FuseSidebarComponent implements OnInit, OnDestroy
// Get the active status // Get the active status
const isActive = this._observableMedia.isActive(this.lockedOpen); const isActive = this._observableMedia.isActive(this.lockedOpen);
// If the both status are the same, don't act // If the both status are the same, don't act
if ( this._wasActive === isActive ) if ( this._wasActive === isActive )
{ {

6
src/@fuse/components/theme-options/theme-options.component.scss
View File

@ -30,7 +30,7 @@ fuse-theme-options {
.title { .title {
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 600;
padding-left: 4px; padding-left: 4px;
} }
} }
@ -56,12 +56,12 @@ fuse-theme-options {
margin: 0; margin: 0;
padding: 0 8px; padding: 0 8px;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 600;
} }
h3 { h3 {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 600;
margin: 24px 0 16px 0; margin: 24px 0 16px 0;
padding: 0; padding: 0;

22
src/@fuse/scss/partials/_material.scss
View File

@ -172,7 +172,7 @@
margin: 0 8px 0 0; margin: 0 8px 0 0;
border-radius: 50%; border-radius: 50%;
font-size: 17px; font-size: 17px;
font-weight: 500; font-weight: 600;
text-align: center; text-align: center;
&.square { &.square {
@ -287,14 +287,14 @@ mat-icon.status {
.title { .title {
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 600;
line-height: 1; line-height: 1;
} }
} }
.subheader { .subheader {
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 600;
margin-top: 8px; margin-top: 8px;
} }
@ -364,7 +364,7 @@ mat-icon.status {
.currency { .currency {
padding-right: 4px; padding-right: 4px;
font-size: 24px; font-size: 24px;
font-weight: 500; font-weight: 600;
} }
.value { .value {
@ -406,14 +406,14 @@ mat-icon.status {
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
font-size: 11px; font-size: 11px;
font-weight: 500; font-weight: 600;
padding: 6px 8px; padding: 6px 8px;
} }
.package-type { .package-type {
padding: 48px 32px 24px 32px; padding: 48px 32px 24px 32px;
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 600;
text-align: center; text-align: center;
} }
@ -423,7 +423,7 @@ mat-icon.status {
.currency { .currency {
padding-right: 4px; padding-right: 4px;
font-size: 24px; font-size: 24px;
font-weight: 500; font-weight: 600;
} }
.value { .value {
@ -436,7 +436,7 @@ mat-icon.status {
.period { .period {
padding: 0 32px; padding: 0 32px;
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 600;
text-align: center; text-align: center;
} }
@ -471,7 +471,7 @@ mat-icon.status {
.subtitle { .subtitle {
font-size: 17px; font-size: 17px;
font-weight: 500; font-weight: 600;
} }
} }
@ -481,7 +481,7 @@ mat-icon.status {
.currency { .currency {
padding-right: 4px; padding-right: 4px;
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 600;
} }
.value { .value {
@ -546,7 +546,7 @@ table {
th { th {
padding: 16px 8px; padding: 16px 8px;
font-weight: 500; font-weight: 600;
white-space: nowrap; white-space: nowrap;
&:first-child { &:first-child {

7
src/@fuse/scss/partials/_navigation.scss
View File

@ -4,7 +4,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
height: 48px; height: 48px;
font-weight: 500; font-weight: 600;
padding-left: 24px; padding-left: 24px;
margin-top: 8px; margin-top: 8px;
font-size: 12px; font-size: 12px;
@ -19,7 +19,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
height: 48px; height: 48px;
font-weight: 500; font-weight: 600;
padding-left: 24px; padding-left: 24px;
margin-top: 8px; margin-top: 8px;
font-size: 12px; font-size: 12px;
@ -53,7 +53,7 @@
height: 20px; height: 20px;
padding: 0 7px; padding: 0 7px;
font-size: 11px; font-size: 11px;
font-weight: 500; font-weight: 600;
border-radius: 20px; border-radius: 20px;
transition: opacity 0.2s ease-in-out 0.1s; transition: opacity 0.2s ease-in-out 0.1s;
margin-left: 8px; margin-left: 8px;
@ -85,7 +85,6 @@
.nav-link-icon { .nav-link-icon {
margin-right: 16px; margin-right: 16px;
opacity: 0.7;
} }
.nav-link-icon, .nav-link-icon,

8
src/@fuse/scss/partials/_typography.scss
View File

@ -41,7 +41,7 @@
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
html { html {
font-size: 62.5%; font-size: 62.5%;
font-family: 'Nunito', 'Helvetica Neue', 'Arial', sans-serif; font-family: 'Muli', 'Helvetica Neue', 'Arial', sans-serif;
line-height: 1.4 !important; line-height: 1.4 !important;
letter-spacing: -0.1px !important; letter-spacing: -0.1px !important;
} }
@ -304,7 +304,7 @@ strong {
padding: 4px 8px; padding: 4px 8px;
margin: 0 8px; margin: 0 8px;
font-size: 11px; font-size: 11px;
font-weight: 500; font-weight: 600;
white-space: nowrap; white-space: nowrap;
} }
@ -399,6 +399,10 @@ strong {
li { li {
margin-bottom: 6px; margin-bottom: 6px;
letter-spacing: 0.015em; letter-spacing: 0.015em;
ul {
margin-top: 6px;
}
} }
} }
} }

11
src/app/app.component.ts
View File

@ -73,9 +73,12 @@ export class AppComponent implements OnInit, OnDestroy
this._translateService.use('en'); this._translateService.use('en');
/** /**
* ------------------------------------------------------------------ * ----------------------------------------------------------------------------------------------------
* ngxTranslate Fix Start * ngxTranslate Fix Start
* ------------------------------------------------------------------ * ----------------------------------------------------------------------------------------------------
*/
/**
* If you are using a language other than the default one, i.e. Turkish in this case, * If you are using a language other than the default one, i.e. Turkish in this case,
* you may encounter an issue where some of the components are not actually being * you may encounter an issue where some of the components are not actually being
* translated when your app first initialized. * translated when your app first initialized.
@ -97,9 +100,9 @@ export class AppComponent implements OnInit, OnDestroy
*/ */
/** /**
* ------------------------------------------------------------------ * ----------------------------------------------------------------------------------------------------
* ngxTranslate Fix End * ngxTranslate Fix End
* ------------------------------------------------------------------ * ----------------------------------------------------------------------------------------------------
*/ */
// Add is-mobile class to the body if the platform is mobile // Add is-mobile class to the body if the platform is mobile

1
src/app/app.theme.scss
View File

@ -63,6 +63,7 @@ $custom_palettes: (
// Force the input field font sizes to 16px // Force the input field font sizes to 16px
$typography: mat-typography-config( $typography: mat-typography-config(
$font-family: 'Muli, Helvetica Neue, Arial, sans-serif',
$input: mat-typography-level(16px, 1.125, 400) $input: mat-typography-level(16px, 1.125, 400)
); );

2
src/index.html
View File

@ -15,7 +15,7 @@
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="assets/icons/meteocons/style.css" rel="stylesheet"> <link href="assets/icons/meteocons/style.css" rel="stylesheet">
<link href="assets/icons/material-icons/outline/style.css" rel="stylesheet"> <link href="assets/icons/material-icons/outline/style.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Muli:300,400,600,700" rel="stylesheet">
<!-- FUSE Splash Screen CSS --> <!-- FUSE Splash Screen CSS -->
<style type="text/css"> <style type="text/css">