Merge pull request #252 from JaKooLit/development-wallust

Merging - Wallust Branch to Development Branch..

9 files changed, 64 insertions, 39 deletions

diff --git a/config/rofi/.current_wallpaper b/config/rofi/.current_wallpaper
index e575d150..164ab723 120000
--- a/config/rofi/.current_wallpaper
+++ b/config/rofi/.current_wallpaper
@@ -1 +1 @@
-/home/ja/Pictures/wallpapers/CuteCat.png
\ No newline at end of file
+/home/ja/Pictures/wallpapers/IT_guy.png
\ No newline at end of file
diff --git a/config/rofi/config-search.rasi b/config/rofi/config-search.rasi
index 2fc2f475..5e398782 100644
--- a/config/rofi/config-search.rasi
+++ b/config/rofi/config-search.rasi
@@ -12,13 +12,11 @@ window {
 /* ---- Inputbar ---- */
 inputbar {
     enabled: true;
-    padding: 2px;
-    margin: 2px;
 }
 
 /* ---- Mainbox ---- */
 mainbox {
-	padding: 2px;
+	padding: 0px;
     children: [ "entry"];
 }
 
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index 3cfecc41..e887e9f3 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -36,15 +36,15 @@ element {
   orientation: vertical;
   padding: 0px;
   spacing: 0px;
-  border-radius: 12px;
+  border-radius: 15px;
 }
 
 element-icon {
-  size: 15%;
+  size: 20%;
 }
 
 element-text {
-  font: "Fira Code SemiBold 8";
+  font: "Fira Code SemiBold 12";
   vertical-align: 0.5;
   horizontal-align: 0.5;
 }
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 2c8b9658..bc6f2d7f 100755
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -19,8 +19,8 @@ configuration {
 	dpi:						1;
 }
 
-/* ---- Load pywal colors ---- */
-@theme "~/.cache/wal/colors-rofi-dark.rasi"
+/* ---- Load wallust colors ---- */
+@theme "~/.config/rofi/wallust/colors-rofi.rasi"
 
 /* ---- Global Properties ---- */
 * {
@@ -50,11 +50,12 @@ window {
 
     // Style Values
     width:                      50%;
-    background-color:           #00000099;
+    background-color:           @background;
 }
 
 /* ----- Main Box ----- */
 mainbox {
+	padding:					 15px;
     enabled:                     true;
     orientation:                 vertical;
     children:                    [ "inputbar", "listbox" ];
@@ -78,13 +79,13 @@ inputbar {
 entry {
     enabled:                     true;
     expand:                      false;
-    width:                       300px;
+    width:                       20%;
     padding:                     10px;
     border-radius:               12px;
-    background-color:            @background-alt;
-    text-color:                  inherit;
+    background-color:            @selected;
+    text-color:                  @text-selected;
     cursor:                      text;
-    placeholder:                 "🔎  Search "; // << Search symbol
+    placeholder:                 "🔎 Search "; // << Search symbol
     placeholder-color:           inherit;
 }
 
@@ -133,7 +134,7 @@ button {
     padding:                     12px;
     border-radius:               12px;
     background-color:            @background-alt;
-    text-color:                  inherit;
+    text-color:                  @selected;
     cursor:                      pointer;
 }
 button selected {
@@ -154,8 +155,8 @@ scrollbar {
 element {
     enabled:                     true;
     spacing:                     10px;
-    padding:                     4px;
-    border-radius:               10px;
+    padding:                     10px;
+    border-radius:               12px;
     background-color:            transparent;
     cursor:                      pointer;
 }
diff --git a/config/rofi/pywal-color/Readme.md b/config/rofi/pywal-color/Readme.md
deleted file mode 100644
index 5e2da85d..00000000
--- a/config/rofi/pywal-color/Readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# NOTE!!
-
-This is symlink from ~/.cache/wal/colors-rofi-dark.rasi or ~/.cache/wal/colors-rofi-dark.rasi. Do not delete this folder and files else rofi theme wont be loaded.
\ No newline at end of file
diff --git a/config/rofi/pywal-color/pywal-theme.rasi b/config/rofi/pywal-color/pywal-theme.rasi
deleted file mode 100644
index b7d485d8..00000000
--- a/config/rofi/pywal-color/pywal-theme.rasi
+++ /dev/null
@@ -1 +0,0 @@
-This is only for symlink
\ No newline at end of file
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 2c8b9658..bc6f2d7f 100755
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -19,8 +19,8 @@ configuration {
 	dpi:						1;
 }
 
-/* ---- Load pywal colors ---- */
-@theme "~/.cache/wal/colors-rofi-dark.rasi"
+/* ---- Load wallust colors ---- */
+@theme "~/.config/rofi/wallust/colors-rofi.rasi"
 
 /* ---- Global Properties ---- */
 * {
@@ -50,11 +50,12 @@ window {
 
     // Style Values
     width:                      50%;
-    background-color:           #00000099;
+    background-color:           @background;
 }
 
 /* ----- Main Box ----- */
 mainbox {
+	padding:					 15px;
     enabled:                     true;
     orientation:                 vertical;
     children:                    [ "inputbar", "listbox" ];
@@ -78,13 +79,13 @@ inputbar {
 entry {
     enabled:                     true;
     expand:                      false;
-    width:                       300px;
+    width:                       20%;
     padding:                     10px;
     border-radius:               12px;
-    background-color:            @background-alt;
-    text-color:                  inherit;
+    background-color:            @selected;
+    text-color:                  @text-selected;
     cursor:                      text;
-    placeholder:                 "🔎  Search "; // << Search symbol
+    placeholder:                 "🔎 Search "; // << Search symbol
     placeholder-color:           inherit;
 }
 
@@ -133,7 +134,7 @@ button {
     padding:                     12px;
     border-radius:               12px;
     background-color:            @background-alt;
-    text-color:                  inherit;
+    text-color:                  @selected;
     cursor:                      pointer;
 }
 button selected {
@@ -154,8 +155,8 @@ scrollbar {
 element {
     enabled:                     true;
     spacing:                     10px;
-    padding:                     4px;
-    border-radius:               10px;
+    padding:                     10px;
+    border-radius:               12px;
     background-color:            transparent;
     cursor:                      pointer;
 }
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index ae3a7b7a..9c2e73ea 100755
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -20,7 +20,7 @@ configuration {
 }
 
 /* ---- Load pywal colors ---- */
-@theme "~/.cache/wal/colors-rofi-dark.rasi"
+@theme "~/.config/rofi/wallust/colors-rofi.rasi"
 
 /* ---- Global Properties ---- */
 * {
@@ -50,11 +50,12 @@ window {
 
     // Style Values
     width:                      40%;
-    background-color:           #00000099;
+    background-color:           @background;
 }
 
 /* ----- Main Box ----- */
 mainbox {
+	padding:					 15px;
     enabled:                     true;
     orientation:                 vertical;
     children:                    [ "inputbar", "listbox" ];
@@ -78,13 +79,13 @@ inputbar {
 entry {
     enabled:                     true;
     expand:                      false;
-    width:                       300px;
+    width:                       18%;
     padding:                     10px;
     border-radius:               12px;
-    background-color:            @background-alt;
+    background-color:            @selected;
     text-color:                  @text-selected;
     cursor:                      text;
-    placeholder:                 "🔎  Search "; // << Search symbol
+    placeholder:                 "🔍 Search "; // << Search symbol
     placeholder-color:           inherit;
 }
 
@@ -133,7 +134,7 @@ button {
     padding:                     12px;
     border-radius:               12px;
     background-color:            @background-alt;
-    text-color:                  inherit;
+    text-color:                  @selected;
     cursor:                      pointer;
 }
 button selected {
@@ -154,8 +155,8 @@ scrollbar {
 element {
     enabled:                     true;
     spacing:                     10px;
-    padding:                     4px;
-    border-radius:               10px;
+    padding:                     10px;
+    border-radius:               12px;
     background-color:            transparent;
     cursor:                      pointer;
 }
diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi
new file mode 100644
index 00000000..39aab891
--- /dev/null
+++ b/config/rofi/wallust/colors-rofi.rasi
@@ -0,0 +1,28 @@
+* {
+active-background: #9E2517;
+active-foreground: #E2FECE;
+normal-background: #010102;
+normal-foreground: #E2FECE;
+urgent-background: #595213;
+urgent-foreground: #E2FECE;
+
+alternate-active-background: #010102;
+alternate-active-foreground: #E2FECE;
+alternate-normal-background: #010102;
+alternate-normal-foreground: #E2FECE;
+alternate-urgent-background: #010102;
+alternate-urgent-foreground: #E2FECE;
+
+selected-active-background: #595213;
+selected-active-foreground: #E2FECE;
+selected-normal-background: #CDF5B1;
+selected-normal-foreground: #E2FECE;
+selected-urgent-background: #0AE59C;
+selected-urgent-foreground: #E2FECE;
+
+background-color: #010102;
+background: rgba(0,0,0,0.7);
+foreground: #CDF5B1;
+border-color: #010102;
+}
+