Merge pull request #32 from AndreWohnsland/dev

Scrollable bottle view
AndreWohnsland · Jan 13, 2023 · aa1c9de · aa1c9de
2 parents 12cce54 + d690c2a
commit aa1c9de
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 50 deletions.
diff --git a/docs/installation.md b/docs/installation.md
@@ -6,7 +6,7 @@ Here you can find all the requirements and installation steps.
 
 These are the minimal tools needed to get started:
 
-- [Python 3.7](https://www.python.org/downloads/) or newer
+- [Python 3.9](https://www.python.org/downloads/) or newer
 - [Git](https://git-scm.com/downloads)
 - recommended: **latest** [Raspberry Pi OS](https://www.raspberrypi.com/software/) (Desktop, Bullseye)
 

diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -1,6 +1,6 @@
 # Quickstart
 
-Here are some simple steps to get CocktailBerry running. You need to have [**Python 3.7**](https://www.python.org/downloads/) or newer and [**git**](https://git-scm.com/downloads) installed.
+Here are some simple steps to get CocktailBerry running. You need to have [**Python 3.9**](https://www.python.org/downloads/) or newer and [**git**](https://git-scm.com/downloads) installed.
 
 Run:
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "CocktailBerry"
-version = "1.12.0"
+version = "1.12.1"
 description = "A Python and Qt based App for a Cocktail Machine on a Raspberry Pi. Easily serve Cocktails with Raspberry Pi and Python"
 authors = ["Andre Wohnsland <Andre_Wohnsland@web.de>"]
 readme = "readme.md"

diff --git a/readme.md b/readme.md
@@ -49,7 +49,7 @@ In addition, there is the possibility to use and set up a second device as a das
 
 # Quickstart
 
-Here are some simple steps to get CocktailBerry running. You need to have **Python 3.7** or newer and **git** installed.
+Here are some simple steps to get CocktailBerry running. You need to have **Python 3.9** or newer and **git** installed.
 
 Run:
 

diff --git a/src/__init__.py b/src/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.12.0"
+__version__ = "1.12.1"
 PROJECT_NAME = "CocktailBerry"
 MAX_SUPPORTED_BOTTLES = 16
 SUPPORTED_LANGUAGES = ["en", "de"]

diff --git a/src/ui/styles/_elements.scss b/src/ui/styles/_elements.scss
@@ -204,16 +204,23 @@ QListWidget {
   border: $default-element-border;
   border-bottom-right-radius: $scrollbar-border-radius + 6px;
   border-top-right-radius: $scrollbar-border-radius + 6px;
+  & QScrollBar:vertical {
+    border-right: 0px solid $border;
+  }
+}
+
+QScrollArea QScrollBar:vertical {
+  border-right: $default-element-border;
 }
 
 /* Moving List Widget here from the single objects */
 QScrollBar:vertical {
   border: $default-element-border;
-  border-right: 0px solid $border;
+  border-right: 1px solid $border;
   border-radius: $scrollbar-border-radius;
   background: $background;
   width: 40px;
-  margin: 25px 0 25px 0;
+  margin: 25px 0px 25px 0px;
 }
 
 QScrollBar::handle:vertical {

diff --git a/src/ui/styles/alien.css b/src/ui/styles/alien.css
@@ -160,15 +160,20 @@ QListWidget {
   border: 2px solid #586c5b;
   border-bottom-right-radius: 21px;
   border-top-right-radius: 21px; }
+  QListWidget QScrollBar:vertical {
+    border-right: 0px solid #586c5b; }
+
+QScrollArea QScrollBar:vertical {
+  border-right: 2px solid #586c5b; }
 
 /* Moving List Widget here from the single objects */
 QScrollBar:vertical {
   border: 2px solid #586c5b;
-  border-right: 0px solid #586c5b;
+  border-right: 1px solid #586c5b;
   border-radius: 15px;
   background: #111111;
   width: 40px;
-  margin: 25px 0 25px 0; }
+  margin: 25px 0px 25px 0px; }
 
 QScrollBar::handle:vertical {
   background: #00dd4a;

diff --git a/src/ui/styles/bavaria.css b/src/ui/styles/bavaria.css
@@ -160,15 +160,20 @@ QListWidget {
   border: 2px solid #0b0e41;
   border-bottom-right-radius: 21px;
   border-top-right-radius: 21px; }
+  QListWidget QScrollBar:vertical {
+    border-right: 0px solid #0b0e41; }
+
+QScrollArea QScrollBar:vertical {
+  border-right: 2px solid #0b0e41; }
 
 /* Moving List Widget here from the single objects */
 QScrollBar:vertical {
   border: 2px solid #0b0e41;
-  border-right: 0px solid #0b0e41;
+  border-right: 1px solid #0b0e41;
   border-radius: 15px;
   background: #dad9d9;
   width: 40px;
-  margin: 25px 0 25px 0; }
+  margin: 25px 0px 25px 0px; }
 
 QScrollBar::handle:vertical {
   background: #007bff;

diff --git a/src/ui/styles/berry.css b/src/ui/styles/berry.css
@@ -160,15 +160,20 @@ QListWidget {
   border: 2px solid #6f6f87;
   border-bottom-right-radius: 21px;
   border-top-right-radius: 21px; }
+  QListWidget QScrollBar:vertical {
+    border-right: 0px solid #6f6f87; }
+
+QScrollArea QScrollBar:vertical {
+  border-right: 2px solid #6f6f87; }
 
 /* Moving List Widget here from the single objects */
 QScrollBar:vertical {
   border: 2px solid #6f6f87;
-  border-right: 0px solid #6f6f87;
+  border-right: 1px solid #6f6f87;
   border-radius: 15px;
   background: #0d0d0d;
   width: 40px;
-  margin: 25px 0 25px 0; }
+  margin: 25px 0px 25px 0px; }
 
 QScrollBar::handle:vertical {
   background: #3a4cbf;

diff --git a/src/ui/styles/default.css b/src/ui/styles/default.css
@@ -160,15 +160,20 @@ QListWidget {
   border: 2px solid #616161;
   border-bottom-right-radius: 21px;
   border-top-right-radius: 21px; }
+  QListWidget QScrollBar:vertical {
+    border-right: 0px solid #616161; }
+
+QScrollArea QScrollBar:vertical {
+  border-right: 2px solid #616161; }
 
 /* Moving List Widget here from the single objects */
 QScrollBar:vertical {
   border: 2px solid #616161;
-  border-right: 0px solid #616161;
+  border-right: 1px solid #616161;
   border-radius: 15px;
   background: #0d0d0d;
   width: 40px;
-  margin: 25px 0 25px 0; }
+  margin: 25px 0px 25px 0px; }
 
 QScrollBar::handle:vertical {
   background: #007bff;