mirror of
				https://github.com/lingble/chatwoot.git
				synced 2025-10-31 19:17:48 +00:00 
			
		
		
		
	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
					Pranav Raj S
				
			
				
					committed by
					
						 Nithin David Thomas
						Nithin David Thomas
					
				
			
			
				
	
			
			
			 Nithin David Thomas
						Nithin David Thomas
					
				
			
						parent
						
							6c653e9ef3
						
					
				
				
					commit
					6e911e69f8
				
			| @@ -62,7 +62,7 @@ $black: #000000; | |||||||
| $white: #fff; | $white: #fff; | ||||||
| $body-background: $white; | $body-background: $white; | ||||||
| $body-font-color: $color-body; | $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; |   Roboto, "Helvetica Neue", Arial, sans-serif; | ||||||
| $body-antialiased: true; | $body-antialiased: true; | ||||||
| $global-margin: $space-one; | $global-margin: $space-one; | ||||||
| @@ -269,8 +269,8 @@ $button-margin: 0 0 $global-margin 0; | |||||||
| $button-fill: solid; | $button-fill: solid; | ||||||
| $button-background: $primary-color; | $button-background: $primary-color; | ||||||
| $button-background-hover: scale-color($button-background, $lightness: -15%); | $button-background-hover: scale-color($button-background, $lightness: -15%); | ||||||
| $button-color: $black; | $button-color: $white; | ||||||
| $button-color-alt: $black; | $button-color-alt: $white; | ||||||
| $button-radius: $global-radius; | $button-radius: $global-radius; | ||||||
| $button-sizes: ( | $button-sizes: ( | ||||||
|   tiny: $font-size-micro, |   tiny: $font-size-micro, | ||||||
|   | |||||||
| @@ -51,7 +51,6 @@ $color-background-light: #F9FAFC; | |||||||
| $color-white: #FFF; | $color-white: #FFF; | ||||||
| $color-body: #3C4858; | $color-body: #3C4858; | ||||||
| $color-heading: #1F2D3D; | $color-heading: #1F2D3D; | ||||||
| $color-modal-header: #f1f1f1; |  | ||||||
| $color-extra-light-blue: #F5F7F9; | $color-extra-light-blue: #F5F7F9; | ||||||
|  |  | ||||||
| // Thumbnail | // Thumbnail | ||||||
|   | |||||||
| @@ -1,3 +1,5 @@ | |||||||
|  | @import 'shared/assets/fonts/inter'; | ||||||
|  |  | ||||||
| @import 'variables'; | @import 'variables'; | ||||||
|  |  | ||||||
| @import '~spinkit/scss/spinners/7-three-bounce'; | @import '~spinkit/scss/spinners/7-three-bounce'; | ||||||
|   | |||||||
| @@ -17,6 +17,7 @@ | |||||||
|   overflow: scroll; |   overflow: scroll; | ||||||
|   position: relative; |   position: relative; | ||||||
|   background-color: $color-white; |   background-color: $color-white; | ||||||
|  |   border-radius: $space-small; | ||||||
|  |  | ||||||
|   .modal--close { |   .modal--close { | ||||||
|     font-size: $font-size-large; |     font-size: $font-size-large; | ||||||
| @@ -28,9 +29,7 @@ | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   .page-top-bar { |   .page-top-bar { | ||||||
|     background: $color-modal-header; |     @include padding($space-large $space-larger 0); | ||||||
|     text-align: center; |  | ||||||
|     @include padding($space-large $space-medium); |  | ||||||
|     img { |     img { | ||||||
|       max-height: 6rem; |       max-height: 6rem; | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -6,12 +6,12 @@ | |||||||
|       <span>{{ headerTitle }}</span> |       <span>{{ headerTitle }}</span> | ||||||
|     </h1> |     </h1> | ||||||
|     <router-link |     <router-link | ||||||
|       :to="buttonRoute" |  | ||||||
|       class="button icon success" |  | ||||||
|       v-if="showNewButton && showButton && currentRole" |       v-if="showNewButton && showButton && currentRole" | ||||||
|  |       :to="buttonRoute" | ||||||
|  |       class="button icon success nice" | ||||||
|     > |     > | ||||||
|       <i class="icon ion-android-add-circle"></i> |       <i class="icon ion-android-add-circle"></i> | ||||||
|       {{buttonText}} |       {{ buttonText }} | ||||||
|     </router-link> |     </router-link> | ||||||
|   </div> |   </div> | ||||||
| </template> | </template> | ||||||
| @@ -20,6 +20,9 @@ import BackButton from '../../../components/widgets/BackButton'; | |||||||
| import Auth from '../../../api/auth'; | import Auth from '../../../api/auth'; | ||||||
|  |  | ||||||
| export default { | export default { | ||||||
|  |   components: { | ||||||
|  |     BackButton, | ||||||
|  |   }, | ||||||
|   props: { |   props: { | ||||||
|     headerTitle: String, |     headerTitle: String, | ||||||
|     buttonRoute: String, |     buttonRoute: String, | ||||||
| @@ -43,8 +46,5 @@ export default { | |||||||
|       return role === 'administrator'; |       return role === 'administrator'; | ||||||
|     }, |     }, | ||||||
|   }, |   }, | ||||||
|   components: { |  | ||||||
|     BackButton, |  | ||||||
|   }, |  | ||||||
| }; | }; | ||||||
| </script> | </script> | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Bold.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Bold.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Bold.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Bold.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Italic.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Italic.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Italic.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Italic.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Light-BETA.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Light-BETA.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Light-BETA.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Light-BETA.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Medium.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Medium.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Medium.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Medium.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Regular.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Regular.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Regular.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Regular.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-SemiBold.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-SemiBold.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-SemiBold.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-SemiBold.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Thin-BETA.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Thin-BETA.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Thin-BETA.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/javascript/shared/assets/fonts/Inter-Thin-BETA.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										62
									
								
								app/javascript/shared/assets/fonts/inter.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										62
									
								
								app/javascript/shared/assets/fonts/inter.scss
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,62 @@ | |||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: normal; | ||||||
|  |   font-weight: 100; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-Thin-BETA.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-Thin-BETA.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: normal; | ||||||
|  |   font-weight: 300; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-Light-BETA.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-Light-BETA.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: normal; | ||||||
|  |   font-weight: 400; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-Regular.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-Regular.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: italic; | ||||||
|  |   font-weight: 400; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-Italic.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-Italic.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: normal; | ||||||
|  |   font-weight: 500; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-Medium.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-Medium.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: normal; | ||||||
|  |   font-weight: 600; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-SemiBold.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-SemiBold.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @font-face { | ||||||
|  |   font-family: 'Inter'; | ||||||
|  |   font-style: normal; | ||||||
|  |   font-weight: 700; | ||||||
|  |   font-display: swap; | ||||||
|  |   src: url('~shared/assets/fonts/Inter-Bold.woff2?v=3.11') format('woff2'), | ||||||
|  |        url('~shared/assets/fonts/Inter-Bold.woff?v=3.11') format('woff'); | ||||||
|  | } | ||||||
| @@ -13,6 +13,7 @@ $input-height: $space-two * 2; | |||||||
|   box-sizing: border-box; |   box-sizing: border-box; | ||||||
|   color: $color-body; |   color: $color-body; | ||||||
|   display: block; |   display: block; | ||||||
|  |   font-family: $font-family; | ||||||
|   font-size: $font-size-default; |   font-size: $font-size-default; | ||||||
|   height: $input-height; |   height: $input-height; | ||||||
|   line-height: 1.3; |   line-height: 1.3; | ||||||
|   | |||||||
| @@ -21,7 +21,6 @@ time, mark, audio, video { | |||||||
|   padding: 0; |   padding: 0; | ||||||
|   border: 0; |   border: 0; | ||||||
|   font-size: 100%; |   font-size: 100%; | ||||||
|   font: inherit; |  | ||||||
|   vertical-align: baseline; |   vertical-align: baseline; | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -57,7 +57,6 @@ $color-background-light: #fafafa; | |||||||
| $color-white: #fff; | $color-white: #fff; | ||||||
| $color-body: #3c4858; | $color-body: #3c4858; | ||||||
| $color-heading: #1f2d3d; | $color-heading: #1f2d3d; | ||||||
| $color-modal-header: #f1f1f1; |  | ||||||
| // Thumbnail | // Thumbnail | ||||||
| $thumbnail-radius: 4rem; | $thumbnail-radius: 4rem; | ||||||
|  |  | ||||||
| @@ -88,3 +87,5 @@ $border-radius: 3px; | |||||||
| $line-height: 1; | $line-height: 1; | ||||||
| $footer-height: 11.2rem; | $footer-height: 11.2rem; | ||||||
| $header-expanded-height: $space-medium * 10; | $header-expanded-height: $space-medium * 10; | ||||||
|  |  | ||||||
|  | $font-family: 'Inter', -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; | ||||||
|   | |||||||
| @@ -3,10 +3,11 @@ | |||||||
| @import 'buttons'; | @import 'buttons'; | ||||||
| @import 'mixins'; | @import 'mixins'; | ||||||
| @import 'forms'; | @import 'forms'; | ||||||
|  | @import 'shared/assets/fonts/inter'; | ||||||
|  |  | ||||||
| html, | html, | ||||||
| body { | body { | ||||||
|   font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; |   font-family: $font-family; | ||||||
|   font-size: 10px; |   font-size: 10px; | ||||||
|   height: 100%; |   height: 100%; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -39,6 +39,7 @@ export default { | |||||||
|  |  | ||||||
|   .title { |   .title { | ||||||
|     font-size: $font-size-big; |     font-size: $font-size-big; | ||||||
|  |     font-weight: $font-weight-medium; | ||||||
|   } |   } | ||||||
| } | } | ||||||
| </style> | </style> | ||||||
|   | |||||||
| @@ -47,6 +47,7 @@ export default { | |||||||
|  |  | ||||||
|   .title { |   .title { | ||||||
|     font-size: $font-size-mega; |     font-size: $font-size-mega; | ||||||
|  |     font-weight: $font-weight-medium; | ||||||
|     margin-bottom: $space-two; |     margin-bottom: $space-two; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user