Merge pull request #358 from dorthl/mian

svg assets fix
blogifierdotnet · Aug 4, 2023 · 9771d81 · 9771d81
2 parents 14135c9 + 5ed7d0e
commit 9771d81
Show file tree

Hide file tree

Showing 28 changed files with 90 additions and 175 deletions.
diff --git a/src/Blogifier.Admin/Blogifier.Admin.csproj b/src/Blogifier.Admin/Blogifier.Admin.csproj
@@ -82,4 +82,5 @@
       <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
     </DefineStaticWebAssets>
   </Target>
+
 </Project>
diff --git a/src/Blogifier.Admin/assets/gulpfile.mjs b/src/Blogifier.Admin/assets/gulpfile.mjs
@@ -160,7 +160,7 @@ const scss = () => {
 }
 
 const watcher = () => {
-  watch('./js/**/*.js', series(blogifierJs));
+  watch('./js/**/*.js', series(blogifierJs, editorJs));
   watch('./scss/**/*.scss', series(scss));
 };
 

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml
@@ -99,10 +99,8 @@
   <p class="message">@_localizer["page-not-found-message"]</p>
   <p>
     <a class="button" href="~/">
-      <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor"
-           viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z" />
+      <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 16 16">
+        <path fill-rule="evenodd" d="M12 8a.5.5 0 0 1-.5.5H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5a.5.5 0 0 1 .5.5z" />
       </svg>
       @_localizer["home"]
     </a>

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/footer.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/footer.cshtml
@@ -1,13 +1,11 @@
 @inject IStringLocalizer<Resource> _localizer
 @model MainModel
 
-<div class="modal fade search-modal" id="searchModal" tabindex="-1" aria-labelledby="searchModalLabel"
-     aria-hidden="true">
+<div class="modal fade search-modal" id="searchModal" tabindex="-1" aria-labelledby="searchModalLabel" aria-hidden="true">
   <div class="modal-dialog mt-5">
     <div class="modal-content">
       <form id="searchForm" class="search-form" asp-controller="search" asp-action="" method="post">
-        <input type="search" id="searchFormInput" name="term" class="form-control form-control-lg border-0 shadow-none"
-               placeholder="@_localizer["search"]..." autocomplete="off" autofocus>
+        <input type="search" id="searchFormInput" name="term" class="form-control form-control-lg border-0 shadow-none" placeholder="@_localizer["search"]..." autocomplete="off" autofocus>
       </form>
     </div>
   </div>

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml
@@ -11,7 +11,7 @@
       <button class="header-nav-link" type="button" id="mainNav" data-bs-toggle="dropdown" aria-expanded="false">
         <span class="me-1">@_localizer["categories"]</span>
         <svg width="16" height="16" class="bi bi-chevron-down">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#categories"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#categories"></use>
         </svg>
       </button>
       <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="mainNav">
@@ -31,35 +31,35 @@
     <li>
       <a class="social-link-github header-nav-button" href="https://github.com/" target="_blank" aria-label="@_localizer["github"]">
         <svg width="16" height="16" class="bi bi-github">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#github"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#github"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-twitter header-nav-button" href="https://twitter.com/" target="_blank" aria-label="@_localizer["twitter"]">
         <svg width="16" height="16" class="bi bi-twitter">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#twitter"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#twitter"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-facebook header-nav-button" href="https://facebook.com" target="_blank" aria-label="@_localizer["facebook"]">
         <svg width="16" height="16" class="bi bi-facebook">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#facebook"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#facebook"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-youtube header-nav-button" href="https://youtube.com/" target="_blank" aria-label="@_localizer["youtube"]">
         <svg width="16" height="16" class="bi bi-youtube">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#youtube"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#youtube"></use>
         </svg>
       </a>
     </li>
     <li>
       <a class="social-link-instagram header-nav-button" href="https://instagram.com/" target="_blank" aria-label="@_localizer["instagram"]">
         <svg width="16" height="16" class="bi bi-instagram">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#instagram"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#instagram"></use>
         </svg>
       </a>
     </li>
@@ -68,19 +68,18 @@
   <!-- Search button -->
   <button aria-label="@_localizer["search"]" class="header-nav-button d-none d-md-block" type="button" data-bs-toggle="modal" data-bs-target="#searchModal">
     <svg width="16" height="16" class="bi bi-search">
