don't rely on the GTK theme too much

4 files changed, 90 insertions, 20 deletions

diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
index 605fa92..23675f2 100644
--- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
@@ -63,7 +63,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path);
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
-  background-color: -moz-Dialog;
+  background-color: $bg_color;
 }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
@@ -3015,8 +3015,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Findbar */
 .browserContainer > findbar {
-  background-color: -moz-dialog;
-  color: -moz-DialogText;
+  background-color: $bg_color;
+  color: $fg_color;
   border-top: 1px solid;
   -moz-border-top-colors: $borders_color;
   text-shadow: none;
@@ -3024,7 +3024,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .browserContainer > findbar .findbar-textbox {
   -moz-appearance: none;
+  color: $fg_color;
   border: 1px solid $entry_border;
+  background-color: $entry_bg;
   box-shadow: none;
   margin: 0;
   padding: 5px;
@@ -3032,6 +3034,18 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
   &[focused="true"] { border-color: $selected_bg_color; }
 
+  &[status="notfound"] {
+    background-color: $error_color;
+    border-color: darken($error_color, 8%);
+    color: $selected_fg_color;
+  }
+
+  &[flash="true"] {
+    background-color: $warning_color;
+    border-color: darken($warning_color, 8%);
+    color: $selected_fg_color;
+  }
+
   &:-moz-locale-dir(ltr) {
     border-radius: 20px 0 0 20px;
     border-right-width: 0;
@@ -3112,6 +3126,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-box-align: stretch;
 }
 
+//Selected tab color
+.tabbrowser-tab[selected="true"],
+.tabbrowser-tab[selected="true"]:hover,
+.tabbrowser-tab:not([selected="true"]):hover {
+  color: $fg_color;
+}
+
 /* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
 .tabbrowser-tab[visuallyselected=true] {
   position: relative;
@@ -3428,8 +3449,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #TabsToolbar:not(:-moz-lwtheme) {
-  -moz-appearance: menubar;
-  color: -moz-menubartext;
+  -moz-appearance: none;
+  color: $header_fg;
+  background: opacify($header_bg, 1);
 }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
index 4b453d7..1a8a7af 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
@@ -41,7 +41,7 @@
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
-  background-color: -moz-Dialog; }
+  background-color: #444852; }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   padding-top: 1px;
@@ -2271,21 +2271,31 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Findbar */
 .browserContainer > findbar {
-  background-color: -moz-dialog;
-  color: -moz-DialogText;
+  background-color: #444852;
+  color: #D3DAE3;
   border-top: 1px solid;
   -moz-border-top-colors: #2d3036;
   text-shadow: none; }
 
 .browserContainer > findbar .findbar-textbox {
   -moz-appearance: none;
+  color: #D3DAE3;
   border: 1px solid #2d3036;
+  background-color: #383c45;
   box-shadow: none;
   margin: 0;
   padding: 5px;
   width: 14em; }
   .browserContainer > findbar .findbar-textbox[focused="true"] {
     border-color: #5294E2; }
+  .browserContainer > findbar .findbar-textbox[status="notfound"] {
+    background-color: #FC4138;
+    border-color: #fb1b10;
+    color: #ffffff; }
+  .browserContainer > findbar .findbar-textbox[flash="true"] {
+    background-color: #F27835;
+    border-color: #ef5f0f;
+    color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
     border-radius: 20px 0 0 20px;
     border-right-width: 0; }
@@ -2345,6 +2355,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabbrowser-tab {
   -moz-box-align: stretch; }
 
+.tabbrowser-tab[selected="true"],
+.tabbrowser-tab[selected="true"]:hover,
+.tabbrowser-tab:not([selected="true"]):hover {
+  color: #D3DAE3; }
+
 /* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
 .tabbrowser-tab[visuallyselected=true] {
   position: relative;
@@ -2578,8 +2593,9 @@ lwtHeader;*/
   margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); }
 
 #TabsToolbar:not(:-moz-lwtheme) {
-  -moz-appearance: menubar;
-  color: -moz-menubartext; }
+  -moz-appearance: none;
+  color: rgba(207, 218, 231, 0.8);
+  background: #2f343b; }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
index 94768a2..fa3a898 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
@@ -41,7 +41,7 @@
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
-  background-color: -moz-Dialog; }
+  background-color: #F5F6F7; }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   padding-top: 1px;
@@ -2271,21 +2271,31 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Findbar */
 .browserContainer > findbar {
-  background-color: -moz-dialog;
-  color: -moz-DialogText;
+  background-color: #F5F6F7;
+  color: #5c616c;
   border-top: 1px solid;
   -moz-border-top-colors: #dcdfe3;
   text-shadow: none; }
 
 .browserContainer > findbar .findbar-textbox {
   -moz-appearance: none;
+  color: #5c616c;
   border: 1px solid #cfd6e6;
+  background-color: #ffffff;
   box-shadow: none;
   margin: 0;
   padding: 5px;
   width: 14em; }
   .browserContainer > findbar .findbar-textbox[focused="true"] {
     border-color: #5294E2; }
+  .browserContainer > findbar .findbar-textbox[status="notfound"] {
+    background-color: #FC4138;
+    border-color: #fb1b10;
+    color: #ffffff; }
+  .browserContainer > findbar .findbar-textbox[flash="true"] {
+    background-color: #F27835;
+    border-color: #ef5f0f;
+    color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
     border-radius: 20px 0 0 20px;
     border-right-width: 0; }
@@ -2345,6 +2355,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabbrowser-tab {
   -moz-box-align: stretch; }
 
+.tabbrowser-tab[selected="true"],
+.tabbrowser-tab[selected="true"]:hover,
+.tabbrowser-tab:not([selected="true"]):hover {
+  color: #5c616c; }
+
 /* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
 .tabbrowser-tab[visuallyselected=true] {
   position: relative;
@@ -2578,8 +2593,9 @@ lwtHeader;*/
   margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); }
 
 #TabsToolbar:not(:-moz-lwtheme) {
-  -moz-appearance: menubar;
-  color: -moz-menubartext; }
+  -moz-appearance: none;
+  color: rgba(207, 218, 231, 0.8);
+  background: #2f343b; }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css
index 61027ab..e78c95e 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-light.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css
@@ -41,7 +41,7 @@
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
-  background-color: -moz-Dialog; }
+  background-color: #F5F6F7; }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   padding-top: 1px;
@@ -2271,21 +2271,31 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Findbar */
 .browserContainer > findbar {
-  background-color: -moz-dialog;
-  color: -moz-DialogText;
+  background-color: #F5F6F7;
+  color: #5c616c;
   border-top: 1px solid;
   -moz-border-top-colors: #dcdfe3;
   text-shadow: none; }
 
 .browserContainer > findbar .findbar-textbox {
   -moz-appearance: none;
+  color: #5c616c;
   border: 1px solid #cfd6e6;
+  background-color: #ffffff;
   box-shadow: none;
   margin: 0;
   padding: 5px;
   width: 14em; }
   .browserContainer > findbar .findbar-textbox[focused="true"] {
     border-color: #5294E2; }
+  .browserContainer > findbar .findbar-textbox[status="notfound"] {
+    background-color: #FC4138;
+    border-color: #fb1b10;
+    color: #ffffff; }
+  .browserContainer > findbar .findbar-textbox[flash="true"] {
+    background-color: #F27835;
+    border-color: #ef5f0f;
+    color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
     border-radius: 20px 0 0 20px;
     border-right-width: 0; }
@@ -2345,6 +2355,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabbrowser-tab {
   -moz-box-align: stretch; }
 
+.tabbrowser-tab[selected="true"],
+.tabbrowser-tab[selected="true"]:hover,
+.tabbrowser-tab:not([selected="true"]):hover {
+  color: #5c616c; }
+
 /* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
 .tabbrowser-tab[visuallyselected=true] {
   position: relative;
@@ -2578,8 +2593,9 @@ lwtHeader;*/
   margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); }
 
 #TabsToolbar:not(:-moz-lwtheme) {
-  -moz-appearance: menubar;
-  color: -moz-menubartext; }
+  -moz-appearance: none;
+  color: rgba(82, 93, 118, 0.8);
+  background: #e7e8eb; }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {