Merge remote-tracking branch 'upstream/master' into fix-tabs

assets/scss/_styles_project.scss

@@ -7,11 +7,16 @@
   .nav-link {
     color: $secondary !important;
     font-weight: 600;
+    border-radius: 5px;
   }
-  .nav-link:hover, .nav-link.active{
+  .nav-link:hover {
+    background-color: #61616144;
+    transition: background-color 0.2s ease-in-out;
+  }
+  
+  .nav-link.active{
     background-color: #616161;
     color: white;
-    border-radius: 5px;
   }
 }
 
@@ -28,6 +33,18 @@
   padding: .5rem 1.5rem;
 }
 
+.sp-footer h2,
+.sp-footer h3,
+.sp-footer a.nav-link {
+  padding: 0.3rem 1rem !important;
+}
+
+.sp-footer a.nav-link:hover {
+  background-color: #61616144;
+  transition: background-color 0.2s ease-in-out;
+  border-radius: .3rem;
+}
+
 .sp-footer a.nav-link span {
   width: 2rem;
   display: inline-flex;
@@ -60,21 +77,59 @@
   border-radius: 0.25rem;
 }
 
+.td-sidebar-nav-active-item {
+  color: $primary !important;
+  font-weight: 600;
+}
+
 .td-sidebar-nav .td-sidebar-link__page,
 ul.ul-2>.td-sidebar-nav__section-title a {
   color: #616161 !important;
   font-weight: 400;
+  padding: .3rem .8rem !important;
+  border-radius: .3rem;
+  margin: .1rem !important;
+}
+
+.td-sidebar-link.td-sidebar-link__section {
+  border-radius: .3rem;
+  padding: .3rem .8rem !important;
+  margin: .1rem !important;
+}
+
+.td-sidebar-link.td-sidebar-link__section:hover {
+  color: $primary !important;
+  background-color: #7EB07F11;
+  transition: background-color 0.2s ease-in-out;
+  transition: color 0.2s ease-in-out;
+}
+
+.td-sidebar-nav a.active {
+  color: $primary !important;
+  background-color: #7EB07F22;
+}
+
+ul.ul-2 {
+  padding: 0;
 }
 
 ul.ul-2>.td-sidebar-nav__section-title a:hover {
-  color: $blue !important;
+  color: $primary !important;
+  background-color: #7EB07F11;
+  transition: background-color 0.2s ease-in-out;
+  transition: color 0.2s ease-in-out;
+}
+
+ul.ul-0 li a.tree-root,
+h5.taxonomy-title {
+  display: none !important;
 }
 
 li:has(input[type="checkbox"]) {
   list-style-type: none;
 }
 
-  .td-toc ul {
+.td-toc ul {
   margin-top: 1rem;
 }
 

content/en/docs/About us/roadmap.md

@@ -13,9 +13,9 @@ Tasks in **bold** are sponsored, for example, by NlNet. Tasks in *italic* are in
 
 ## SP Nix flake format
 
-- [ ] ***Restructure the NixOS configuration to use Nix flakes and migrate to newer NixOS version*** ([nixos-config#38](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/38))
-- [ ] *Migrate to NixOS 23.05*
-- [ ] *Package the SelfPrivacy API into a flake* ([selfprivacy-api#63](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api/issues/63))
+- [x] **Restructure the NixOS configuration to use Nix flakes and migrate to newer NixOS version** ([nixos-config#38](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/38))
+- [x] Migrate to NixOS 23.05
+- [x] Package the SelfPrivacy API into a flake ([selfprivacy-api#63](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api/issues/63))
 - [ ] ***Develop the manifest format for packaging services to work with SelfPrivacy*** ([nixos-config#40](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/40))
 - [ ] **Move existing services to SP Modules**
   - [ ] Email server ([nixos-config#41](https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config/issues/41))
@@ -119,5 +119,5 @@ While cloud server providers offer APIs that allow us to perform almost fully au
 
 ## Publishing
 
-- [ ] Publish on Google Play
+- [x] Publish on Google Play
 - [ ] Publish on Apple App Store

content/en/docs/Contributing/_index.md

@@ -7,9 +7,6 @@ description: >
     You can help with translations and programming 
 ---
 
-# How can you help the project?
-	
-	
 ## Help us translate
 
 We use our own [weblate instance](https://weblate.selfprivacy.org/projects/selfprivacy/selfprivacy-app/) to collaborate.
@@ -47,6 +44,6 @@ If you want to improve [our site](https://selfprivacy.org):
 - [Main Site + Documentation](https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org)
 
 
-# For any help, please contact our chats:
+## For any help, please contact our chats:
 - [Telegram: @selfprivacy_dev](https://t.me/selfprivacy_dev)
 - [Matrix: @dev:selfprivacy.org](https/matrix.to/#/%23dev:selfprivacy.org)

content/en/docs/FAQ/_index.md

@@ -7,8 +7,6 @@ description: >
     Frequently asked questions about our project.
 ---
 
-# General questions
-
 ## What are self-host services and what are their advantages?
 
 When we use centralised services, such as popular social networks, we trust the admins of the resource that stores our correspondence, our photos and even the most important secrets said in a chat with close people. We allow our interests and music preferences to be analysed, receive targeted advertising based on them, and most likely participate in unnamed audience analysis programs and all sorts of surveillance.