Merge pull request #523 from JaKooLit/main

Main to Development

7 files changed, 47 insertions, 57 deletions

diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index c90c2fa3..4f83c098 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -45,7 +45,7 @@ element-icon {
 }
 
 element-text {
-  font: "Fira Code SemiBold 12";
+  font: "JetBrainsMono Nerd Font SemiBold 12";
   vertical-align: 0.5;
   horizontal-align: 0.5;
 }
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 7efc033d..eca05ea6 100755
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -3,36 +3,29 @@
 
 @import "~/.config/rofi/master-config.rasi" 
 
-/* ---- Configuration ---- */
-configuration {
-	font: "Fira Code SemiBold 12";
-}
-
 /* ---- Window ---- */
 window {
-    width:	60%;
+    width:	50%;
 }
 /* ---- Listview ---- */
 listview {
-  columns: 6;
-  lines: 4;
+  columns: 5;
+  lines: 5;
   fixed-height:	true;
 }
 
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 12px 0px 0px 0px;
+  padding: 10px 5px 10px 5px;
   spacing: 6px;
-  border-radius: 12px;
 }
 
 element-icon {
-  size: 6%;
+  size: 3%;
 }
 
 element-text {
-  font: "Fira Code SemiBold 12";
-  vertical-align: 0.5;
+  font: "JetBrainsMono Nerd Font SemiBold 10";
   horizontal-align: 0.5;
 }
