Change style of "add" button (#401)

* Change of "add" button * Change text style in top panel * Nice scroller for top mail panel * Fix style of top mail panel
humhub · Jul 5, 2024 · bce3e4f · bce3e4f
1 parent eaa5c44
commit bce3e4f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 33 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -3,5 +3,5 @@ name: PHP CS Fixer
 on: push
 
 jobs:
-  tests:
+  fixers:
     uses: humhub/actions/.github/workflows/module-php-cs-fixer.yml@main
diff --git a/resources/css/humhub.mail.css b/resources/css/humhub.mail.css
@@ -160,31 +160,31 @@
 }
 .mail-inbox-messages .media h4.media-heading {
   font-weight: 600;
+  font-size: 16px;
 }
 .mail-inbox-messages .media h4.media-heading time {
+  font-size: 11px !important;
   font-weight: normal;
   float: right;
 }
 .mail-inbox-messages .media h5 {
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   font-weight: 500;
   color: #000;
   display: flex;
   justify-content: space-between;
+  margin: 7px 0;
 }
 .mail-inbox-messages .media h5 span:first-child {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 .mail-inbox-messages .media .mail-last-entry {
-  font-size: 11px;
-  font-weight: normal;
-  color: var(--text-color-soft2);
-}
-.mail-inbox-messages .selected .mail-last-entry,
-.mail-inbox-messages .media-list > li:hover .mail-last-entry {
-  color: var(--text-color-main);
+  font-size: 14px;
+  font-weight: 500;
+  color: var(--text-color-secondary);
 }
 .mail-message-form {
   position: absolute;
@@ -277,7 +277,7 @@
   color: var(--info);
 }
 .messagePreviewEntry.unread .mail-last-entry {
-  color: var(--text-color-main);
+  color: var(--text-color-highlight);
 }
 .message-tag-filter-group .select2-selection {
   border-bottom-right-radius: 0;
@@ -293,8 +293,8 @@
 }
 .new-message-badge {
   float: right;
-  min-width: 16px;
-  height: 16px;
+  min-width: 14px;
+  height: 14px;
   border-radius: 50%;
   background: var(--info);
   margin-left: 2px;

diff --git a/resources/css/humhub.mail.less b/resources/css/humhub.mail.less
@@ -235,19 +235,23 @@
 
     h4.media-heading {
       .semiBold;
+      font-size: 16px;
 
       time {
+        font-size: 11px !important;
         font-weight: normal;
         float: right;
       }
     }
 
     h5 {
-      font-size: 11px;
+      font-size: 14px;
+      line-height: 16px;
       font-weight: 500;
       color: #000;
       display: flex;
       justify-content: space-between;
+      margin: 7px 0;
 
       span:first-child {
         overflow: hidden;
@@ -257,15 +261,9 @@
     }
 
     .mail-last-entry {
-      font-size: 11px;
-      font-weight: normal;
-      color: var(--text-color-soft2);
-    }
-  }
-
-  .selected, .media-list > li:hover {
-    .mail-last-entry {
-      color: var(--text-color-main);
+      font-size: 14px;
+      font-weight: 500;
+      color: var(--text-color-secondary);
     }
   }
 }
@@ -392,7 +390,7 @@
     }
 
     .mail-last-entry {
-      color: var(--text-color-main);
+      color: var(--text-color-highlight);
     }
   }
 }
@@ -415,8 +413,8 @@
 
 .new-message-badge {
   float: right;
-  min-width: 16px;
-  height: 16px;
+  min-width: 14px;
+  height: 14px;
   border-radius: 50%;
   background: @colorUnread;
   margin-left: 2px;

diff --git a/resources/css/humhub.mail.min.css b/resources/css/humhub.mail.min.css
diff --git a/resources/js/humhub.mail.notification.js b/resources/js/humhub.mail.notification.js
@@ -25,18 +25,29 @@ humhub.module('mail.notification', function (module, require, $) {
                     currentXhr.abort();
                 }
 
+                const messageLoader = $('#loader_messages');
+                const messageList = messageLoader.parent();
+
                 // remove all <li> entries from dropdown
-                $('#loader_messages').parent().find(':not(#loader_messages)').remove();
-                loader.set($('#loader_messages').show());
+                messageLoader.parent().find(':not(#loader_messages)').remove();
+                loader.set(messageLoader.show());
 
                 client.get(module.config.url.list, {
                     beforeSend: function (xhr) {
                         currentXhr = xhr;
                     }
                 }).then(function (response) {
                     currentXhr = undefined;
-                    $('#loader_messages').parent().prepend($(response.html));
-                    $('#loader_messages').hide();
+                    messageList.prepend($(response.html));
+                    messageLoader.hide();
+                    messageList.niceScroll({
+                        cursorwidth: '7',
+                        cursorborder: '',
+                        cursorcolor: '#555',
+                        cursoropacitymax: '0.2',
+                        nativeparentscrolling: false,
+                        railpadding: {top: 0, right: 3, left: 0, bottom: 0}
+                    });
                 });
             });
         }

diff --git a/resources/js/humhub.mail.notification.min.js b/resources/js/humhub.mail.notification.min.js
diff --git a/widgets/NewMessageButton.php b/widgets/NewMessageButton.php
@@ -37,7 +37,7 @@ class NewMessageButton extends Widget
     /**
      * @var bool
      */
-    public $right = false;
+    public $right = true;
 
     /**
      * @var string
@@ -49,7 +49,7 @@ class NewMessageButton extends Widget
      */
     public function run()
     {
-        $button = ModalButton::info($this->getLabel())->load(Url::toCreateConversation($this->guid))->id($this->id);
+        $button = ModalButton::defaultType($this->getLabel())->load(Url::toCreateConversation($this->guid))->id($this->id);
 
         if($this->icon) {
             $button->icon($this->icon);
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,5 @@ name: PHP CS Fixer @@
     on: push
     jobs:
-      tests:
+      fixers:
         uses: humhub/actions/.github/workflows/module-php-cs-fixer.yml@main