Merge branch 'dev' into Onur/blogging-more-section

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -841,6 +841,7 @@
     "BlazoriseSupportExplanation2": "Verify your email address by checking your email box. Check your spam box if you don't see an email in your inbox!",
     "BlazoriseSupportExplanation3": "Log into the Blazorise support website at <a href=\"https://blazorise.com/support/login\">blazorise.com/support/login</a>.",
     "BlazoriseSupportExplanation4": "If you have an active ABP Commercial license, you will also have a Blazorise PRO license. You can get your Blazorise license key at <a href=\"https://blazorise.com/support/user/manage/license\">blazorise.com/support/user/manage/license</a>.",
-    "BlazoriseSupportExplanation5": "You can post your questions on the support website and generate a product token for your application."
+    "BlazoriseSupportExplanation5": "You can post your questions on the support website and generate a product token for your application.",
+    "AbpLiveTrainingPackages": "ABP Live Training Packages"
   }
 }

latest-versions.json

@@ -1,6 +1,6 @@
 [
     {
-        "version": "7.2.1",
+        "version": "7.2.2",
         "releaseDate": "",
         "type": "stable",
         "message": ""	

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml

@@ -47,6 +47,7 @@
     <abp-style-bundle name="@typeof(DetailModel).FullName">
         <abp-script type="@typeof(PrismjsStyleBundleContributor)" />
         <abp-style src="/Pages/Blogs/Shared/Styles/blog.css" />
+        <abp-style src="/Pages/Blogs/Posts/detail.css" />
     </abp-style-bundle>
 }
 

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.css

@@ -0,0 +1,27 @@
+.last-post-title{
+    font-size: 15px;
+    line-height: 20px;
+    font-weight: 700;
+    letter-spacing: 0px;
+    text-decoration: none;
+    color: black;
+}
+.last-post-image{
+    width: 30px;
+    height: 30px;
+    border-top-left-radius: 50%;
+    border-top-right-radius: 50%;
+    border-bottom-right-radius: 50%;
+    border-bottom-left-radius: 50%;
+}
+.last-post-name{
+    padding-right: 2px;
+    max-height: 16px;
+    padding-top: 0.5em;
+    padding-right: 0.5em;
+}
+#CopyLink{
+    padding: 0;
+    border: none;
+    background: none;
+}

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css

@@ -320,31 +320,4 @@ div.vs-blog {
       text-decoration: none; }
   div.vs-blog > .form-group {
     margin: 0 !important; }
-.last-post-title{
-  font-size: 15px;
-  line-height: 20px;
-  font-weight: 700;
-  letter-spacing: 0px;
-  text-decoration: none;
-  color: black;
-}
-.last-post-image{
-  width: 30px;
-  height: 30px;
-  border-top-left-radius: 50%;
-  border-top-right-radius: 50%;
-  border-bottom-right-radius: 50%;
-  border-bottom-left-radius: 50%;
-}
-.last-post-name{
-  padding-right: 2px;
-  max-height: 16px;
-  padding-top: 0.5em;
-  padding-right: 0.5em;
-}
-#CopyLink{
-  padding: 0;
-  border: none;
-  background: none;
-}
 

npm/ng-packs/package.json

@@ -129,8 +129,10 @@
     "ts-toolbelt": "6.15.4",
     "tslib": "^2.3.0",
     "tslint": "~6.1.0",
-    "typescript": "4.8.4",
-    "zone.js": "0.11.4"
+    "typescript": "~4.8.4",
+    "zone.js": "0.11.4",
+    "@abp/ng.theme.lepton-x": "^2.2.0",
+    "bootstrap-icons": "^1.10.3"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts,tsx,html,css,scss}": [

npm/ng-packs/packages/schematics/package.json

@@ -15,7 +15,7 @@
     "got": "^11.5.2",
     "jsonc-parser": "^2.3.0",
     "should-quote": "^1.0.0",
-    "typescript": "4.8.4"
+    "typescript": "~4.8.4"
   },
   "devDependencies": {
     "@schematics/angular": "~14.2.1",

npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json

@@ -17,7 +17,7 @@
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
     "ts-node": "~10.9.0",
-    "typescript": "~4.8.2",
+    "typescript": "~4.8.4",
     "zone.js": "~0.12.0"
   }
 }

npm/ng-packs/packages/schematics/src/utils/methods.ts

@@ -1,4 +1,5 @@
 import { camel } from './text';
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const shouldQuote = require('should-quote');
 export const getParamName = (paramName: string) =>

npm/ng-packs/scripts/package.json

@@ -27,6 +27,6 @@
     "esm": "^3.2.25",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^3.9.0",
-    "typescript": "4.7.4"
+    "typescript": "~4.8.4"
   }
 }