From e8dd80a05964bda4f40fa5c476bd579f5c8b630d Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Mon, 18 Sep 2017 07:21:08 +0200
Subject: [PATCH 1/5] Update theme generator rasi theme

---
 _layouts/generator.html | 142 +++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 73 deletions(-)

diff --git a/_layouts/generator.html b/_layouts/generator.html
index 6c4ff6cb..987a736c 100644
--- a/_layouts/generator.html
+++ b/_layouts/generator.html
@@ -76,96 +76,92 @@ rofi.color-enabled: true</span></pre><p id="command">rofi</p>
     var rasi_theme_body = "\n\n"+
         "#window {\n"+
         "    border:     1;\n"+
-        "    foreground: @foreground;\n"+
-        "    background: rgba ( 0, 0, 0, 0 % );\n"+
+        "    spacing:    2;\n"+
+        "    border-color: @foreground;\n"+
+        "    background-color: rgba ( 0, 0, 0, 0 % );\n"+
         "    padding:    5;\n"+
         "}\n"+
-        "#window.box {\n"+
-        "    foreground: @bordercolor;\n"+
-        "    background: @background;\n"+
+        "#window {\n"+
+        "    border:     1;\n"+
+        "    padding:    5;\n"+
+        "    background-color: @background;\n"+
         "}\n"+
-        "#window.mainbox {\n"+
+        "#mainbox {\n"+
         "    border:  0;\n"+
         "    padding: 0;\n"+
         "}\n"+
-        "#window.mainbox.message.box {\n"+
-        "    border:     1px dash 0px 0px ;\n"+
-        "    foreground: @separatorcolor;\n"+
-        "    padding:    2px 0px 0px ;\n"+
+        "#message {\n"+
+        "    border:  1px dash 0px 0px ;\n"+
+        "    padding: 2px 0px 0px ;\n"+
+        "    border-color: @separatorcolor;\n"+
         "}\n"+
-        "#window.mainbox.message.normal {\n"+
-        "    foreground: @foreground;\n"+
+        "#textbox {\n"+
+        "    text-color: @foreground;\n"+
         "}\n"+
-        "#window.mainbox.listview {\n"+
+        "#listview {\n"+
+        "    border-color: @separatorcolor;\n"+
+        "}\n"+
+        "#listview {\n"+
         "    fixed-height: 0;\n"+
         "    border:       2px dash 0px 0px ;\n"+
         "    padding:      2px 0px 0px ;\n"+
         "}\n"+
-        "#window.mainbox.listview.element {\n"+
+        "#element {\n"+
+        "    border: 0;\n"+
+        "}\n"+
+        "#element normal.normal {\n"+
+        "    text-color: @normal-foreground;\n"+
+        "    background-color: @normal-background;\n"+
+        "}\n"+
+        "#element normal.urgent {\n"+
+        "    text-color: @urgent-foreground;\n"+
+        "    background-color: @urgent-background;\n"+
+        "}\n"+
+        "#element normal.active {\n"+
+        "    text-color: @active-foreground;\n"+
+        "    background-color: @active-background;\n"+
+        "}\n"+
+        "#element selected.normal {\n"+
+        "    text-color: @selected-normal-foreground;\n"+
+        "    background-color: @selected-normal-background;\n"+
+        "}\n"+
+        "#element selected.urgent {\n"+
+        "    text-color: @selected-urgent-foreground;\n"+
+        "    background-color: @selected-urgent-background;\n"+
+        "}\n"+
+        "#element selected.active {\n"+
+        "    text-color: @selected-active-foreground;\n"+
+        "    background-color: @selected-active-background;\n"+
+        "}\n"+
+        "#element alternate.normal {\n"+
+        "    text-color: @alternate-normal-foreground;\n"+
+        "    background-color: @alternate-normal-background;\n"+
+        "}\n"+
+        "#element alternate.urgent {\n"+
+        "    text-color: @alternate-urgent-foreground;\n"+
+        "    background-color: @alternate-urgent-background;\n"+
+        "}\n"+
+        "#element alternate.active {\n"+
+        "    text-color: @alternate-active-foreground;\n"+
+        "    background-color: @alternate-active-background;\n"+
+        "}\n"+
+        "#scrollbar {\n"+
         "    border:  0;\n"+
-        "    padding: 1px ;\n"+
+        "    width: 4px;\n"+
+        "    padding: 0;\n"+
+        "    handle-color: @normal-foreground;\n"+
         "}\n"+
-        "#window.mainbox.listview.element.normal.normal {\n"+
-        "    foreground: @normal-foreground;\n"+
-        "    background: @normal-background;\n"+
+        "#sidebar {\n"+
+        "    border:       2px dash 0px 0px ;\n"+
+        "    border-color: @separatorcolor;\n"+
         "}\n"+
-        "#window.mainbox.listview.element.normal.urgent {\n"+
-        "    foreground: @urgent-foreground;\n"+
-        "    background: @urgent-background;\n"+
+        "#button selected {\n"+
+        "    background-color: @selected-normal-background;\n"+
+        "    text-color:       @selected-normal-foreground;\n"+
         "}\n"+
