Skip to content

Commit

Permalink
Merge pull request #11 from felixhahnweilheim/develop
Browse files Browse the repository at this point in the history
v0.4.0
  • Loading branch information
felixhahnweilheim committed Dec 6, 2022
2 parents cb21017 + e03d7e4 commit 8ceaf1a
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 35 deletions.
6 changes: 6 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## 0.4.0 (unreleased)
- updated for HumHub 1.13
- make "Show all comments" link more visible
- Rework dropdown stylings (and rename nav.less to dropdown.less)

## 0.3.0 (August 5, 2022)
- tested with HumHub 1.12
- add Topic List to user profile
- improve colours in Gallery Module
- add Language Chooser to guest dashboard
Expand Down
2 changes: 1 addition & 1 deletion docs/INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.11 or 1.12, 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 the corresponding one mentioned in the README.md, 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)).
4 changes: 3 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

### A child theme for HumHub

**Version: 0.3.0**
**Version: 0.4.0**

Corresponding versions (espacially for the CSS file):

[v0.4](https://github.com/felixhahnweilheim/humhub-themes-orange/releases/tag/v0.4.0) => HumHub 1.13

[v0.3](https://github.com/felixhahnweilheim/humhub-themes-orange/releases/tag/v0.3.0) => HumHub 1.12

[v0.2](https://github.com/felixhahnweilheim/humhub-themes-orange/releases/tag/v0.2.0) => HumHub 1.11
Expand Down
4 changes: 2 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"keywords": [
"child theme", "orange"
],
"version": "0.3.0",
"version": "0.4.0",
"humhub": {
"minVersion": "1.11"
"minVersion": "1.13"
},
"screenshots": ["resources/screenshot-header-desktop.png", "screenshot-space-topic-list.png", "resources/screenshot-social-controls-2.png", "resources/screenshot-space-header-buttons.png", "resources/screenshot-create-space-button.png", "resources/screenshot-people-buttons.png"]
}
2 changes: 1 addition & 1 deletion themes/themeOrange/css/theme.css

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions themes/themeOrange/less/dropdown.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Navigation dropdown

.nav-pills,
.nav-tabs,
.account {
.dropdown-menu {
background-color: @background-color-main;

li.divider {
background-color: darken(@background-color-main, 10%);
}

li {
border-left: 3px solid darken(@background-color-main, 3%);
a {
color: @text-color-highlight;
}
}

li:hover:not(.divider),
li.selected {
border-left: 3px solid @info;
background-color: darken(@background-color-main, 10%) !important;
}
}
}
11 changes: 10 additions & 1 deletion themes/themeOrange/less/mixins.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*Styles for internal things*/
@import "topbar.less";
@import "login.less";
@import "nav.less";
@import "dropdown.less";
@import "button.less";
/*Styles for external modules*/
@import "gallery.less";
Expand Down Expand Up @@ -47,6 +47,15 @@ body {
overflow-y: auto;
}

/* "Show all Comments" link*/
.wall-entry .well .comment .show-all-link {
font-size: 14px;
color: @link;
font-weight: 500;
}
.wall-entry .well .comment .show-all-link:hover {
color: @primary;
}

/*Styling for Comment and Like icons*/
.wall-entry-controls .likeLinkContainer a {
Expand Down
27 changes: 0 additions & 27 deletions themes/themeOrange/less/nav.less

This file was deleted.

2 changes: 1 addition & 1 deletion widgets/TopicListSpace.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function init()
$this->addEntry(new MenuLink([
'label' => $topic->name,
'url' => $topic->getUrl(),
'icon' => 'fa-tag',
'icon' => 'fa-star',
'sortOrder' => $topic->sort_order,
]));
}
Expand Down
2 changes: 1 addition & 1 deletion widgets/TopicListUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function init()
$this->addEntry(new MenuLink([
'label' => $topic->name,
'url' => $topic->getUrl(),
'icon' => 'fa-tag',
'icon' => 'fa-star',
'sortOrder' => $topic->sort_order,
]));
}
Expand Down

0 comments on commit 8ceaf1a

Please sign in to comment.