KCL-6857 Move less files into Styles directory, remove css files, add…

… compilation for less files
kontent-ai · May 27, 2021 · f9042c2 · f9042c2
1 parent d65e589
commit f9042c2
Show file tree

Hide file tree

Showing 26 changed files with 165 additions and 7,785 deletions.
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -19,6 +19,14 @@ jobs:
         dotnet-version: 5.0.x
     - name: Restore dependencies
       run: dotnet restore
+    - name: Install NPM dependencies and build *.less files
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+    - run: npm ci
+      working-directory: ./DancingGoat
+    - run: npm run build
+      working-directory: ./DancingGoat
     - name: Build
       run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
     - name: Test

diff --git a/.gitignore b/.gitignore
@@ -256,4 +256,10 @@ paket-files/
 # Cake folder
 reports/
 publish/
-Scripts/tools/
+Scripts/tools/
+
+# Ignore style build outputs
+DancingGoat/wwwroot/css/**/*.css
+DancingGoat/wwwroot/css/**/*.css.map
+DancingGoat/Styles/**/*.css
+DancingGoat/Styles/**/*.css.map
diff --git a/DancingGoat/Areas/Admin/Views/Shared/_Layout.cshtml b/DancingGoat/Areas/Admin/Views/Shared/_Layout.cshtml
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width" />
     <title>@ViewBag.Title</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,700,700i&amp;subset=latin-ext">
-    <link rel="stylesheet" href="@Url.Content("~/css/Admin/Admin.css")" type="text/css" />
+    <link rel="stylesheet" href="@Url.Content("~/css/admin.css")" type="text/css" />
     @RenderSection("headers", false)
 </head>
 <body>

diff --git a/DancingGoat/DancingGoat.csproj b/DancingGoat/DancingGoat.csproj
@@ -27,7 +27,6 @@
     <Folder Include="Areas\Admin\Views\SelfConfig\" />
     <Folder Include="Areas\Admin\Views\Shared\EditorTemplates\" />
     <Folder Include="Models\ContentTypes\" />
-    <Folder Include="wwwroot\css\admin\" />
     <Folder Include="wwwroot\images\Admin\" />
   </ItemGroup>
 