-      <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#search"></use>
+      <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#search"></use>
     </svg>
   </button>
   <!--/Search button -->
   <!-- Admin Menu -->
   @if (Model.Main.Claims != null)
   {
     <div class="dropdown">
-      <button class="header-nav-link -login ms-4" title="@_localizer["login"]" id="dropdownMenuButton"
-              data-bs-toggle="dropdown" aria-expanded="false" aria-label="Admin Menu - John">
+      <button class="header-nav-link -login ms-4" title="@_localizer["login"]" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Admin Menu - John">
         <span class="me-1 d-none d-md-inline">@Model.Main.Claims.NickName</span>
         <svg width="16" height="16" class="bi bi-chevron-down">
-          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#chevron-down"></use>
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#chevron-down"></use>
         </svg>
       </button>
       <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuButton">
@@ -100,7 +99,7 @@
   {
     <a class="header-nav-button -login ms-4" href="~/account" title="@_localizer["login"]" aria-label="@_localizer["login"]" role="button">
       <svg width="20" height="20" class="bi bi-box-arrow-in-right">
-        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/images/icon-sprites.svg#box-arrow-in-right"></use>
+        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#box-arrow-in-right"></use>
       </svg>
     </a>
   }

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/pagination.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/pagination.cshtml
@@ -8,8 +8,8 @@
     {
       <li class="pagination-item">
         <a class="pagination-link -prev" href="@Model.Pager.LinkToOlder" title="@_localizer["next-page"]">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+          <svg width="16" height="16" class="bi bi-arrow-left">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
           </svg>
           @_localizer["previous"]
         </a>
@@ -20,8 +20,8 @@
       <li class="pagination-item">
         <a class="pagination-link -next" href="@Model.Pager.LinkToNewer" title="@_localizer["previous-page"]">
           @_localizer["next"]
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right" viewBox="0 0 16 16">
-            <path fill-rule="evenodd" d="M1 8a.5.5 0 0 1 .5-.5h11.793l-3.147-3.146a.5.5 0 0 1 .708-.708l4 4a.5.5 0 0 1 0 .708l-4 4a.5.5 0 0 1-.708-.708L13.293 8.5H1.5A.5.5 0 0 1 1 8z" />
+          <svg width="16" height="16" class="bi bi-arrow-right">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-right"></use>
           </svg>
         </a>
       </li>

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml
@@ -13,19 +13,15 @@
 
 <body>
   <main class="blogifier">
-    <a class="account-back link-secondary" href="/" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]"
-       data-placement="right">
-      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-arrow-left"
-           viewBox="0 0 16 16">
-        <path fill-rule="evenodd"
-              d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+    <a class="account-back link-secondary" href="/" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]" data-placement="right">
+      <svg width="24" height="24" class="bi bi-arrow-left">
+        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
       </svg>
     </a>
     <div class="account">
-      <a class="account-logo link-blogifier" href="http://blogifier.net/" target="_blank" rel="nofollow external"
-         data-bs-toggle="tooltip" title="@_localizer["powered-by-blogifier"]">
-        <svg width="40" height="40" fill="currentColor" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-          <path d="M179.2 0H102.4L81.92 51.2H166.4C180.538 51.2 192 62.6615 192 76.8C192 90.9385 180.538 102.4 166.4 102.4H61.44L40.96 153.6L166.4 153.6C180.538 153.6 192 165.062 192 179.2C192 193.338 180.538 204.8 166.4 204.8H20.48L0 256H179.2C221.615 256 256 221.615 256 179.2C256 159.53 248.605 141.587 236.444 128C248.605 114.413 256 96.4699 256 76.8C256 34.3845 221.615 0 179.2 0Z" />
+      <a class="account-logo link-blogifier" href="http://blogifier.net/" target="_blank" rel="nofollow external" data-bs-toggle="tooltip" title="@_localizer["powered-by-blogifier"]">
+        <svg width="40" height="40">
+          <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#logo"></use>
         </svg>
       </a>
       @RenderBody()

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml
@@ -15,18 +15,17 @@
 <body>
   <main class="blogifier">
     <a class="account-back link-secondary" href="@Model.RedirectUri" data-bs-toggle="tooltip" title="@_localizer["back-to-website"]" data-placement="right">
-      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-arrow-left"
-           viewBox="0 0 16 16">
-        <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+      <svg width="24" height="24" class="bi bi-arrow-left">
+        <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-arrow-left"></use>
       </svg>
     </a>
     <div class="container profile">
       <div class="page d-lg-flex">
         <div class="sidebar">
           <button class="sidebar-toggle d-lg-none">
             Page Title
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-down" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z" />
+            <svg width="16" height="16" class="bi bi-chevron-down">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-chevron-down"></use>
             </svg>
           </button>
           <div class="sidebar-nav d-lg-block">

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml
@@ -20,15 +20,15 @@
           <time class="post-meta-date-time">@DateTimeHelper.ToFriendlyShortDateString(Model.PostSlug.Post.PublishedAt)</time>
         </div>
         <button class="post-meta-btn ms-auto" type="button" data-bs-toggle="modal" data-bs-target="#shareModal">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-share" viewBox="0 0 16 16">
-            <path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5zm-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" />
+          <svg width="16" height="16" class="bi bi-share">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-share"></use>
           </svg>
         </button>
         @if (User.Identity != null && User.Identity.IsAuthenticated)
         {
           <a class="post-meta-btn ms-2" href="~/admin/pages/editor/@Model.PostSlug.Post.Slug">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">
-              <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z" />
+            <svg width="16" height="16" class="bi bi-pencil">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-pencil"></use>
             </svg>
           </a>
         }

diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml
@@ -39,20 +39,16 @@
             </ul>
           </div>
         }
-        <button class="post-meta-btn ms-auto" type="button" data-bs-toggle="modal" data-bs-target="#shareModal"
-                aria-label="@_localizer["share"]">
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-share"
-               viewBox="0 0 16 16">
-            <path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5zm-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" />
+        <button class="post-meta-btn ms-auto" type="button" data-bs-toggle="modal" data-bs-target="#shareModal" aria-label="@_localizer["share"]">
+          <svg width="16" height="16" class="bi bi-share">
+            <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-share"></use>
           </svg>
         </button>
         @if (User.Identity != null && User.Identity.IsAuthenticated)
         {
-          <a class="post-meta-btn ms-2" href="~/admin/blogs/editor/@Model.PostSlug.Post.Slug" role="button"
-             aria-label="@_localizer["edit-post"]">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil"
-                 viewBox="0 0 16 16">
-              <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z" />
+          <a class="post-meta-btn ms-2" href="~/admin/blogs/editor/@Model.PostSlug.Post.Slug" role="button" aria-label="@_localizer["edit-post"]">
+            <svg width="16" height="16" class="bi bi-pencil">
+              <use xlink:href="/_content/@ThemesStandardConstant.AssemblyName/img/icon-sprites.svg#bi-pencil"></use>
             </svg>
           </a>
         }