Use webpack to compile CSS

p2pu · Feb 1, 2023 · 123b7d7 · 123b7d7
1 parent bf253b9
commit 123b7d7
Show file tree

Hide file tree

Showing 27 changed files with 2,086 additions and 2,890 deletions.
diff --git a/_includes/head.html b/_includes/head.html
@@ -42,7 +42,9 @@
 
     <!-- Custom CSS -->
 
-    <link rel="stylesheet" href="{{site.baseurl}}/assets/css/p2pu-custom.css">
+    <link rel="stylesheet" href="{{site.data.bundles['p2pu-theme']['css']}}" />
+    <link rel="stylesheet" href="{{site.data.bundles['common']['css']}}" />
+    <link rel="stylesheet" href="{{site.data.bundles['navbar']['css']}}" />
 
     {% if layout.extra_css %}
         {% for css in layout.extra_css %}
@@ -56,6 +58,11 @@
         {% endfor %}
     {% endif %}
 
+    {% for bundle in layout.bundles %}
+      <link rel="stylesheet" href="{{site.data.bundles[bundle]['css']}}" />
+    {% endfor %}
+
+
     <link rel="shortcut icon" type="image/png" href="{{site.baseurl}}/assets/images/favicon.png">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->

diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -2,8 +2,6 @@
   src="https://code.jquery.com/jquery-3.3.1.min.js"
   integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
   crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
 
 <script src="{{site.baseurl}}/assets/js/modal-backdrop.js"></script>
 

diff --git a/_sass/_about.scss → assets/css/_about.scss b/_sass/_about.scss → assets/css/_about.scss
diff --git a/_sass/_common.scss → assets/css/_common.scss b/_sass/_common.scss → assets/css/_common.scss
@@ -3,7 +3,7 @@
 	font-size: $font-size-lg;
 }
 .composition{
-	background: url("/assets/images/bg-composition.png") repeat;
+	background: url("../images/bg-composition.png") repeat;
 }
 .img-fluid{
 	height: auto;

diff --git a/_sass/_courses.scss → assets/css/_courses.scss b/_sass/_courses.scss → assets/css/_courses.scss
diff --git a/_sass/_donate.scss → assets/css/_donate.scss b/_sass/_donate.scss → assets/css/_donate.scss
diff --git a/_sass/_events.scss → assets/css/_events.scss b/_sass/_events.scss → assets/css/_events.scss
diff --git a/_sass/_handbook.scss → assets/css/_handbook.scss b/_sass/_handbook.scss → assets/css/_handbook.scss
diff --git a/_sass/_help.scss → assets/css/_help.scss b/_sass/_help.scss → assets/css/_help.scss
diff --git a/_sass/_index.scss → assets/css/_index.scss b/_sass/_index.scss → assets/css/_index.scss
diff --git a/_sass/_learning-circles.scss → assets/css/_learning-circles.scss b/_sass/_learning-circles.scss → assets/css/_learning-circles.scss
diff --git a/_sass/_organizer_profile.scss → assets/css/_organizer_profile.scss b/_sass/_organizer_profile.scss → assets/css/_organizer_profile.scss
diff --git a/_sass/_search.scss → assets/css/_search.scss b/_sass/_search.scss → assets/css/_search.scss
diff --git a/_sass/_services.scss → assets/css/_services.scss b/_sass/_services.scss → assets/css/_services.scss
@@ -15,11 +15,11 @@
 		}
 	}
 	section.contact{
-		background: url("/assets/images/bg-composition.png") repeat;
+		background: url("../images/bg-composition.png") repeat;
 		.container{
 			.contact-form{
 				background-color: #DBF5EE; 
 			}
 		}
 	}
-}
+}
diff --git a/_sass/_team.scss → assets/css/_team.scss b/_sass/_team.scss → assets/css/_team.scss
diff --git a/_sass/_teams.scss → assets/css/_teams.scss b/_sass/_teams.scss → assets/css/_teams.scss
diff --git a/_sass/_topics.scss → assets/css/_topics.scss b/_sass/_topics.scss → assets/css/_topics.scss
@@ -5,7 +5,7 @@
 #topic {
   .header-wrap{
     @include media-breakpoint-up(md) {
-      background: url(/assets/images/topics/topic-detail-bg.png) no-repeat center right $p2pu-light-yellow;
+      background: url(../images/topics/topic-detail-bg.png) no-repeat center right $p2pu-light-yellow;
       background-size: contain !important;
       background-position: 50vw center;
     }

diff --git a/_sass/layout-elements/_contact-form.scss → ...ts/css/layout-elements/_contact-form.scss b/_sass/layout-elements/_contact-form.scss → ...ts/css/layout-elements/_contact-form.scss
diff --git a/_sass/layout-elements/_dot-block.scss → assets/css/layout-elements/_dot-block.scss b/_sass/layout-elements/_dot-block.scss → assets/css/layout-elements/_dot-block.scss
diff --git a/_sass/layout-elements/_sidebar.scss → assets/css/layout-elements/_sidebar.scss b/_sass/layout-elements/_sidebar.scss → assets/css/layout-elements/_sidebar.scss
diff --git a/_sass/layout-elements/_slider.scss → assets/css/layout-elements/_slider.scss b/_sass/layout-elements/_slider.scss → assets/css/layout-elements/_slider.scss
diff --git a/assets/css/p2pu-custom.scss b/assets/css/p2pu-custom.scss
@@ -1,6 +1,3 @@
----
----
-
 @import "p2pu-theme/src/scss/base";
 @import "p2pu-theme/src/scss/accordion";
 @import "p2pu-theme/src/scss/cards/generic-card";

diff --git a/assets/react/p2pu-theme.js b/assets/react/p2pu-theme.js
@@ -1,7 +1,12 @@
 //import "p2pu-theme/src/js/base.js";
-import "p2pu-theme/src/js/accordion.js";
+
+//import "p2pu-theme/src/js/accordion.js";
 
 import 'material-icons/iconfont/filled.scss';
 import '@fortawesome/fontawesome-free/css/brands';
 import '@fortawesome/fontawesome-free/css/solid';
 import '@fortawesome/fontawesome-free/css/fontawesome';
+
+import "../css/p2pu-custom.scss";
+
+import { Collapse } from 'bootstrap'
diff --git a/p2pu-theme b/p2pu-theme