Add font-face for Consolas font and style blockquote.

yii2-extensions · Dec 13, 2023 · 1d6a3cd · 1d6a3cd
1 parent 9abc20d
commit 1d6a3cd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/src/Framework/resource/css/style.css b/src/Framework/resource/css/style.css
@@ -125,6 +125,11 @@
         scroll-behavior:smooth
     }
 }
+@font-face {
+    font-family:consolas;
+    font-style:normal;
+    src:url('https://fonts.cdnfonts.com/css/consola-mono') format('woff2');
+}
 body {
     margin:0;
     font-family:var(--bs-body-font-family);
@@ -590,12 +595,20 @@ a:hover,a:focus {
 .text-justify {
     text-align:justify !important
 }
+body.page blockquote {
+    border-left: 5px solid #F1592A;
+    background: white;
+}
+blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 17.5px;
+    border-left: 5px solid #F1592A;
+}
 pre {
-    display: block;
-    padding: 9.5px;
-    margin: 0 0 10px;
-    font-size: 13px;
-    line-height: 1.42857143;
+    padding: 10px !important;
+    font-family: consolas !important;
+    font-size: 18px !important;
     color:var(--bs-white);
     word-break: break-all;
     word-wrap: break-word;

diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
@@ -63,6 +63,11 @@ public function getImageCardX(string $slug): string
             : '/image/cardx.png';
     }
 
+    public function getPosts(): array
+    {
+        return $this->finderRepository->find($this->post)->orderBy(['id' => SORT_DESC])->all();
+    }
+
     public function getPostBySlug(string $slug): array|null|ActiveRecordInterface
     {
         return $this->finderRepository->findByOneCondition($this->post, ['slug' => $slug]);

diff --git a/src/UseCase/Blog/view/post/_post.php b/src/UseCase/Blog/view/post/_post.php
@@ -49,7 +49,7 @@
             ->content(
                 Div::widget()->class('entry-content')->content($post->content),
                 Div::widget()
-                    ->class('post-tags mb-5')
+                    ->class('post-tags mt-5 mb-5')
                     ->content(
                         implode(
                             ' ',

diff --git a/src/UseCase/Post/Update/UpdateAction.php b/src/UseCase/Post/Update/UpdateAction.php
@@ -81,15 +81,16 @@ public function run(string $slug = null): string|Response
             return $this->controller->redirect(['post/index']);
         }
 
+        $imageFile = file_exists(Yii::getAlias('@uploads') . '/' . $post->image_file)
+            ? '/uploads' . '/' . $post->image_file : '';
+
         return $this->controller->render(
             '_form',
             [
                 'blogModule' => $this->blogModule,
                 'buttonTitle' => Yii::t('yii.blog', 'Update'),
                 'formModel' => $postForm,
-                'imageFile' => $post->image_file !== ''
-                    ? '/uploads' . '/' . $post->image_file
-                    : '',
+                'imageFile' => $imageFile,
                 'nodeTree' => $this->categoryService->buildNodeTreeWithDepth(),
                 'seoForm' => $seoForm,
                 'title' => Yii::t('yii.blog', 'Update posts'),

diff --git a/src/UseCase/Post/view/_form.php b/src/UseCase/Post/view/_form.php
@@ -48,7 +48,7 @@
             ['fontname', ['fontname']],
             ['color', ['color']],
             ['para', ['ul', 'ol', 'paragraph']],
-            ['lineHeights', ['0.5', '1']],
+            ['height', ['height']],
             ['table', ['table']],
             ['insert', ['link', 'picture', 'video']],
             ['view', ['fullscreen', 'codeview', 'help']],