Merge remote-tracking branch 'origin/master' into feature/hubl-618

.gitlab/issue_templates/bug.md

@@ -1,28 +1,24 @@
-/label ~BUG
+# What's happening?
 
-### What's happening?
+Describe in a few words what's happening
 
-*Describe in a few words what's happening*
+## Steps to reproduce
 
-### Steps to reproduce
-
-*How one can reproduce the issue - this is very important*
+How one can reproduce the issue - this is very important
 
 1. Step 1
 2. Step 2
 3. Step 3
 
-### Relevant logs and/or screenshots
+## Relevant logs and/or screenshots
 
-*If possible, please add a screenshot.*
+If possible, please add a screenshot.
 
-### Your Environment
+## Your Environment
 
 (Include relevant details about the environment you experienced the bug in)
 
 * Browser name and version:
 * Operating System and version (desktop or mobile):
 
-
-
-
+/label ~BUG

.gitlab/issue_templates/feature.md

@@ -1,16 +1,12 @@
-## What needs to be done?
-
-/label ~Feature request
-
+# What needs to be done
 
 ## Technical details
 
-*Are there any technical details worth mentioning?*
-
+Are there any technical details worth mentioning?
 
 ## Test cases
 
-*Describe here the tests needed in order to validate this feature*
+Describe here the tests needed in order to validate this feature
 
 1. Step 1
 2. Step 2
@@ -20,3 +16,5 @@
 
 1. Link to user story in wiki
 2. other related Gitlab issues
+
+/label ~Feature request

.gitlab/issue_templates/new_instance.md

@@ -1,40 +1,16 @@
-/label ~"New Instance"
-
-# Please fill all these info:
+# Please fill all these info
 
 ## General info
 
 - Name of the instance:
-- Domain:
-
-## Settings:
-
-- Does the instance allow people to sign up? **Yes / No**
-- Does the instance want new people to get a welcome email? **Yes / No**
-
-## Federation:
-
-- Which current instance should see this new instance data? **Please provide the info module by module and include the instance itself.**
-- Do those current instances agree to share their public data with this new instance? **Yes / No**
-
-Example:
-
-- *Instance G is the new kid in town*
-- *Instance G wants to only see their dashboard, but want to access the circles of A, B, C, D, E & F.*
-- *Instance G wants to be able to chat with users from A, B, C, D, E & F.*
-- *Instance G wants to be able to see A and B job offers*
-
-Let's say every instances agree to this scenario, the issue should describe the following: 
-
-- Dashboard: G
-- Circles: A, B, C, D, E, F & G
-- Job offers: A, B, F, G
-- Users: A, B, C, D, E, F & G
-- Profile directory: A, B, C, D, E, F & G
-- G agrees that any new instance can see their public data.
+- Domain: .hubl.world
 
 ## Cosmetics
 
 - Logo:
+
 - Favicon:
+
 - 4 Colors:
+
+/label ~"New Instance"

.gitlab/merge_request_templates/checklist_before_merging.md

@@ -1,4 +1,4 @@
-## Checklist
+# Checklist
 
 <!---
 Please, make sure you have changed the topic and also
@@ -12,8 +12,6 @@ I have done ...
 - [ ] Tests for the changes have been added
 - [ ] Docs have been added or updated
 - [ ] I have assigned my architect to review this merge request
-- [ ] I have checked how to create a [merge request]()
-
 
 ## Issues
 
@@ -25,7 +23,6 @@ Format is: Closes #X or Refs #Y
 Docs: https://docs.gitlab.com/ee/user/project/issues/closing_issues.html#via-merge-request
 -->
 
-
 ## Time spent
 
 <!---
@@ -38,7 +35,6 @@ Docs: https://docs.gitlab.com/ee/workflow/time_tracking.html
 
 /spend Xh
 
-
 ## Assignee
 
 <!---
@@ -49,7 +45,6 @@ Docs: https://docs.gitlab.com/ee/user/project/quick_actions.html
 
 /assign
 
-
 ## Feedback
 
 <!---
@@ -57,5 +52,4 @@ Did you encounter any other problems you want to share with us?
 Optional. Feel free to remove this section if you don't have any feedback.
 -->
 
-
 <!--- Thank you for you contribution! -->

README.md

@@ -108,8 +108,8 @@ On `config.json`:
 
 ```json
   "clientName": "Hubl",
-  "clientFavicon": "/images/favicon.png",
-  "clientLogo": "/images/logo.png",
+  "clientFavicon": "/images/favicon.webp",
+  "clientLogo": "/images/logo.webp",
   "clientLogoHeight": "32px",
   "clientCSS": "/path/to/custom.css",
   "authorityName": "djangoldp-server-name"
@@ -214,7 +214,7 @@ On `config.json`:
 
 ```json
   "endpoints": {
-    "joboffers": "http://server.url/joboffers/",
+    "joboffers": "http://server.url/job-offers/",
     "skills": "http://server.url/skills/",
     "uploads": "http://server.url/upload/"
   }

src/header.pug

@@ -1,7 +1,7 @@
 .header-left
   .logo
     solid-link(next='dashboard')
-      img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '32px'}`)
+      img(src=`${clientLogo || '/images/logo.webp'}` style=`max-height:${clientLogoHeight || '74px'}`)
 
   span.beta-tag(data-trans='header.beta')
 

src/index.pug

@@ -9,7 +9,7 @@ html(lang="en")
     if clientFavicon
       link(rel="icon" type="image/png" href=`${clientFavicon}`)
     else
-      link(rel="icon" type="image/png" href="/images/favicon.png")
+      link(rel="icon" type="image/webp" href="/images/favicon.webp")
     include dependencies.pug
     if clientCSS
       link(rel='stylesheet', href=`${clientCSS}`)

src/styles/base/header.scss

@@ -47,8 +47,8 @@
         border-radius: 3px;
         background: var(--color-primary);
         color: var(--color-white);
-        position: absolute;
-        top: -9px;
+        position: fixed;
+        top: 12px;
         left: 267px;
       }
     }