Fix sass error and less error

athif23 · Sep 26, 2019 · dfd61f7 · dfd61f7
1 parent 95bdfee
commit dfd61f7
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 43 deletions.
diff --git a/src/templates/base-source-template/less/source/index.html b/src/templates/base-source-template/less/source/index.html
@@ -6,31 +6,6 @@
 
 		<title>Start Imba</title>
 		<link rel="stylesheet" href="index.less" />
-		<style>
-			:root {
-				--header-font: 'Black Han Sans', sans-serif;
-				--copy-font: 'Gothic A1', sans-serif;
-				--code-font: 'Inconsolata', monospace;
-			}
-
-			* {
-				margin: 0;
-				padding: 0;
-			}
-
-			h1,h2,h3,h4,h5,h6 {
-				font-family: var(--header-font);
-			}
-
-			body {
-				font-family: var(--copy-font);
-				font-weight: regular;
-			}
-
-			code {
-				font-family: var(--code-font);
-			}
-		</style>
 	</head>
 	<body>
 		<script src="./index.imba"></script>

diff --git a/src/templates/base-source-template/less/source/index.less b/src/templates/base-source-template/less/source/index.less
@@ -1,3 +1,36 @@
 @import "./components/app";
 
-@import "https://fonts.googleapis.com/css?family=Gothic+A1:400,700|Black+Han+Sans|Inconsolata:700";
+@font-face {
+	font-family: 'Black Han Sans';
+	font-weight: 700;
+	src: local('Black Han Sans Regular'), local('BlackHanSans-Regular'), url(https://fonts.gstatic.com/s/blackhansans/v8/ea8Aad44WunzF9a-dL6toA8r8nqQSWKmEJKy1nK6J8sYUGdTBHS2osQ.2.woff2) format('woff2');
+}
+@font-face {
+	font-family: 'Inconsolata';
+	font-weight: 700;
+	src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url(https://fonts.gstatic.com/s/inconsolata/v18/QldXNThLqRwH-OJ1UHjlKGHiw71p5_w.woff2) format('woff2');
+}
+@font-face {
+	font-family: 'Gothic A1';
+	font-weight: 400;
+	src: local('Gothic A1 Regular'), local('GothicA1-Regular'), url(https://fonts.gstatic.com/s/gothica1/v8/CSR94z5ZnPydRjlCCwl6aaU4Qt0V05ZAcgT3T1VKO2vL6LbP.0.woff2) format('woff2');
+}
+&:root {
+	--header-font: 'Black Han Sans', sans-serif;
+	--copy-font: 'Gothic A1', sans-serif;
+	--code-font: 'Inconsolata', monospace;
+}
+* {
+	margin: 0;
+	padding: 0;
+}
+h1 {
+	font-family: var(--header-font);
+}
+body {
+	font-family: var(--copy-font);
+	font-weight: regular;
+}
+code {
+	font-family: var(--code-font);
+}
diff --git a/src/templates/base-source-template/sass/source/components/app.sass b/src/templates/base-source-template/sass/source/components/app.sass
@@ -2,24 +2,24 @@
 	width: 100%
 
 	.header
-	width: 100%
-	background: #000
-	color: #fff
-	display: flex
-	justify-content: center
-	align-items: center
-	flex-direction: column
-	padding: 60px 0
+		width: 100%
+		background: #000
+		color: #fff
+		display: flex
+		justify-content: center
+		align-items: center
+		flex-direction: column
+		padding: 60px 0
 
-		.title 
-			font-size: 20px
-			border: 4px solid white
-			font-weight: 500
-			padding: 7px 15px
-			text-align: center
-			border-radius: 10px
-			letter-spacing: 5px
-			margin: 0
+			.title 
+				font-size: 20px
+				border: 4px solid white
+				font-weight: 500
+				padding: 7px 15px
+				text-align: center
+				border-radius: 10px
+				letter-spacing: 5px
+				margin: 0
 
 	.content
 		display: flex