\ No newline at end of file
diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi
index ceea4764..8314381a 100644
--- a/config/rofi/master-config.rasi
+++ b/config/rofi/master-config.rasi
@@ -4,7 +4,7 @@
 /* ---- Configuration ---- */
 
 configuration {
-	font:						"Fira Code SemiBold 12";
+	font:						"JetBrainsMono Nerd Font SemiBold 12";
 	modi:                       "drun,run,filebrowser";
     show-icons:                 true;
     display-drun:               "Apps";
@@ -43,7 +43,7 @@ window {
     transparency:               "real";
     cursor:                     "default";
     spacing:                    0px;
-    border:                     4px 0px 4px 0px;
+    border:                     3px 0px 3px 0px;
     border-radius:              30px;
     location:                   center;
     anchor:                     center;
@@ -55,7 +55,7 @@ window {
 
 /* ----- Main Box ----- */
 mainbox {
-	padding:					 15px;
+	padding:					 12px;
     enabled:                     true;
     orientation:                 vertical;
     children:                    [ "inputbar", "listbox" ];
@@ -66,7 +66,7 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                     true;
-    padding:                     10px 10px 100px 10px;
+    padding:                     10px 10px 50px 10px;
     margin:                      10px;
     background-color:            transparent;
     border-radius:               25px;
@@ -144,11 +144,10 @@ button selected {
 
 /* ---- Scrollbar ---- */
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
+    border:       				0;
+    handle-color: 				@border-color;
+    handle-width: 				2px ;
+    padding:      				0;
 }
 
 /* ---- Elements ---- */
@@ -175,7 +174,7 @@ element normal.active {
 }
 
 element selected.normal {
-    border:                      1px 6px 1px 6px;
+    border:                      0px 3px 0px 3px;
     border-radius:               16px;
     border-color:                @selected;
     background-color:            transparent;
@@ -209,7 +208,7 @@ element-icon {
     cursor:                      inherit;
 }
 element-text {
-    font:						"Fira Code SemiBold 12";
+    font:						"JetBrainsMono Nerd Font SemiBold 12";
     background-color:            transparent;
     text-color:                  inherit;
     cursor:                      inherit;
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 4f30098d..eca05ea6 100755
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -5,27 +5,27 @@
 
 /* ---- Window ---- */
 window {
-    width:	60%;
+    width:	50%;
 }
 /* ---- Listview ---- */
 listview {
-  columns: 6;
-  lines: 4;
+  columns: 5;
+  lines: 5;
   fixed-height:	true;
 }
 
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 12px 0px 0px 0px;
+  padding: 10px 5px 10px 5px;
   spacing: 6px;
 }
 
 element-icon {
-  size: 6%;
+  size: 3%;
 }
 
 element-text {
-  font: "Fira Code SemiBold 10";
+  font: "JetBrainsMono Nerd Font SemiBold 10";
   horizontal-align: 0.5;
 }
\ No newline at end of file
diff --git a/config/rofi/resolution/1080p/master-config.rasi b/config/rofi/resolution/1080p/master-config.rasi
index 9a1fd0a9..8314381a 100644
--- a/config/rofi/resolution/1080p/master-config.rasi
+++ b/config/rofi/resolution/1080p/master-config.rasi
@@ -4,7 +4,7 @@
 /* ---- Configuration ---- */
 
 configuration {
-	font:						"Fira Code SemiBold 12";
+	font:						"JetBrainsMono Nerd Font SemiBold 12";
 	modi:                       "drun,run,filebrowser";
     show-icons:                 true;
     display-drun:               "Apps";
@@ -43,7 +43,7 @@ window {
     transparency:               "real";
     cursor:                     "default";
     spacing:                    0px;
-    border:                     4px 0px 4px 0px;
+    border:                     3px 0px 3px 0px;
     border-radius:              30px;
     location:                   center;
     anchor:                     center;
@@ -144,11 +144,10 @@ button selected {
 
 /* ---- Scrollbar ---- */
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
+    border:       				0;
+    handle-color: 				@border-color;
+    handle-width: 				2px ;
+    padding:      				0;
 }
 
 /* ---- Elements ---- */
@@ -175,7 +174,7 @@ element normal.active {
 }
 
 element selected.normal {
-    border:                      1px 6px 1px 6px;
+    border:                      0px 3px 0px 3px;
     border-radius:               16px;
     border-color:                @selected;
     background-color:            transparent;
@@ -209,7 +208,7 @@ element-icon {
     cursor:                      inherit;
 }
 element-text {
-    font:						"Fira Code SemiBold 12";
+    font:						"JetBrainsMono Nerd Font SemiBold 12";
     background-color:            transparent;
     text-color:                  inherit;
     cursor:                      inherit;
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index d8d3fe17..c8b3deb2 100755
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -5,7 +5,7 @@
 
 /* ---- Window ---- */
 window {
-    width:	60%;
+    width:	50%;
 }
 
 /* ---- Mode Switcher ---- */
@@ -15,23 +15,23 @@ button {
 
 /* ---- Listview ---- */
 listview {
-  columns: 6;
-  lines: 4;
+  columns: 5;
+  lines: 5;
   fixed-height:	true;
 }
 
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 12px 0px 0px 0px;
+  padding: 10px 5px 10px 5px;
   spacing: 6px;
 }
 
 element-icon {
-  size: 5%;
+  size: 3%;
 }
 
 element-text {
-  font: "Fira Code SemiBold 12";
+  font: "JetBrainsMono Nerd Font SemiBold 12";
   horizontal-align: 0.5;
 }
diff --git a/config/rofi/resolution/1440p/master-config.rasi b/config/rofi/resolution/1440p/master-config.rasi
index 908bf17a..430dff61 100644
--- a/config/rofi/resolution/1440p/master-config.rasi
+++ b/config/rofi/resolution/1440p/master-config.rasi
@@ -4,7 +4,7 @@
 /* ---- Configuration ---- */
 
 configuration {
-	font:						"Fira Code SemiBold 13";
+	font:						"JetBrainsMono Nerd Font SemiBold 12";
 	modi:                       "drun,run,filebrowser";
     show-icons:                 true;
     display-drun:               "Apps";
@@ -43,7 +43,7 @@ window {
     transparency:               "real";
     cursor:                     "default";
     spacing:                    0px;
-    border:                     4px 0px 4px 0px;
+    border:                     3px 0px 3px 0px;
     border-radius:              30px;
     location:                   center;
     anchor:                     center;
@@ -69,7 +69,7 @@ inputbar {
     padding:                     10px 10px 50px 10px;
     margin:                      10px;
     background-color:            transparent;
-    border-radius:               25px;
+    border-radius:               20px;
     orientation:                 horizontal;
     children:                    ["entry", "dummy", "mode-switcher" ];
     background-image:            url("~/.config/rofi/.current_wallpaper", width);
@@ -144,18 +144,17 @@ button selected {
 
 /* ---- Scrollbar ---- */
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
+    border:       				0;
+    handle-color: 				@border-color;
+    handle-width: 				2px ;
+    padding:      				0;
 }
 
 /* ---- Elements ---- */
 element {
     enabled:                     true;
     spacing:                     10px;
-    padding:                     10px;
+  	padding: 					 10px;
     border-radius:               12px;
     background-color:            transparent;
     cursor:                      pointer;
@@ -175,7 +174,7 @@ element normal.active {
 }
 
 element selected.normal {
-    border:                      1px 6px 1px 6px;
+    border:                      0px 3px 0px 3px;
     border-radius:               16px;
     border-color:                @selected;
     background-color:            transparent;
@@ -209,7 +208,7 @@ element-icon {
     cursor:                      inherit;
 }
 element-text {
-    font:						"Fira Code SemiBold 16";
+    font:						"JetBrainsMono Nerd Font SemiBold 14";
     background-color:            transparent;
     text-color:                  inherit;
     cursor:                      inherit;