Update font family to make design consistent in all platforms (#318)

* Add inter font, remove modal header bg

* Remove unnecessary font files

* Fix codeclimate issues, remove letter-spacing attribute
This commit is contained in:
Pranav Raj S
2019-11-28 11:03:01 +05:30
committed by Nithin David Thomas
parent 6c653e9ef3
commit 6e911e69f8
26 changed files with 82 additions and 16 deletions

View File

@@ -62,7 +62,7 @@ $black: #000000;
$white: #fff;
$body-background: $white;
$body-font-color: $color-body;
$body-font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI",
$body-font-family: 'Inter', -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI",
Roboto, "Helvetica Neue", Arial, sans-serif;
$body-antialiased: true;
$global-margin: $space-one;
@@ -269,8 +269,8 @@ $button-margin: 0 0 $global-margin 0;
$button-fill: solid;
$button-background: $primary-color;
$button-background-hover: scale-color($button-background, $lightness: -15%);
$button-color: $black;
$button-color-alt: $black;
$button-color: $white;
$button-color-alt: $white;
$button-radius: $global-radius;
$button-sizes: (
tiny: $font-size-micro,

View File

@@ -51,7 +51,6 @@ $color-background-light: #F9FAFC;
$color-white: #FFF;
$color-body: #3C4858;
$color-heading: #1F2D3D;
$color-modal-header: #f1f1f1;
$color-extra-light-blue: #F5F7F9;
// Thumbnail

View File

@@ -1,3 +1,5 @@
@import 'shared/assets/fonts/inter';
@import 'variables';
@import '~spinkit/scss/spinners/7-three-bounce';

View File

@@ -17,6 +17,7 @@
overflow: scroll;
position: relative;
background-color: $color-white;
border-radius: $space-small;
.modal--close {
font-size: $font-size-large;
@@ -28,9 +29,7 @@
}
.page-top-bar {
background: $color-modal-header;
text-align: center;
@include padding($space-large $space-medium);
@include padding($space-large $space-larger 0);
img {
max-height: 6rem;
}

View File

@@ -6,12 +6,12 @@
<span>{{ headerTitle }}</span>
</h1>
<router-link
:to="buttonRoute"
class="button icon success"
v-if="showNewButton && showButton && currentRole"
:to="buttonRoute"
class="button icon success nice"
>
<i class="icon ion-android-add-circle"></i>
{{buttonText}}
{{ buttonText }}
</router-link>
</div>
</template>
@@ -20,6 +20,9 @@ import BackButton from '../../../components/widgets/BackButton';
import Auth from '../../../api/auth';
export default {
components: {
BackButton,
},
props: {
headerTitle: String,
buttonRoute: String,
@@ -43,8 +46,5 @@ export default {
return role === 'administrator';
},
},
components: {
BackButton,
},
};
</script>