minor(netlogo): fix merge conflics in main.scss

omargfh · omargfh · commit ebe2ef102ab0 · 2026-03-25T15:10:18.000-05:00
diff --git a/apps/netlogo/app/assets/styles/main.scss b/apps/netlogo/app/assets/styles/main.scss
@@ -8,6 +8,7 @@
 
 @layer website {
   @include meta.load-css("@repo/tailwind-config/scss/normalize.scss");
+  @include meta.load-css("@repo/tailwind-config/scss/netlogo-theme.scss");
 
   h1,
   h2,
@@ -16,7 +17,6 @@
   h5 {
     margin-bottom: 0;
   }
-  // @include meta.load-css('@repo/tailwind-config/scss/docs-theme.scss');
 }
 
 @include meta.load-css("@repo/vue-ui/styles.scss");
@@ -67,3 +67,5 @@
     }
   }
 }
+
+@include meta.load-css("@repo/vue-ui/styles.scss");

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`@layer website {`
`10`	`10`	`@include meta.load-css("@repo/tailwind-config/scss/normalize.scss");`
	`11`	`+ @include meta.load-css("@repo/tailwind-config/scss/netlogo-theme.scss");`
`11`	`12`
`12`	`13`	`h1,`
`13`	`14`	`h2,`
`@@ -16,7 +17,6 @@`
`16`	`17`	`h5 {`
`17`	`18`	`margin-bottom: 0;`
`18`	`19`	`}`
`19`		`- // @include meta.load-css('@repo/tailwind-config/scss/docs-theme.scss');`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@include meta.load-css("@repo/vue-ui/styles.scss");`
`@@ -67,3 +67,5 @@`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+@include meta.load-css("@repo/vue-ui/styles.scss");`