Migration to Bootstrap 5 for HumHub 1.18

humhub · Jan 3, 2025 · a2c8fa8 · a2c8fa8
1 parent 26da12a
commit a2c8fa8
Show file tree

Hide file tree

Showing 48 changed files with 1,130 additions and 1,057 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -10,10 +10,13 @@ module.exports = function (grunt) {
                 }
             }
         },
-        less: {
+        sass: {
+            options: {
+                implementation: require('sass')
+            },
             dev: {
                 files: {
-                    'resources/css/humhub.mail.css': 'resources/css/humhub.mail.less'
+                    'resources/css/humhub.mail.css': 'resources/css/humhub.mail.scss'
                 }
             }
         },
@@ -37,7 +40,7 @@ module.exports = function (grunt) {
         },
         watch: {
             scripts: {
-                files: ['resources/js/*.js', 'resources/css/*.less'],
+                files: ['resources/js/*.js', 'resources/css/*.scss'],
                 tasks: ['build'],
                 options: {
                     spawn: false,
@@ -48,9 +51,9 @@ module.exports = function (grunt) {
 
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-sass');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
-    grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-watch');
 
-    grunt.registerTask('build', ['concat', 'uglify', 'less', 'cssmin']);
+    grunt.registerTask('build', ['concat', 'uglify', 'sass', 'cssmin']);
 };
diff --git a/controllers/TagController.php b/controllers/TagController.php
@@ -3,17 +3,17 @@
 namespace humhub\modules\mail\controllers;
 
 use humhub\components\access\ControllerAccess;
+use humhub\components\Controller;
 use humhub\modules\mail\helpers\Url;
 use humhub\modules\mail\models\forms\AddTag;
 use humhub\modules\mail\models\forms\ConversationTagsForm;
+use humhub\modules\mail\models\Message;
 use humhub\modules\mail\models\MessageTag;
 use humhub\modules\mail\widgets\ConversationTagPicker;
 use humhub\modules\mail\widgets\ConversationTags;
-use humhub\widgets\ModalClose;
+use humhub\widgets\modal\ModalClose;
 use Yii;
 use yii\web\ForbiddenHttpException;
-use humhub\components\Controller;
-use humhub\modules\mail\models\Message;
 use yii\web\NotFoundHttpException;
 
 /**

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+3.3.0-beta.1 (unreleased)
+-------------------------
+- Enh: Migration to Bootstrap 5 for HumHub 1.18
+
 3.2.3 (Unreleased)
 --------------------
 - Enh #411: Standardization of Modal Button Positions

diff --git a/models/Message.php b/models/Message.php
@@ -433,7 +433,7 @@ public function getPinIcon($userId = null): ?Icon
         if ($this->isPinned($userId)) {
             return Icon::get('map-pin')
                 ->tooltip(Yii::t('MailModule.base', 'Pinned'))
-                ->color('var(--danger)');
+                ->color('var(--bs-danger)');
         }
 
         return null;

diff --git a/module.json b/module.json
@@ -8,7 +8,7 @@
     "messenger",
     "communication"
   ],
-  "version": "3.2.3",
+  "version": "3.3.0-beta.1",
   "humhub": {
     "minVersion": "1.16"
   },