-        "#window.mainbox.listview.element.normal.active {\n"+
-        "    foreground: @active-foreground;\n"+
-        "    background: @active-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.element.selected.normal {\n"+
-        "    foreground: @selected-normal-foreground;\n"+
-        "    background: @selected-normal-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.element.selected.urgent {\n"+
-        "    foreground: @selected-urgent-foreground;\n"+
-        "    background: @selected-urgent-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.element.selected.active {\n"+
-        "    foreground: @selected-active-foreground;\n"+
-        "    background: @selected-active-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.element.alternate.normal {\n"+
-        "    foreground: @alternate-normal-foreground;\n"+
-        "    background: @alternate-normal-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.element.alternate.urgent {\n"+
-        "    foreground: @alternate-urgent-foreground;\n"+
-        "    background: @alternate-urgent-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.element.alternate.active {\n"+
-        "    foreground: @alternate-active-foreground;\n"+
-        "    background: @alternate-active-background;\n"+
-        "}\n"+
-        "#window.mainbox.listview.scrollbar {\n"+
-        "    width:        4px ;\n"+
-        "    border:       0;\n"+
-        "    handle-width: 8px ;\n"+
-        "    padding:      0;\n"+
-        "}\n"+
-        "#window.mainbox.listview.box {\n"+
-        "    scrollbar: true;\n"+
-        "    spacing:   2px ;\n"+
-        "}\n"+
-        "#window.mainbox.sidebar.box {\n"+
-        "    border: 2px dash 0px 0px ;\n"+
-        "}\n"+
-        "#window.mainbox.sidebar.button.selected {\n"+
-        "    foreground: @selected-normal-foreground;\n"+
-        "    background: @selected-normal-background;\n"+
-        "}\n"+
-        "#window.mainbox.inputbar {\n"+
+        "#inputbar, case-indicator, entry, prompt {\n"+
         "    spacing: 0;\n"+
-        "}\n"+
-        "#window.mainbox.inputbar.box {\n"+
-        "    border: 0px ;\n"+
-        "}\n"+
-        "#window.mainbox.inputbar.normal {\n"+
-        "    foreground: @foreground;\n"+
+        "    text-color:      @normal-foreground;\n"+
         "}\n"+
         "";
     var colors = {

From 7413df3563478464786addf71680086e95e4040a Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Mon, 18 Sep 2017 07:38:37 +0200
Subject: [PATCH 2/5] Set color css style.

---
 _layouts/generator.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/generator.html b/_layouts/generator.html
index 987a736c..aa4513da 100644
--- a/_layouts/generator.html
+++ b/_layouts/generator.html
@@ -336,7 +336,7 @@ rofi.color-enabled: true</span></pre><p id="command">rofi</p>
         var command_value = command.getElementsByClassName(name);
         command_value[0].textContent = value;
         var rasi_value = rasi.getElementsByClassName(name);
-        rasi_value[0].textContent = value;
+        rasi_value[0].textContent = css;
         if ( do_save )
         {
             save[name] = value;

From b62f2ce24bb5ba6ea819464cd2d9755dfe356242 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Mon, 18 Sep 2017 07:43:14 +0200
Subject: [PATCH 3/5] Update default theme

---
 _layouts/generator.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/_layouts/generator.html b/_layouts/generator.html
index aa4513da..3fa0b167 100644
--- a/_layouts/generator.html
+++ b/_layouts/generator.html
@@ -74,12 +74,10 @@ rofi.color-enabled: true</span></pre><p id="command">rofi</p>
         }
     }
     var rasi_theme_body = "\n\n"+
-        "#window {\n"+
-        "    border:     1;\n"+
+        "#* {\n"+
         "    spacing:    2;\n"+
         "    border-color: @foreground;\n"+
-        "    background-color: rgba ( 0, 0, 0, 0 % );\n"+
-        "    padding:    5;\n"+
+        "    background-color: transparent;\n"+
         "}\n"+
         "#window {\n"+
         "    border:     1;\n"+

From bfcbffcf57419f439f32b6fda39efef6fdb52a8b Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Mon, 18 Sep 2017 07:44:00 +0200
Subject: [PATCH 4/5] typo

---
 _layouts/generator.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/generator.html b/_layouts/generator.html
index 3fa0b167..234cacbd 100644
--- a/_layouts/generator.html
+++ b/_layouts/generator.html
@@ -74,7 +74,7 @@ rofi.color-enabled: true</span></pre><p id="command">rofi</p>
         }
     }
     var rasi_theme_body = "\n\n"+
-        "#* {\n"+
+        "* {\n"+
         "    spacing:    2;\n"+
         "    border-color: @foreground;\n"+
         "    background-color: transparent;\n"+

From 4304e2d5127b41d7e07be418b19fcfabb6a1d818 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Mon, 18 Sep 2017 07:48:55 +0200
Subject: [PATCH 5/5] small update to default theme

---
 _layouts/generator.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/generator.html b/_layouts/generator.html
index 234cacbd..8f87e010 100644
--- a/_layouts/generator.html
+++ b/_layouts/generator.html
@@ -157,7 +157,7 @@ rofi.color-enabled: true</span></pre><p id="command">rofi</p>
         "    background-color: @selected-normal-background;\n"+
         "    text-color:       @selected-normal-foreground;\n"+
         "}\n"+
-        "#inputbar, case-indicator, entry, prompt {\n"+
+        "#inputbar, case-indicator, entry, prompt, button {\n"+
         "    spacing: 0;\n"+
         "    text-color:      @normal-foreground;\n"+
         "}\n"+