Bundle css files

src/DragonFly.App.Client/wwwroot/index.html

@@ -6,9 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>DragonFly</title>
     <base href="/manager/" />
-    <link href="_content/DragonFly.Client/css/bootstrap_start.min.css" rel="stylesheet" />
-    <link href="_content/DragonFly.Client/css/app.css" rel="stylesheet" />
-    <link href="_content/DragonFly.Client/css/blockfield.css" rel="stylesheet" />
+    <link href="_content/DragonFly.Client/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="_content/DragonFly.Client/css/all.min.css" rel="stylesheet" />
     <link href="_content/DragonFly.Client/lib/font-awesome/css/all.min.css" rel="stylesheet" />
     <script src="_content/BlazorStrap/blazorstrap.js"></script>
     <script src="_content/DragonFly.Client/lib/tinymce/tinymce.min.js"></script>

src/DragonFly.Client/DragonFly.Client.csproj

@@ -22,6 +22,11 @@
 	  <Content Remove="libman.json" />
     <None Include="compilerconfig.json" />
     <None Include="libman.json" />
+    <None Include="wwwroot\css\app.scss" />
+    <None Include="wwwroot\css\asset-detail.scss" />
+    <None Include="wwwroot\css\blockfield.scss" />
+    <None Include="wwwroot\css\bootstrap.scss" />
+    <None Include="wwwroot\css\contentitem-list.scss" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -63,11 +68,4 @@
   <ItemGroup>
     <ProjectReference Include="..\DragonFly.Core\DragonFly.Core.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="wwwroot\js\" />
-    <Folder Include="wwwroot\lib\bootstrap\scss\" />
-    <Folder Include="wwwroot\lib\font-awesome\" />
-    <Folder Include="wwwroot\lib\tinymce\" />
-  </ItemGroup>
 </Project>

src/DragonFly.Client/compilerconfig.json

@@ -1,22 +1,10 @@
 [
   {
-    "outputFile": "wwwroot/css/contentdetail.css",
-    "inputFile": "wwwroot/css/contentdetail.scss"
+    "outputFile": "wwwroot/css/all.css",
+    "inputFile": "wwwroot/css/all.scss"
   },
   {
-    "outputFile": "wwwroot/css/app.css",
-    "inputFile": "wwwroot/css/app.scss"
-  },
-  {
-    "outputFile": "wwwroot/css/asset-detail.css",
-    "inputFile": "wwwroot/css/asset-detail.scss"
-  },
-  {
-    "outputFile": "wwwroot/css/bootstrap_start.css",
-    "inputFile": "wwwroot/css/bootstrap_start.scss"
-  },
-  {
-    "outputFile": "wwwroot/css/blockfield.css",
-    "inputFile": "wwwroot/css/blockfield.scss"
+    "outputFile": "wwwroot/css/bootstrap.css",
+    "inputFile": "wwwroot/css/bootstrap.scss"
   }
 ]

src/DragonFly.Client/libman.json

@@ -3,7 +3,7 @@
   "defaultProvider": "cdnjs",
   "libraries": [
     {
-      "library": "bootstrap@5.3.3",
+      "library": "bootstrap@5.1.3",
       "destination": "wwwroot/lib/bootstrap/"
     },
     {

src/DragonFly.Client/wwwroot/css/app.css → src/DragonFly.Client/wwwroot/css/all.css

@@ -1,24 +1,4 @@
-.contentitem-list {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-}
-
-.query-title {
-  margin-top: 1.5rem;
-}
-
-.query-title:first-child {
-  margin-top: 0px;
-}
-
-.asset-detail {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-}
-
-html {
+html {
   height: 100%;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
@@ -449,3 +429,146 @@ app {
 .tox-statusbar__branding {
   display: none;
 }
+
+.asset-detail {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+.add-button {
+  margin: 1rem 0;
+}
+
+.enum-dropdown {
+  margin-bottom: 1rem;
+  max-height: 20rem;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+block-field-view {
+  display: flex;
+  flex-direction: column;
+}
+
+.block-field {
+  display: flex;
+  flex-direction: column;
+  margin: 1rem 0px;
+}
+
+.block-field:hover .block-field-options {
+  visibility: visible;
+}
+
+.block-field .block-field-options {
+  display: flex;
+  gap: 0.25rem;
+  flex-grow: 0;
+  visibility: visible;
+  margin-bottom: 1rem;
+}
+
+.block-field .block-field-content {
+  flex-grow: 1;
+}
+
+.block-field-add-btn {
+  margin: 4px 0px;
+}
+
+.block-field .block-layout .column-content {
+  display: flex;
+  flex-direction: column;
+}
+
+.block-field .block-layout .column-content .column-action {
+  margin-bottom: 1rem;
+}
+
+.block-layout-add-column-btn {
+  height: 100%;
+}
+
+.block-label {
+  background-color: #767293;
+  color: #fff;
+  padding: 0.25rem 0.75rem;
+  display: flex;
+  align-items: center;
+}
+
+.container-block-body {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+
+.section-block-body {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+
+.column-action {
+  justify-content: center;
+}
+
+.alert-block-body {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+
+.grid-block {
+  display: flex;
+  flex-direction: column;
+}
+
+.grid-block-content {
+  flex: 1;
+  gap: 0.25rem;
+}
+
+.grid-item {
+  position: relative;
+  display: flex;
+  justify-content: stretch;
+  align-items: stretch;
+  border: 2px solid #ed604e;
+  background-color: #fff;
+}
+
+.grid-item .block {
+  flex: 1;
+  margin: 1rem;
+}
+
+.grid-item-label {
+  position: absolute;
+  background-color: #ed604e;
+  color: #fff;
+  padding: 2px 8px;
+}
+
+.grid-unit-value {
+  width: 4rem;
+  text-align: right;
+}
+
+.grid-span-item {
+  border: 2px solid #f5f5f5;
+  padding: 0.5rem;
+}
+
+.contentitem-list {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+.query-title {
+  margin-top: 1.5rem;
+}
+
+.query-title:first-child {
+  margin-top: 0px;
+}

src/DragonFly.Client/wwwroot/css/all.scss

@@ -0,0 +1,4 @@
+@import "app.scss";
+@import "asset-detail.scss";
+@import "blockfield.scss";
+@import "contentitem-list.scss";

src/DragonFly.Client/wwwroot/css/app.scss

@@ -1,7 +1,4 @@
-@import "contentitem-list.scss";
-@import "asset-detail.scss";
-
-html {
+html {
     height: 100%;
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
     font-size: 13px;