Merge pull request #9 from felixhahnweilheim/v0.2.0

V0.2.0

docs/CHANGELOG.md

@@ -1,5 +1,9 @@
-## 0.1.1 (in preparation)
-[#6](https://github.com/felixhahnweilheim/humhub-themes-orange/pull/6) Showing long title (> 50 characters) with overflow in top bar
+## 0.2.0
+- Tested with HumHub v1.11
+- [#6](https://github.com/felixhahnweilheim/humhub-themes-orange/pull/6) Showing long title (> 50 characters) with overflow in top bar
+- removed Google font from e-mails
+- removed fix for comment form (new solution in HumHub core)
+- added margin-top to language switcher in login modal
 
 ## 0.1.0 (February 6, 2022)
-First release
+First release

docs/INSTALLATION.md

@@ -4,4 +4,4 @@
 2. Enable the module in Administration > Modules
 2. Select the theme at Administration > Settings > Appearance (save at the bottom)
 
-If you try out the theme with another HumHub version than 1.10, please rebuild the css file (`themes/themeOrange/css/theme.css`) (see the [HumHub Theming guide](https://docs.humhub.org/docs/theme/css#compile-css-package)).
+If you try out the theme with another HumHub version than 1.11, please rebuild the css file (`themes/themeOrange/css/theme.css`) (see the [HumHub Theming guide](https://docs.humhub.org/docs/theme/css#compile-css-package)).

docs/README.md

@@ -1,8 +1,10 @@
 # [HumHub](https://humhub.org) OrangeTheme
 
-### A child theme for HumHub 1.10+
+### A child theme for HumHub 1.10 and 1.11
 
-**Version:** 0.1.0
+**Version: 0.2.0 (for HumHub 1.11)**
+
+[Version 0.1.0](https://github.com/felixhahnweilheim/humhub-themes-orange/releases/tag/v0.1.0) was created for HumHub 1.10.
 
 This is a child [theme module](https://docs.humhub.org/docs/theme/module#theme-module), the changes compared to the community theme are listed below.
 
@@ -43,17 +45,14 @@ see `less/button.less`
 
 <img src="../resources/screenshot-people-buttons.png" width="400">
 
-### 6. Comment create form: fixed button over text
-see `less/mixins.less`, solved with padding-right
-
-### 7. Added Language Switcher in
+### 6. Added Language Switcher in
 - Login modal window, at the bottom
 - Registration page, beneath the title
 
-### 8. Editor for tasks, wiki, polls etc.: fixed non-floating menubar lead to a lot of scrolling on mobile
+### 7. Editor for tasks, wiki, polls etc.: fixed non-floating menubar lead to a lot of scrolling on mobile
 see `less/mixins.less` (solved with max-height)
 
-### 9. Full-width Dashboard for guests
-does not show the widgets "New People" and "New Spaces" in order not to show names and internal things to the public
+### 8. Full-width Dashboard for guests
+does not show the widget "New Spaces" in order not to show internal things to the public
 
-### 10. [Some smaller things ...](DETAILS.md)
+### 9. [Some smaller things ...](DETAILS.md)

module.json

@@ -5,7 +5,7 @@
 	"keywords": [
 		"child theme", "orange"
 	],
-	"version": "0.1.0",
+	"version": "0.2.0",
 	"humhub": {
 		"minVersion": "1.10"
 	},

themes/themeOrange/less/button.less

@@ -1,6 +1,9 @@
 .btn {
     border-radius: 20px;
 }
+.comment-buttons .btn {
+    border-radius: 3px;
+}
 
 .wall-entry-content .btn.btn-default:hover, .wall-entry-content .btn.btn-default:focus {
     color: @info !important;
@@ -9,10 +12,13 @@
     color: @text-color-contrast !important;
 }
 
+.btn-default {
+    background: @background-color-secondary
+}
 .btn-default {
     &:hover,
     &:focus {
-      background: lighten(@default, 2%);
+      background: @background3;
     }
 }
 

themes/themeOrange/less/mixins.less

@@ -81,21 +81,6 @@ body {
 	color: @primary !important;
 }
 
-/*Create comment form - community theme: padding-right: 72px, overflow-wrap: initial*/
-.comment-create-input-group {
-    .ProsemirrorEditor {
-        .ProseMirror {
-            padding-right: 92px;
-        }
-    }
-}
-#wallStream {
-    [data-ui-markdown],
-    [data-ui-richtext] {
-        overflow-wrap: break-word;
-    }
-}
-
 /*Statistics in Spaces, profiles, color @info instead of @link*/
 .panel {
     .statistics {

themes/themeOrange/less/topbar.less

@@ -101,7 +101,7 @@
 	.account .user-title {
 		// Long title showing correctly in top bar, using "..."
 		max-width: 450px; white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;
-		
+
 		color: lighten(@text-color-highlight, 15%);
 
 		span {

themes/themeOrange/views/humhub/mail/layouts/html.php

@@ -22,7 +22,6 @@
         <meta name="format-detection" content="telephone=no"/>
 
         <title><?php echo Html::encode(Yii::$app->name); ?></title>
-        <link href=<?= Yii::$app->view->theme->variable('mail-font-url', 'http://fonts.googleapis.com/css?family=Open+Sans:300,100,400,600') ?> rel='stylesheet' type='text/css'>
             <style type="text/css">
 
                 <?php $defaultBackground =  Yii::$app->view->theme->variable('background-color-main', '#fff') ?>

themes/themeOrange/views/user/views/auth/login_modal.php

@@ -108,12 +108,13 @@
                     </div>
                 <?php endif; ?>
 
-    <?= humhub\widgets\LanguageChooser::widget(); ?>
+                <div style="margin-top: 10px;>
+                    <?= humhub\widgets\LanguageChooser::widget(); ?>
+                </div>
+
             </div>
         </div>
-
     </div>
-
 </div>
 
 <script <?= \humhub\libs\Html::nonce() ?>>