Fixed firefox issues

src/gtk-3.0/sass/_apps.scss

@@ -1147,7 +1147,6 @@ window.background:not(.csd) {
     > scrollbar,
     > frame > border { border-color: $firefox_border_color; }
 
-    > entry,
     > button > button {
       border: 1px solid $firefox_border_color;
       border-radius: 2px + 1px;
@@ -1188,20 +1187,7 @@ window.background:not(.csd) {
     > checkbutton > check { @extend %small_check; }
     > radiobutton > radio { @extend %small_radio; }
 
-    // remove ugly border around the menus
-    > window > menu,
-    > menu > menu { border: none; }
-
-    // Firefox now uses this for selected items
-    text:selected { @extend %firefox_selected_items; }
-    text { color: $firefox_fg_color; }
-
-  }
-}
-
-// for backwards compatibility
-window.background:not(.csd) {
-  > widget {
+    // for backwards compatibility
     > menubar {
       color: $secondary_headerbar_fg_color;
 
@@ -1210,38 +1196,55 @@ window.background:not(.csd) {
     }
 
     > frame { color: $firefox_border_color; }
+  }
 
-    > checkbutton > check,
-    > radiobutton > radio {
-      min-height: 16px;
-      min-width: 16px;
-      margin: 0;
-      padding: 0;
+  // menu, .menu {
+  //   border: none;
+  //   background-color: if($variant =='light', $base_color, $bg_color);
+  //
+  //   menuitem {
+  //     &, label { color: $secondary_fg_color; }
+  //     &:hover, label:hover { color: $inversed_fg_color; }
+  //     &:disabled, label:disabled { color: $disabled_secondary_fg_color; }
+  //   }
+  // }
+  > menu,
+  > menu > menu {
+    border: none;
+    background-color: $base_color;
+
+    menuitem {
+      &, label { color: $secondary_fg_color; }
+      &:hover, label:hover { color: $inversed_fg_color; }
+      &:disabled, label:disabled { color: $disabled_secondary_fg_color; }
+    }
+  }
+
+  > window > menu {
+    menuitem {
+      transition: none; // Fixed plank menu background issue
     }
   }
 
+  // Firefox now uses this for selected items
+  text:selected { @extend %firefox_selected_items; }
+
   > menu > separator { color: $borders_color; }
-  > menu > menuitem > label:disabled { color: $disabled_menu_fg_color; }
 }
 
 //
 // Firefox Quantum
 //
-
 #MozillaGtkWidget.background {
-  &,
-  decoration { border-radius: 0 0 0 0; } // enforce radius
+  &, decoration { border-radius: 0 0 0 0; } // enforce radius
 
   // FIXME: unset all our specific titlebuttons
   // until upstream stops rendering useless (weird) icons
   headerbar.titlebar {
     border-radius: 0 0 0 0;
 
     &.default-decoration button.titlebutton {
-      min-width: 16px;
-      min-height: 16px;
-      margin: 6px 2px;
-      padding: 0;
+      @extend %windows_button;
     }
   }
 
@@ -1310,6 +1313,7 @@ window.background:not(.csd) {
       text {
         background-color: transparent;
         color: $firefox_fg_color;
+
         &:selected,
         &:selected:focus,
         selection { @extend %firefox_selected_items; }
@@ -2039,7 +2043,6 @@ window.background {
 
       entry,
       spinbutton:not(.vertical) { @extend %flat_entry; }
-
       spinbutton:not(.vertical) entry { @extend %spinbutton_entry; }
 
       infobar { button { @extend %selected_button; }}
@@ -2159,7 +2162,7 @@ menuitem calendar,
 menuitem calendar .button,
 menuitem calendar .header,
 menuitem calendar .view {
-    background-color: $menu_bg_color;
-    color: $menu_fg_color;
-    padding: 2px 6px;
+  background-color: $menu_bg_color;
+  color: $menu_fg_color;
+  padding: 2px 6px;
 }

src/gtk-3.0/sass/_colors-public.scss

@@ -99,4 +99,3 @@ $wm_bg_unfocused: $headerbar_bg_color;
 // group-ed and unfocused window 'line(s)'
 @define-color budgie_tasklist_indicator_color_active_window #{"" + mix($topbar_theme_color, $topbar_bg_color, 54%)};
 @define-color budgie_tasklist_indicator_color_attention #{"" + $warning_color};
-

src/gtk-3.0/sass/_colors.scss

@@ -54,7 +54,7 @@ $darker_bg_color: if($variant =='dark', if($color == 'ruby' or $color == 'black'
 $darker_fg_color: if($variant =='light', if($color == 'ruby' or $color == 'black' or $color == 'white', #222222, #212329), #DDDDDD);
 
 // Headerbar colors
-$headerbar_fg_color: if($headerbar =='dark', $dark_contrast_color, $fg_color);
+$headerbar_fg_color: if($headerbar =='dark', $darker_contrast_color, $fg_color);
 $secondary_headerbar_fg_color: if($headerbar =='dark', $secondary_inversed_fg_color, $secondary_fg_color);
 $disabled_headerbar_fg_color: if($headerbar =='dark', $disabled_secondary_inversed_fg_color, $disabled_fg_color);
 
@@ -85,8 +85,8 @@ $topbar_theme_color: if($color == 'black' or $color =='white', $darker_contrast_
 $alt_topbar_theme_color: if($color == 'black' and $color =='white', $darker_contrast_color, $accent_color);
 
 $menu_bg_color: if($headerbar =='light', $base_color, $headerbar_bg_color);
-$menu_fg_color: if($headerbar =='light', $fg_color, $headerbar_fg_color);
-$disabled_menu_fg_color: if($headerbar =='light' and $variant =='light', rgba(#000, 0.5), rgba(#fff, 0.5));
+$menu_fg_color: if($headerbar =='light', $secondary_fg_color, $secondary_headerbar_fg_color);
+$disabled_menu_fg_color: rgba($menu_fg_color, 0.3);
 
 $tab_color: $inverse_theme_color;
 $secondary_titlebar_color: $primary_color;

src/gtk-3.0/sass/_common.scss

@@ -260,7 +260,6 @@ spinner {
 %entry_native {
   .background & {
     @include entry(normal);
-    border: none;
     &:focus {
       @include entry(focus);
     }
@@ -287,7 +286,6 @@ entry {
   %entry_basic, & {
     min-height: $medium_size;
     padding: 0 8px;
-    border-radius: 2px;
 
     // fallback entries for non-native apps
     @extend %entry_fallback;
@@ -884,42 +882,31 @@ button:visited {
 //
 spinbutton {
   &:not(.vertical) {
+    padding: 0;
     // in this horizontal configuration, the whole spinbutton
     // behaves as the entry, so we extend the entry styling
     // and nuke the style on the internal entry
     @extend %entry_fallback;
     @extend %entry_native;
-    padding: 0;
+
+    &, .background:not(.csd) {
+      border: 1px solid $solid_borders_color;
+
+      &:focus { border: 1px solid $primary_color; }
+    }
 
     %spinbutton_entry,
     entry {
       &, // unset all of fallback mode
       &:focus,
       &:disabled {
-      min-width: $large_size - 8px * 2;
-      // reset all the other props since the spinbutton node is styled here
-      margin: 0;
-      border: none;
-      border-radius: 0;
-      box-shadow: none;
-      background-color: transparent;
-      //
-      // This will help to simplify spinbutton's code, but unfortunatelly
-      // doesn't work properly in :dir(rtl). It needs z-index property.
-      //
-      // min-width: $large_size - 8px;
-      //
-      // $spinbuttons_width: $small_size * 2 + $container_padding * 3;
-      //
-      // &:dir(ltr) {
-      //   margin-right: -$spinbuttons_width;
-      //   padding-right: $spinbuttons_width;
-      // }
-      //
-      // &:dir(rtl) {
-      //   margin-left: -$spinbuttons_width;
-      //   padding-left: $spinbuttons_width;
-      // }
+        min-width: $large_size - 8px * 2;
+        // reset all the other props since the spinbutton node is styled here
+        margin: 0;
+        border: none;
+        border-radius: 0;
+        box-shadow: none;
+        background-color: transparent;
       }
     }
 
@@ -973,7 +960,6 @@ spinbutton {
       @extend %simple_flat_button;
 
       &.up { border-radius: 2px 2px 0 0; }
-
       &.down { border-radius: 0 0 2px 2px; }
     }
   }
@@ -1007,7 +993,6 @@ combobox {
 
   // fallback combo node for non-native apps
   @extend %entry_fallback_normal;
-  border-radius: 2px;
 
   .background & { // unset all properties in combobox node
     border: unset;
@@ -1086,19 +1071,15 @@ combobox {
   > box > button.combo { @extend %linked_middle; }
 
   &:first-child > box > button.combo { @extend %linked:first-child; }
-
   &:last-child > box > button.combo { @extend %linked:last-child; }
-
   &:only-child > box > button.combo { @extend %linked:only-child; }
 }
 
 .linked.vertical > combobox {
   > box > button.combo { @extend %linked_vertical_middle; }
 
   &:first-child > box > button.combo { @extend %linked_vertical:first-child; }
-
   &:last-child > box > button.combo { @extend %linked_vertical:last-child; }
-
   &:only-child > box > button.combo { @extend %linked_vertical:only-child; }
 }
 
@@ -1648,7 +1629,6 @@ treeview.view {
     border-color: $accent_color;
 
     &.after { border-top-style: none; }
-
     &.before { border-bottom-style: none; }
   }
 
@@ -1657,20 +1637,17 @@ treeview.view {
     -gtk-icon-transform: rotate(-90deg);
 
     &:dir(rtl) { -gtk-icon-transform: rotate(90deg); }
-
     &:checked { -gtk-icon-transform: unset; }
 
     color: $secondary_fg_color;
 
     &:hover, &:active { color: $fg_color; }
-
     &:disabled { color: $disabled_secondary_fg_color; }
 
     &:selected {
       color: $secondary_inversed_fg_color;
 
       &:hover, &:active { color: $inversed_fg_color; }
-
       &:disabled { color: $disabled_secondary_inversed_fg_color; }
     }
   }
@@ -1744,7 +1721,7 @@ menubar,
   > menuitem {
     min-height: 20px;
     padding: 4px 8px;
-    color: $headerbar_fg_color;
+    color: $secondary_headerbar_fg_color;
 
     &:hover { //Seems like it :hover even with keyboard focus
       transition: background-color $shorter_duration $deceleration_curve;
@@ -1774,6 +1751,7 @@ menu,
   }
 
   menuitem {
+    transition: background-color $shorter_duration $deceleration_curve;
     min-height: 20px;
     min-width: 40px;
     padding: 4px 8px;
@@ -1782,12 +1760,13 @@ menu,
     color: $menu_fg_color;
 
     &:hover {
-      transition: background-color $shorter_duration $deceleration_curve;
+      transition: none;
       color: $dark_contrast_color;
       background-color: $primary_color;
     }
 
-   &:disabled { color: $disabled_menu_fg_color; }
+   &:disabled, label:disabled { color: $disabled_menu_fg_color; }
+   label { &:dir(rtl), &:dir(ltr) { color: inherit; }}
 
     // submenu indicators
     arrow {
@@ -1804,10 +1783,6 @@ menu,
         margin-right: 8px;
       }
     }
-
-    // avoids labels color being overridden, see
-    // https://bugzilla.gnome.org/show_bug.cgi?id=767058
-    label { &:dir(rtl), &:dir(ltr) { color: inherit; }}
   }
 
   // overflow arrows

src/gtk-3.0/sass/_drawing.scss

@@ -61,13 +61,15 @@ $header_shadow: if($headerbar =='light', $depth_light, $z-depth-dark);
 
   @if $t == normal {
     transition: $shorter_transition, $shadow_transition;
+    border: none;
     border-image: none;
     box-shadow: $z-depth-1;
     background-color: if($fc != $primary_color, $fc, $base_color);
     color: if($fc != $primary_color, $inversed_fg_color, $secondary_fg_color);
   }
 
   @if $t == focus {
+    border: none;
     border-image: none;
     box-shadow: $z-depth-2;
     color: if($fc != $primary_color, $inversed_fg_color, $fg_color);
@@ -83,6 +85,7 @@ $header_shadow: if($headerbar =='light', $depth_light, $z-depth-dark);
     border: 1px solid $darker_borders_color;
     box-shadow: none;
     border-image: none;
+    border-radius: 2px;
     background-color: if($fc != $primary_color, $fc, $base_color);
     color: if($fc != $primary_color, $inversed_fg_color, $secondary_fg_color);
   }
@@ -91,6 +94,7 @@ $header_shadow: if($headerbar =='light', $depth_light, $z-depth-dark);
     border: 1px solid $primary_color;
     box-shadow: none;
     border-image: none;
+    border-radius: 2px;
     background-color: if($fc != $primary_color, $fc, $base_color);
     color: if($fc != $primary_color, $inversed_fg_color, $fg_color);
   }