cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-10 19:01:05 +03:30
Code Issues Packages Projects Releases Wiki Activity

font family font size

Browse Source
This commit is contained in:
shokouhi
2020-07-08 11:18:59 +04:30
parent 7bc2190254
commit 6b624d3e63
8 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/components/modal/testresult/Show.vue
+12 -7
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs>
<material-card color="black" title="Show Test Result" id="printMe">
<v-layout align-left justify-left wrap class="px-5 my-3 ShowTestResult">
<h4 class="ml-3 headline font-weight-bold">Test Type : {{ data.test_type.name }}</h4>
<h4 class="ml-4 headline font-weight-bold">Test Type : {{ data.test_type.name }}</h4>
<v-flex xs12>
<hr class="v-divider theme--light" />
</v-flex>
@@ -67,7 +67,7 @@
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h4 class="ml-3 headline font-weight-bold">Special Info</h4>
<h4 class="ml-4 headline font-weight-bold">Special Info</h4>
<v-flex xs12>
<hr class="v-divider theme--light" />
</v-flex>
@@ -107,13 +107,13 @@
<template v-if="data.children">
<v-layout row wrap class="WM-Width-Full">
<v-flex class="mt-4 pb-4" style="border-left:3px solid #32c5d2;border-bottom:1px solid #ddd"
xs3
md6
sm6
xs12
md12
sm12
v-for="(formData, keyForm) in data.children"
:key="keyForm"
>
<h4 class="ml-3 headline font-weight-bold">{{keyForm}}</h4>
<h4 class="ml-4 headline font-weight-bold">{{keyForm}}</h4>
<v-layout row wrap>
<v-layout row wrap v-for="(childData, keyChild) in formData" :key="keyChild">
<v-flex
@@ -142,7 +142,7 @@
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h4 class="ml-3 headline font-weight-bold">Image</h4>
<h4 class="ml-4 headline font-weight-bold">Image</h4>
<v-flex xs12>
<hr class="v-divider theme--light" />
</v-flex>
@@ -278,6 +278,11 @@ export default {
};
</script>
<style media="screen">
@media screen and (max-width: 1536px) {
.headline {
font-size: 1rem !important;
}
}
@media screen and (max-width : 500px) {
.ShowTestResult .WM-Outline-Btn {
text-align: center;
resources/js/vue/styles/css/Assets/Main.scss
Vendored
+17 -20
View File
@@ -1,7 +1,13 @@
@font-face {
font-family: 'Montserrat-Regular';
font-style: normal;
font-weight: 100;
src: url('../../fonts/Montserrat-Regular.ttf') format('truetype');
}
@font-face {
font-family: 'Montserrat-Medium';
font-style: normal;
font-weight: bold;
font-weight: medium;
src: url('../../fonts/Montserrat-Medium.ttf') format('truetype');
}
@font-face {
@@ -10,19 +16,17 @@
font-weight: bold;
src: url('../../fonts/Montserrat-Bold.ttf') format('truetype');
}
// @font-face {
// font-family: 'Montserrat-Regular';
// font-style: normal;
// font-weight: 400;
// src: url('../fonts/Montserrat-Regular.ttf') format('truetype');
// }
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4,.title,.display-1 {
font-family: 'Montserrat-Regular' !important;
}
.headline {
font-family: 'Montserrat-Medium';
}
.application {
font-family: 'Montserrat-Regular';
}
// @font-face {
// font-family: 'Montserrat-Thin';
// font-style: normal;
// font-weight: 200;
// src: url('../fonts/Montserrat-Thin.ttf') format('truetype');
// }
.theme--light.v-card.WM-TransparentCard {
background-color: transparent !important;
border-color: transparent !important;
@@ -100,9 +104,6 @@
.WM-LightGray-color {
color: rgba(33,33,33,.7)
}
// .WM-Color-LightGrey {
// background-color : #F5F5F5;
// }
.WM-Outline-Btn {
padding: 8px;
background:transparent !important;
@@ -119,12 +120,9 @@
box-shadow: none !important;
}
.inputfile {
// width: 0.1px;
// height: 0.1px;
opacity: 0;
overflow: hidden;
position: absolute;
// z-index: -1;
}
.inputfile + label {
font-size: 16px;
@@ -283,7 +281,6 @@ td.FlexBtn .theme--light.v-btn {
min-width: 30px;
padding: 15px 10px;
margin-right: 1 !important;
}
td.FlexBtn a.LinkBtn .theme--light.v-btn {
padding: 9px 10px;
resources/js/vue/styles/fonts/Montserrat-Light.ttf
BIN
View File
Binary file not shown.
resources/js/vue/styles/fonts/Montserrat-Regular.ttf
BIN
View File
Binary file not shown.
resources/js/vue/views/TestResult/List.vue
+9
View File
@@ -420,6 +420,15 @@ export default {
}
.v-btn--floating, .v-btn--icon:before {
border-radius: 50%!important;
}
/* --------------------------------------------------------
Tables :: Begin
-------------------------------------------------------- */
@media screen and (max-width: 1536px) {
.v-card .title {
font-size: 0.9rem !important;
}
}
/* .FlexBtn {
display: flex;
resources/sass/_variables.scss
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
$body-bg: #f8fafc;
// Typography
$font-family-sans-serif: "Nunito", sans-serif;
// $font-family-sans-serif: "Nunito", sans-serif;
$font-size-base: 0.9rem;
$line-height-base: 1.6;
resources/views/showMaster.blade.php
+1 -1
View File
@@ -14,7 +14,7 @@
html, body {
background-color: #fff;
color: #636b6f;
font-family: 'Nunito', sans-serif;
/* font-family: 'Nunito', sans-serif; */
font-weight: 200;
height: 100vh;
margin: 0;
resources/views/welcome.blade.php
+1 -1
View File
@@ -14,7 +14,7 @@
html, body {
background-color: #fff;
color: #636b6f;
font-family: 'Nunito', sans-serif;
/* font-family: 'Nunito', sans-serif; */
font-weight: 200;
height: 100vh;
margin: 0;