Merge pull request #130 from ripcurlx/compress-css

Use SASS pipeline to compress and merge css files
bisq-network · Feb 26, 2019 · eebe578 · eebe578
2 parents 31ce788 + a2bd055
commit eebe578
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,4 +5,5 @@ gem 'jekyll-livereload'
 gem 'jekyll-redirect-from'
 gem 'jekyll-feed'
 gem 'jekyll-sitemap'
-gem 'jekyll-paginate'
+gem 'jekyll-paginate'
+gem 'jekyll-sass-converter'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -67,7 +67,8 @@ DEPENDENCIES
   jekyll-livereload
   jekyll-paginate
   jekyll-redirect-from
+  jekyll-sass-converter
   jekyll-sitemap
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/_config.yml b/_config.yml
@@ -20,3 +20,5 @@ paginate: 10
 paginate_path: "/blog/page/:num/"
 client_version: "0.9.4"
 description: "Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative crypto currencies."
+sass:
+  style: compressed
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -26,8 +26,7 @@
 
         <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Sans:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
         <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
-        <link href="{{ site.url }}/css/bootstrap.css" rel="stylesheet">
-        <link href="{{ site.url }}/css/styles.css" rel="stylesheet">
+        <link href="{{ '/css/styles.css' | relative_url }}" rel="stylesheet">
 
         <link rel="apple-touch-icon" sizes="180x180" href="{{ site.url }}/images/apple-touch-icon.png">
         <link rel="icon" type="image/png" sizes="32x32" href="{{ site.url }}/images/bisq-fav.png">

diff --git a/_layouts/post-report.html b/_layouts/post-report.html
@@ -36,8 +36,7 @@ <h1 class="float-left display-1">{{ page.title }}</h1>
       <div id="report-content">
         {{ content }}
 
-
-        <link href="{{ site.url }}/css/chosen.css" rel="stylesheet">
+        <link href="{{ '/css/chosen.css' | relative_url }}" rel="stylesheet">
 
         <script defer src="{{ site.url }}/js/highstock.js"></script>
         <script defer src="{{ site.url }}/js/drag-panes.js"></script>

diff --git a/css/bootstrap-grid.css → _sass/bootstrap-grid.scss b/css/bootstrap-grid.css → _sass/bootstrap-grid.scss
@@ -1,3 +1,4 @@
+
 /*!
  * Bootstrap Grid v4.1.0 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
@@ -1909,4 +1910,4 @@ html {
     align-self: stretch !important;
   }
 }
-/*# sourceMappingURL=bootstrap-grid.css.map */
+/*# sourceMappingURL=bootstrap-grid.css.map */
diff --git a/css/bootstrap-reboot.css → _sass/bootstrap-reboot.scss b/css/bootstrap-reboot.css → _sass/bootstrap-reboot.scss
@@ -327,4 +327,4 @@ template {
 [hidden] {
   display: none !important;
 }
-/*# sourceMappingURL=bootstrap-reboot.css.map */
+/*# sourceMappingURL=bootstrap-reboot.css.map */
diff --git a/css/bootstrap.css → _sass/bootstrap.scss b/css/bootstrap.css → _sass/bootstrap.scss
@@ -9026,4 +9026,4 @@ a.text-dark:hover, a.text-dark:focus {
     color: inherit;
     border-color: #dee2e6;
   }
-}
+}
diff --git a/css/bootstrap-grid.min.css b/css/bootstrap-grid.min.css
diff --git a/css/bootstrap-reboot.min.css b/css/bootstrap-reboot.min.css
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/chosen.css → css/chosen.scss b/css/chosen.css → css/chosen.scss
@@ -1,3 +1,8 @@
+---
+# this ensures Jekyll reads the file to be transformed into CSS later
+# only Main files contain this front matter, not partials.
+---
+
 /*!
 Chosen, a Select Box Enhancer for jQuery and Prototype
 by Patrick Filler for Harvest, http://getharvest.com

diff --git a/css/styles.css → css/styles.scss b/css/styles.css → css/styles.scss
@@ -1,3 +1,10 @@
+---
+# this ensures Jekyll reads the file to be transformed into CSS later
+# only Main files contain this front matter, not partials.
+---
+
+@import "bootstrap";
+
 body {
   font-family: 'IBM Plex Sans', sans-serif;
   overflow-x: hidden;

diff --git a/markets.html b/markets.html
@@ -4,7 +4,7 @@
 ---
 <!-- <h1>Bisq Markets</h1> -->
 
-<link href="{{ site.url }}/css/chosen.css" rel="stylesheet">
+<link href="{{ '/css/chosen.css' | relative_url }}" rel="stylesheet">
 
 <script defer src="{{ site.url }}/js/highstock.js"></script>
 <script defer src="{{ site.url }}/js/drag-panes.js"></script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9026,4 +9026,4 @@ a.text-dark:hover, a.text-dark:focus { @@
         color: inherit;
         border-color: #dee2e6;
       }
-    }
+    }