1 files changed, 68 insertions, 43 deletions
diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tab.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
index 3b07d0ac3..860c0011f 100644
--- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
+++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
@@ -89,6 +89,10 @@
         }
     }
 
+    .#{$prefix}tab-disabled {
+        @include opacity(1);
+    }
+
     .#{$prefix}border-box {
         .#{$prefix}tab-default-top {
             height: $tab-height + top($tabbar-top-strip-border-width);
@@ -318,17 +322,25 @@
 
     @if not $supports-gradients or $compile-all {
         .#{$prefix}nlg {
-            .#{$prefix}tab-top { background-image: theme-image($theme-name, 'tab/tab-default-top-bg.gif'); }
-            .#{$prefix}tab-bottom { background-image: theme-image($theme-name, 'tab/tab-default-bottom-bg.gif'); }
+            @if $tab-background-gradient != null {
+                .#{$prefix}tab-top { background-image: theme-background-image($theme-name, 'tab/tab-default-top-bg.gif'); }
+                .#{$prefix}tab-bottom { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-bg.gif'); }
+            }
 
-            .#{$prefix}tab-top-over { background-image: theme-image($theme-name, 'tab/tab-default-top-over-bg.gif'); }
-            .#{$prefix}tab-bottom-over { background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-bg.gif'); }
+            @if $tab-background-gradient-over != null {
+                .#{$prefix}tab-top-over { background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-bg.gif'); }
+                .#{$prefix}tab-bottom-over { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-bg.gif'); }
+            }
 
-            .#{$prefix}tab-top-active { background-image: theme-image($theme-name, 'tab/tab-default-top-active-bg.gif'); }
-            .#{$prefix}tab-bottom-active { background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-bg.gif'); }
+            @if $tab-background-gradient-active != null {
+                .#{$prefix}tab-top-active { background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-bg.gif'); }
+                .#{$prefix}tab-bottom-active { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-bg.gif'); }
+            }
 
-            .#{$prefix}tab-top-disabled { background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-bg.gif') !important; }
-            .#{$prefix}tab-bottom-disabled { background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif') !important; }
+            @if $tab-background-gradient-disabled != null {
+                .#{$prefix}tab-top-disabled { background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-bg.gif') !important; }
+                .#{$prefix}tab-bottom-disabled { background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif') !important; }
+            }
         }
     }
 
@@ -345,7 +357,8 @@
         font-size: 0;
         line-height: 0;
         text-indent: -999px;
-        background: theme-image($theme-name, $tab-closable-icon) no-repeat;
+        background: no-repeat;
+        background-image: theme-background-image($theme-name, $tab-closable-icon);
         @include opacity(.6);
     }
     .#{$prefix}tab-close-btn:hover {
@@ -361,16 +374,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-over-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-over-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-over;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-over-bg.gif');
+                @if $tab-background-gradient-over != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-over;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-top-over-bg.gif');
+                    }
                 }
             }
 
@@ -381,16 +396,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-over;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-over-bg.gif');
+                @if $tab-background-gradient-over != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-over;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-over-bg.gif');
+                    }
                 }
             }
 
@@ -401,16 +418,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-active-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-active-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-active;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-active-bg.gif');
+                @if $tab-background-gradient-active != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-active;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-top-active-bg.gif');
+                    }
                 }
             }
 
@@ -421,16 +440,18 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-color: $tab-base-color-active;
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-active-bg.gif');
+                @if $tab-background-gradient-active != null {
+                    .#{$prefix}frame-mc {
+                        background-color: $tab-base-color-active;
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-active-bg.gif');
+                    }
                 }
             }
 
@@ -441,15 +462,17 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-top-disabled-bg.gif');
+                @if $tab-background-gradient-disabled != null {
+                    .#{$prefix}frame-mc {
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-top-disabled-bg.gif');
+                    }
                 }
             }
 
@@ -460,15 +483,17 @@
                 .#{$prefix}frame-br,
                 .#{$prefix}frame-tc,
                 .#{$prefix}frame-bc {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-corners.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-corners.gif');
                 }
                 .#{$prefix}frame-ml,
                 .#{$prefix}frame-mr {
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-sides.gif');
+                    background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-sides.gif');
                 }
-                .#{$prefix}frame-mc {
-                    background-repeat: repeat-x;
-                    background-image: theme-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif');
+                @if $tab-background-gradient-disabled != null {
+                    .#{$prefix}frame-mc {
+                        background-repeat: repeat-x;
+                        background-image: theme-background-image($theme-name, 'tab/tab-default-bottom-disabled-bg.gif');
+                    }
                 }
             }
         }