diff --git a/DancingGoat/wwwroot/css/admin/Admin.less → DancingGoat/Styles/admin/Admin.less b/DancingGoat/wwwroot/css/admin/Admin.less → DancingGoat/Styles/admin/Admin.less
@@ -284,22 +284,22 @@ textarea {
 
 .styled-checkbox > input[type="checkbox"] + span {
     #checkbox-radio;
-    background-image: url(../Images/checkbox-unchecked.svg);
+    background-image: url('/images/Admin/checkbox-unchecked.svg');
 }
 
 .styled-checkbox > input[type="checkbox"]:checked + span {
     #checkbox-radio;
-    background-image: url(../Images/checkbox-checked.svg);
+    background-image: url('/images/Admin/checkbox-checked.svg');
 }
 
 .styled-radio > input[type="radio"] + span {
     #checkbox-radio;
-    background-image: url(../Images/radio-button.svg);
+    background-image: url('/images/Admin/radio-button.svg');
 }
 
 .styled-radio > input[type="radio"]:checked + span {
     #checkbox-radio;
-    background-image: url(../Images/radio-button-checked.svg);
+    background-image: url('/images/Admin/radio-button-checked.svg');
 }
 
 .text-input-validation {

diff --git a/...ngGoat/wwwroot/css/admin/UserMessage.less → DancingGoat/Styles/admin/UserMessage.less b/...ngGoat/wwwroot/css/admin/UserMessage.less → DancingGoat/Styles/admin/UserMessage.less
diff --git a/DancingGoat/wwwroot/css/admin/variables.less → DancingGoat/Styles/admin/variables.less b/DancingGoat/wwwroot/css/admin/variables.less → DancingGoat/Styles/admin/variables.less
diff --git a/DancingGoat/wwwroot/css/Checkout.less → DancingGoat/Styles/site/Checkout.less b/DancingGoat/wwwroot/css/Checkout.less → DancingGoat/Styles/site/Checkout.less
diff --git a/DancingGoat/wwwroot/css/Controls.less → DancingGoat/Styles/site/Controls.less b/DancingGoat/wwwroot/css/Controls.less → DancingGoat/Styles/site/Controls.less
diff --git a/DancingGoat/wwwroot/css/EditMode.less → DancingGoat/Styles/site/EditMode.less b/DancingGoat/wwwroot/css/EditMode.less → DancingGoat/Styles/site/EditMode.less
diff --git a/DancingGoat/wwwroot/css/Fonts.less → DancingGoat/Styles/site/Fonts.less b/DancingGoat/wwwroot/css/Fonts.less → DancingGoat/Styles/site/Fonts.less
@@ -2,30 +2,30 @@
     font-family: 'PT Serif';
     font-style: normal;
     font-weight: 700;
-    src: local('PT Serif Bold'), local('PTSerif-Bold'), url(../Fonts/PTSerif-Bold.woff) format('woff');
+    src: local('PT Serif Bold'), local('PTSerif-Bold'), url('/fonts/PTSerif-Bold.woff') format('woff');
 }
 @font-face {
     font-family: 'Source Sans Pro';
     font-style: normal;
     font-weight: 300;
-    src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url(../Fonts/SourceSansPro-Light.woff) format('woff');
+    src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url('/fonts/SourceSansPro-Light.woff') format('woff');
 }
 @font-face {
     font-family: 'Source Sans Pro';
     font-style: normal;
     font-weight: 400;
-    src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(../Fonts/SourceSansPro-Regular.woff) format('woff');
+    src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('/fonts/SourceSansPro-Regular.woff') format('woff');
 }
 @font-face {
     font-family: 'Source Sans Pro';
     font-style: normal;
     font-weight: 700;
-    src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(../Fonts/SourceSansPro-Bold.woff) format('woff');
+    src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('/fonts/SourceSansPro-Bold.woff') format('woff');
 }
 @font-face {
   font-family: 'Core-icons';
-  src: url('../Fonts/Core-icons.eot');
-  src: url('../Fonts/Core-icons.svg#Core-icons') format('svg'), url('../Fonts/Core-icons.eot?#iefix') format('embedded-opentype'), url('../Fonts/Core-icons.woff') format('woff'), url('../Fonts/Core-icons.ttf') format('truetype');
+  src: url('/fonts/Core-icons.eot');
+  src: url('/fonts/Core-icons.svg#Core-icons') format('svg'), url('/fonts/Core-icons.eot?#iefix') format('embedded-opentype'), url('/fonts/Core-icons.woff') format('woff'), url('/fonts/Core-icons.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/DancingGoat/wwwroot/css/Gallery.less → DancingGoat/Styles/site/Gallery.less b/DancingGoat/wwwroot/css/Gallery.less → DancingGoat/Styles/site/Gallery.less
diff --git a/DancingGoat/wwwroot/css/Grid.less → DancingGoat/Styles/site/Grid.less b/DancingGoat/wwwroot/css/Grid.less → DancingGoat/Styles/site/Grid.less
diff --git a/DancingGoat/wwwroot/css/Menu.less → DancingGoat/Styles/site/Menu.less b/DancingGoat/wwwroot/css/Menu.less → DancingGoat/Styles/site/Menu.less
diff --git a/DancingGoat/wwwroot/css/Products.less → DancingGoat/Styles/site/Products.less b/DancingGoat/wwwroot/css/Products.less → DancingGoat/Styles/site/Products.less
diff --git a/DancingGoat/wwwroot/css/Site.less → DancingGoat/Styles/site/Site.less b/DancingGoat/wwwroot/css/Site.less → DancingGoat/Styles/site/Site.less
@@ -9,7 +9,7 @@
 @import "./Gallery.less";
 @import "./YourAccount.less";
 @import "./EditMode.less";
-@import "./admin/Admin.less";
+@import "../admin/UserMessage.less";
 
 /*# Page wrap #*/
 html, body {
@@ -640,12 +640,12 @@ footer {
     .search-box-btn {
         padding: .6rem 1rem;
         float: right;
-        background: url(../Images/icon-magnifier.png) no-repeat left;
+        background: url('/images/icon-magnifier.png') no-repeat left;
     }
 
     .search-box-btn:focus,
     .search-box-btn:hover {
-        background: #e5e5e5 url(../Images/icon-magnifier.png) no-repeat left;
+        background: #e5e5e5 url('/images/icon-magnifier.png') no-repeat left;
         float: right;
     }
 

diff --git a/DancingGoat/wwwroot/css/YourAccount.less → DancingGoat/Styles/site/YourAccount.less b/DancingGoat/wwwroot/css/YourAccount.less → DancingGoat/Styles/site/YourAccount.less
diff --git a/DancingGoat/wwwroot/css/icons-core.less → DancingGoat/Styles/site/icons-core.less b/DancingGoat/wwwroot/css/icons-core.less → DancingGoat/Styles/site/icons-core.less
diff --git a/DancingGoat/wwwroot/css/variables.less → DancingGoat/Styles/site/variables.less b/DancingGoat/wwwroot/css/variables.less → DancingGoat/Styles/site/variables.less