diff --git a/Twain.sln b/Twain.sln index 7683f26..03bed73 100644 --- a/Twain.sln +++ b/Twain.sln @@ -16,12 +16,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdownImport", "src\Modul EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenRameyTheme", "src\Themes\BenRameyTheme\BenRameyTheme.csproj", "{A7498019-5941-479B-ADB2-56B6C984C608}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OapTheme", "src\Themes\OapTheme\OapTheme.csproj", "{3B8C90D3-A50A-4184-A702-70185A4F870A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{C5891B30-F830-4094-A4D5-E2DB8D9ED819}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3DA05917-02EA-4B04-9C48-B86C77A73584}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TailwindTheme", "src\Themes\TailwindTheme\TailwindTheme.csproj", "{4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,10 +44,10 @@ Global {A7498019-5941-479B-ADB2-56B6C984C608}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7498019-5941-479B-ADB2-56B6C984C608}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7498019-5941-479B-ADB2-56B6C984C608}.Release|Any CPU.Build.0 = Release|Any CPU - {3B8C90D3-A50A-4184-A702-70185A4F870A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B8C90D3-A50A-4184-A702-70185A4F870A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B8C90D3-A50A-4184-A702-70185A4F870A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B8C90D3-A50A-4184-A702-70185A4F870A}.Release|Any CPU.Build.0 = Release|Any CPU + {4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -56,7 +56,7 @@ Global {97FFBB7D-C82D-47B2-B110-377B5F6B49C2} = {7C34E548-E385-4902-8A50-B7F49CABAC10} {7B0477DA-BCD5-47ED-8B88-76D046524434} = {3DA05917-02EA-4B04-9C48-B86C77A73584} {A7498019-5941-479B-ADB2-56B6C984C608} = {C5891B30-F830-4094-A4D5-E2DB8D9ED819} - {3B8C90D3-A50A-4184-A702-70185A4F870A} = {C5891B30-F830-4094-A4D5-E2DB8D9ED819} + {4BB167BD-2BC4-4DFB-B1E2-813EC2E2D8FF} = {C5891B30-F830-4094-A4D5-E2DB8D9ED819} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0F7F9D4C-DF95-43AF-9E9A-DA09B5EE03C7} diff --git a/src/Themes/OapTheme/Manifest.cs b/src/Themes/OapTheme/Manifest.cs deleted file mode 100644 index e3a48b0..0000000 --- a/src/Themes/OapTheme/Manifest.cs +++ /dev/null @@ -1,9 +0,0 @@ -using OrchardCore.DisplayManagement.Manifest; - -[assembly: Theme( - Name = "OAP Theme", - Author = "Ben Ramey", - Website = "https://oaprotection.org/", - Version = "0.0.1", - Description = "Theme for oaprotection.org" -)] diff --git a/src/Themes/OapTheme/Views/Layout.liquid b/src/Themes/OapTheme/Views/Layout.liquid deleted file mode 100644 index 4288b53..0000000 --- a/src/Themes/OapTheme/Views/Layout.liquid +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - {% page_title Site.SiteName, position: "before", separator: " - " %} - - {% resources type: "Meta" %} - - {% link type: "image/x-icon", rel: "shortcut icon", href: "~/OapTheme/assets/favicon.ico" %} - - {% style name: "oaptheme-styles" %} - - {% resources type: "HeadLink" %} - {% resources type: "Stylesheet" %} - {% resources type: "HeadScript" %} - - - -
- here is the header -
- -
- {% render_body %} -
- - - - {% resources type: "FootScript" %} - - - \ No newline at end of file diff --git a/src/Themes/OapTheme/.eslintrc.js b/src/Themes/TailwindTheme/.eslintrc.js similarity index 100% rename from src/Themes/OapTheme/.eslintrc.js rename to src/Themes/TailwindTheme/.eslintrc.js diff --git a/src/Themes/TailwindTheme/Manifest.cs b/src/Themes/TailwindTheme/Manifest.cs new file mode 100644 index 0000000..39e079a --- /dev/null +++ b/src/Themes/TailwindTheme/Manifest.cs @@ -0,0 +1,9 @@ +using OrchardCore.DisplayManagement.Manifest; + +[assembly: Theme( + Name = "TailwindTheme", + Author = "Ben Ramey", + Website = "https://benramey.com", + Version = "0.0.1", + Description = "Tailwind Theme" +)] diff --git a/src/Themes/OapTheme/ResourceManagementOptionsConfiguration.cs b/src/Themes/TailwindTheme/ResourceManagementOptionsConfiguration.cs similarity index 81% rename from src/Themes/OapTheme/ResourceManagementOptionsConfiguration.cs rename to src/Themes/TailwindTheme/ResourceManagementOptionsConfiguration.cs index eac3c88..2527a56 100644 --- a/src/Themes/OapTheme/ResourceManagementOptionsConfiguration.cs +++ b/src/Themes/TailwindTheme/ResourceManagementOptionsConfiguration.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Options; using OrchardCore.ResourceManagement; -namespace OapTheme; +namespace TailwindTheme; public class ResourceManagementOptionsConfiguration : IConfigureOptions { @@ -10,8 +10,8 @@ public class ResourceManagementOptionsConfiguration : IConfigureOptions + net8.0 - enable + true enable + enable diff --git a/src/Themes/TailwindTheme/Views/Layout.liquid b/src/Themes/TailwindTheme/Views/Layout.liquid new file mode 100644 index 0000000..623d7df --- /dev/null +++ b/src/Themes/TailwindTheme/Views/Layout.liquid @@ -0,0 +1,31 @@ + + + + + + + + {% page_title Site.SiteName, position: "before", separator: " - " %} + + {% resources type: "Meta" %} + + {% link type: "image/x-icon", rel: "shortcut icon", href: "~/TailwindTheme/assets/favicon.ico" %} + + {% style name: "tailwindtheme-styles" %} + + {% resources type: "HeadLink" %} + {% resources type: "Stylesheet" %} + {% resources type: "HeadScript" %} + + + + {% render_section "Header", required: false %} + + {% render_body %} + + {% render_section "Footer", required: false %} + + {% resources type: "FootScript" %} + + + \ No newline at end of file diff --git a/src/Themes/OapTheme/Views/Shared/NotFound.liquid b/src/Themes/TailwindTheme/Views/Shared/NotFound.liquid similarity index 100% rename from src/Themes/OapTheme/Views/Shared/NotFound.liquid rename to src/Themes/TailwindTheme/Views/Shared/NotFound.liquid diff --git a/src/Themes/OapTheme/package-lock.json b/src/Themes/TailwindTheme/package-lock.json similarity index 100% rename from src/Themes/OapTheme/package-lock.json rename to src/Themes/TailwindTheme/package-lock.json diff --git a/src/Themes/OapTheme/package.json b/src/Themes/TailwindTheme/package.json similarity index 100% rename from src/Themes/OapTheme/package.json rename to src/Themes/TailwindTheme/package.json diff --git a/src/Themes/OapTheme/postcss.config.js b/src/Themes/TailwindTheme/postcss.config.js similarity index 100% rename from src/Themes/OapTheme/postcss.config.js rename to src/Themes/TailwindTheme/postcss.config.js diff --git a/src/Themes/OapTheme/tailwind.config.js b/src/Themes/TailwindTheme/tailwind.config.js similarity index 100% rename from src/Themes/OapTheme/tailwind.config.js rename to src/Themes/TailwindTheme/tailwind.config.js diff --git a/src/Themes/OapTheme/webpack.config.js b/src/Themes/TailwindTheme/webpack.config.js similarity index 100% rename from src/Themes/OapTheme/webpack.config.js rename to src/Themes/TailwindTheme/webpack.config.js diff --git a/src/Themes/OapTheme/wwwroot/site.css b/src/Themes/TailwindTheme/wwwroot/site.css similarity index 73% rename from src/Themes/OapTheme/wwwroot/site.css rename to src/Themes/TailwindTheme/wwwroot/site.css index 924b414..0fa377e 100644 --- a/src/Themes/OapTheme/wwwroot/site.css +++ b/src/Themes/TailwindTheme/wwwroot/site.css @@ -1,3 +1,3 @@ /* ! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com -*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;tab-size:4}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}div.richtext a{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity));text-decoration-line:underline}div.richtext ol,div.richtext ul{margin-bottom:.5rem;margin-top:.5rem;padding-left:2rem}div.richtext ol li{list-style-type:decimal}div.richtext ol li,div.richtext ul li{margin-bottom:.25rem;margin-top:.25rem}div.richtext ul li{list-style-type:disc}div.richtext p{margin-bottom:1rem;margin-top:1rem}div.richtext .red{--tw-text-opacity:1;color:rgb(239 68 68/var(--tw-text-opacity))}span.field-validation-error{font-size:.875rem;line-height:1.25rem;--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity))}.mx-auto{margin-left:auto;margin-right:auto}.my-1{margin-bottom:.25rem;margin-top:.25rem}.flex{display:flex}.table{display:table}.hidden{display:none}.max-w-screen-md{max-width:768px}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.p-6{padding:1.5rem} \ No newline at end of file +*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;tab-size:4}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }div.richtext a{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity));text-decoration-line:underline}div.richtext ol,div.richtext ul{margin-bottom:.5rem;margin-top:.5rem;padding-left:2rem}div.richtext ol li{list-style-type:decimal}div.richtext ol li,div.richtext ul li{margin-bottom:.25rem;margin-top:.25rem}div.richtext ul li{list-style-type:disc}div.richtext p{margin-bottom:1rem;margin-top:1rem}div.richtext .red{--tw-text-opacity:1;color:rgb(239 68 68/var(--tw-text-opacity))}span.field-validation-error{font-size:.875rem;line-height:1.25rem;--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity))}.my-1{margin-bottom:.25rem;margin-top:.25rem}.table{display:table}.hidden{display:none} \ No newline at end of file diff --git a/src/Themes/OapTheme/wwwroot/site.js b/src/Themes/TailwindTheme/wwwroot/site.js similarity index 100% rename from src/Themes/OapTheme/wwwroot/site.js rename to src/Themes/TailwindTheme/wwwroot/site.js diff --git a/src/Twain.Web/Twain.Web.csproj b/src/Twain.Web/Twain.Web.csproj index 6451041..d6872d6 100644 --- a/src/Twain.Web/Twain.Web.csproj +++ b/src/Twain.Web/Twain.Web.csproj @@ -26,7 +26,7 @@ - +