Deluge
diff options
Diffstat (limited to 'deluge/ui/web/resources/themes')
79 files changed, 544 insertions, 375 deletions
diff --git a/deluge/ui/web/resources/themes/images/access/boundlist/trigger-arrow.png b/deluge/ui/web/resources/themes/images/access/boundlist/trigger-arrow.png Binary files differnew file mode 100644 index 000000000..11daac3da --- /dev/null +++ b/deluge/ui/web/resources/themes/images/access/boundlist/trigger-arrow.png diff --git a/deluge/ui/web/resources/themes/images/access/grid/refresh-disabled.gif b/deluge/ui/web/resources/themes/images/access/grid/refresh-disabled.gif Binary files differnew file mode 100644 index 000000000..607800b85 --- /dev/null +++ b/deluge/ui/web/resources/themes/images/access/grid/refresh-disabled.gif diff --git a/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-bg.png b/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-bg.png Binary files differdeleted file mode 100644 index a7b1a2662..000000000 --- a/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-bg.png +++ /dev/null diff --git a/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-bg.gif b/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-default-bg.gif Binary files differindex 37e336943..37e336943 100644 --- a/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-bg.gif +++ b/deluge/ui/web/resources/themes/images/access/tab-bar/tab-bar-default-bg.gif diff --git a/deluge/ui/web/resources/themes/images/access/tree/drop-above.gif b/deluge/ui/web/resources/themes/images/access/tree/drop-above.gif Binary files differnew file mode 100644 index 000000000..30d1ca710 --- /dev/null +++ b/deluge/ui/web/resources/themes/images/access/tree/drop-above.gif diff --git a/deluge/ui/web/resources/themes/images/access/tree/drop-append.gif b/deluge/ui/web/resources/themes/images/access/tree/drop-append.gif Binary files differnew file mode 100644 index 000000000..b22cd1448 --- /dev/null +++ b/deluge/ui/web/resources/themes/images/access/tree/drop-append.gif diff --git a/deluge/ui/web/resources/themes/images/access/tree/drop-below.gif b/deluge/ui/web/resources/themes/images/access/tree/drop-below.gif Binary files differnew file mode 100644 index 000000000..85f66b1e5 --- /dev/null +++ b/deluge/ui/web/resources/themes/images/access/tree/drop-below.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-focus-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-focus-corners.gif Binary files differindex 72f9621f7..697108e9c 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-focus-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-focus-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-over-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-over-corners.gif Binary files differindex 1917e9534..91cdc04e6 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-over-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-over-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif Binary files differindex ff7095ee1..ce1852df7 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif Binary files differindex 0cd360ffa..c5f926b10 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-over-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-over-corners.gif Binary files differindex 0cd360ffa..c5f926b10 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-over-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-over-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif Binary files differindex 101d52025..049c3386b 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-focus-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-focus-corners.gif Binary files differindex 9cbda0275..a0ed287cf 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-focus-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-focus-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-over-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-over-corners.gif Binary files differindex d13db5ea7..1f89ac579 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-over-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-over-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif Binary files differindex 9359ff07b..b36e11153 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif Binary files differindex 94b427512..e1f77cfa5 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif Binary files differindex 94b427512..e1f77cfa5 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif Binary files differindex 8a0ded10e..02e660e99 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif Binary files differindex e657d5fac..361fc557b 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif Binary files differindex e657d5fac..361fc557b 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif Binary files differindex 57811a806..b1d183ba9 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif Binary files differindex 7b444e5db..770311967 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif Binary files differindex 7b444e5db..770311967 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif Binary files differindex 1144f86b1..2f60752e7 100644 --- a/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif b/deluge/ui/web/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif Binary files differnew file mode 100644 index 000000000..6aeab5b98 --- /dev/null +++ b/deluge/ui/web/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif b/deluge/ui/web/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif Binary files differnew file mode 100644 index 000000000..bd64f3288 --- /dev/null +++ b/deluge/ui/web/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif b/deluge/ui/web/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif Binary files differindex d0f507b6a..5b01cf906 100644 --- a/deluge/ui/web/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif +++ b/deluge/ui/web/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif b/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif Binary files differindex 7f4ae3f39..84368f093 100644 --- a/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif +++ b/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif b/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif Binary files differindex 841a33aeb..396aad782 100644 --- a/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif b/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif Binary files differindex 617536ebd..f5e887f18 100644 --- a/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif +++ b/deluge/ui/web/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif b/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif Binary files differindex 1f84c3657..1e50a8cf0 100644 --- a/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif +++ b/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif b/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif Binary files differindex a0b38a372..2eccc81e4 100644 --- a/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif b/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif Binary files differindex fb362b04b..641602a61 100644 --- a/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif +++ b/deluge/ui/web/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif diff --git a/deluge/ui/web/resources/themes/images/default/tip/tip-corners.gif b/deluge/ui/web/resources/themes/images/default/tip/tip-corners.gif Binary files differindex 8724870ba..e26ea6e70 100644 --- a/deluge/ui/web/resources/themes/images/default/tip/tip-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/tip/tip-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif Binary files differindex 168a58a7e..518848255 100644 --- a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif +++ b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif diff --git a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-left-sides.gif b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-left-sides.gif Binary files differindex d3346b29f..8c0c187a9 100644 --- a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-left-sides.gif +++ b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-left-sides.gif diff --git a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-right-sides.gif b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-right-sides.gif Binary files differindex 8ebb60955..0a31ccd83 100644 --- a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-right-sides.gif +++ b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-right-sides.gif diff --git a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-corners.gif b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-corners.gif Binary files differindex e5f47d075..7978dd8fd 100644 --- a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-corners.gif +++ b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-corners.gif diff --git a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-sides.gif b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-sides.gif Binary files differindex 168a58a7e..518848255 100644 --- a/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-sides.gif +++ b/deluge/ui/web/resources/themes/images/default/window-header/window-header-default-top-sides.gif diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/_all.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/_all.scss index 366a643ef..c758115b2 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/_all.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/_all.scss @@ -39,6 +39,7 @@ $include-default-uis: true !default; @include extjs-form; @include extjs-form-field; @include extjs-form-fieldset; + @include extjs-form-file; @include extjs-form-checkboxfield; @include extjs-form-checkboxgroup; @include extjs-form-triggerfield; @@ -66,6 +67,8 @@ $include-default-uis: true !default; @include extjs-html; } + + @include extjs-reset-extras; } @else { @if $include-default { diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/_mixins.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/_mixins.scss index 1a95264e9..65f15db72 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/_mixins.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/_mixins.scss @@ -2,11 +2,14 @@ @import 'mixins/theme-background-image'; @import 'mixins/inner-border'; @import 'mixins/frame'; +@import 'mixins/reset-extras'; @mixin no-select { - -moz-user-select:none; - -khtml-user-select:none; - -webkit-user-select:ignore; + user-select: none; + -o-user-select: none; + -ms-user-select: none; + -moz-user-select: -moz-none; + -webkit-user-select: none; cursor:default; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_core.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_core.scss index 68f1fba50..61346d7df 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_core.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_core.scss @@ -36,7 +36,7 @@ } .#{$prefix}item-disabled { - @include opacity(0.4); + @include opacity(0.3); } .#{$prefix}ie6 .#{$prefix}item-disabled { @@ -152,7 +152,7 @@ float: left; @if $include-shadow-images { - @include theme-background-image($theme-name, 'shared/shadow.png'); + background-image: theme-background-image($theme-name, 'shared/shadow.png'); } } @@ -163,7 +163,7 @@ height: 100%; @if $include-shadow-images { - @include theme-background-image($theme-name, 'shared/shadow-lr.png'); + background-image: theme-background-image($theme-name, 'shared/shadow-lr.png'); } } @@ -172,7 +172,7 @@ height: 100%; @if $include-shadow-images { - @include theme-background-image($theme-name, 'shared/shadow-c.png'); + background-image: theme-background-image($theme-name, 'shared/shadow-c.png'); } } @@ -248,24 +248,24 @@ } .x-box-tl { - @include theme-background-image($theme-name, 'box/corners.gif'); + background-image: theme-background-image($theme-name, 'box/corners.gif'); } .x-box-tc { - @include theme-background-image($theme-name, 'box/tb.gif'); + background-image: theme-background-image($theme-name, 'box/tb.gif'); } .x-box-tr { - @include theme-background-image($theme-name, 'box/corners.gif'); + background-image: theme-background-image($theme-name, 'box/corners.gif'); } .x-box-ml { - @include theme-background-image($theme-name, 'box/l.gif'); + background-image: theme-background-image($theme-name, 'box/l.gif'); } .x-box-mc { background-color: #eee; - @include theme-background-image($theme-name, 'box/tb.gif'); + background-image: theme-background-image($theme-name, 'box/tb.gif'); font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif; color: #393939; font-size: 15px; @@ -277,27 +277,27 @@ } .x-box-mr { - @include theme-background-image($theme-name, 'box/r.gif'); + background-image: theme-background-image($theme-name, 'box/r.gif'); } .x-box-bl { - @include theme-background-image($theme-name, 'box/corners.gif'); + background-image: theme-background-image($theme-name, 'box/corners.gif'); } .x-box-bc { - @include theme-background-image($theme-name, 'box/tb.gif'); + background-image: theme-background-image($theme-name, 'box/tb.gif'); } .x-box-br { - @include theme-background-image($theme-name, 'box/corners.gif'); + background-image: theme-background-image($theme-name, 'box/corners.gif'); } .x-box-blue .x-box-bl, .x-box-blue .x-box-br, .x-box-blue .x-box-tl, .x-box-blue .x-box-tr { - @include theme-background-image($theme-name, 'box/corners-blue.gif'); + background-image: theme-background-image($theme-name, 'box/corners-blue.gif'); } .x-box-blue .x-box-bc, .x-box-blue .x-box-mc, .x-box-blue .x-box-tc { - @include theme-background-image($theme-name, 'box/tb-blue.gif'); + background-image: theme-background-image($theme-name, 'box/tb-blue.gif'); } .x-box-blue .x-box-mc { @@ -309,9 +309,9 @@ } .x-box-blue .x-box-ml { - @include theme-background-image($theme-name, 'box/l-blue.gif'); + background-image: theme-background-image($theme-name, 'box/l-blue.gif'); } .x-box-blue .x-box-mr { - @include theme-background-image($theme-name, 'box/r-blue.gif'); + background-image: theme-background-image($theme-name, 'box/r-blue.gif'); } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_reset.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_reset.scss index 47792d6a9..f8b86313b 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_reset.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/core/_reset.scss @@ -1,4 +1,12 @@ @if $scope-reset-css { + .#{$prefix}border-box .#{$prefix}reset, + .#{$prefix}border-box .#{$prefix}reset * { + box-sizing:border-box; + -moz-box-sizing:border-box; + -ms-box-sizing:border-box; + -webkit-box-sizing:border-box; + } + .#{$prefix}reset { html, body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, @@ -125,12 +133,14 @@ *:focus { outline:none; } -} -.#{$prefix}border-box .#{$prefix}reset, -.#{$prefix}border-box .#{$prefix}reset * { - box-sizing:border-box; - -moz-box-sizing:border-box; - -ms-box-sizing:border-box; - -webkit-box-sizing:border-box; + .#{$prefix}border-box, + .#{$prefix}border-box * { + box-sizing:border-box; + -moz-box-sizing:border-box; + -ms-box-sizing:border-box; + -webkit-box-sizing:border-box; + } } + + diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/layout/_layout.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/layout/_layout.scss index df79eecdc..7e5e211d8 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/layout/_layout.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/layout/_layout.scss @@ -74,6 +74,10 @@ position: absolute; } + .#{$prefix}fit-item { + position: relative; + } + .#{$prefix}border-layout-ct { background-color: $border-layout-ct-background; } @@ -184,7 +188,7 @@ cursor: pointer; height: $tab-height; background: transparent no-repeat -18px 0; - @include theme-background-image($theme-name, 'tab-bar/scroll-left.gif'); + background-image: theme-background-image($theme-name, 'tab-bar/scroll-left.gif'); } .#{$prefix}toolbar-scroll-left-hover { background-position: 0 0; @@ -198,7 +202,7 @@ } .#{$prefix}toolbar-scroll-left { - @include theme-background-image($theme-name, 'toolbar/scroll-left.gif'); + background-image: theme-background-image($theme-name, 'toolbar/scroll-left.gif'); background-position: -14px 0; } .#{$prefix}toolbar-scroll-left-hover { @@ -232,7 +236,7 @@ cursor: pointer; height: $tab-height; background: transparent no-repeat 0 0; - @include theme-background-image($theme-name, 'tab-bar/scroll-right.gif'); + background-image: theme-background-image($theme-name, 'tab-bar/scroll-right.gif'); } .#{$prefix}toolbar-scroll-right-hover { background-position: -18px 0; @@ -246,7 +250,7 @@ } .#{$prefix}toolbar-scroll-right { - @include theme-background-image($theme-name, 'toolbar/scroll-right.gif'); + background-image: theme-background-image($theme-name, 'toolbar/scroll-right.gif'); } .#{$prefix}toolbar-scroll-right-hover { background-position: -14px 0; @@ -271,7 +275,7 @@ } .#{$prefix}menu-scroll-top { background: transparent no-repeat center center; - @include theme-background-image($theme-name, 'layout/mini-top.gif'); + background-image: theme-background-image($theme-name, 'layout/mini-top.gif'); height: 8px; cursor: pointer; } @@ -283,7 +287,7 @@ } .#{$prefix}menu-scroll-bottom { background: transparent no-repeat center center; - @include theme-background-image($theme-name, 'layout/mini-bottom.gif'); + background-image: theme-background-image($theme-name, 'layout/mini-bottom.gif'); height: 8px; cursor: pointer; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_frame.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_frame.scss index 171c3071c..e681e1cac 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_frame.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_frame.scss @@ -90,7 +90,7 @@ .#{$prefix}nlg { .#{$prefix}#{$cls-ui}-mc { @if $background-gradient != null { - @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-bg.gif', false, $relative-image-path-for-uis); + background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-bg.gif', false, $relative-image-path-for-uis); } @if $background-color != null { background-color: $background-color; @@ -148,7 +148,7 @@ zoom:1; @if $background-color != transparent { - @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-corners.gif', false, $relative-image-path-for-uis); + background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-corners.gif', false, $relative-image-path-for-uis); } } @@ -158,7 +158,7 @@ zoom:1; @if $background-color != transparent { - @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis); + background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis); background-position: 0 0; background-repeat: repeat-x; } @@ -169,7 +169,7 @@ zoom:1; @if $background-color != transparent { - @include theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis); + background-image: theme-background-image($theme-name, '#{$cls}/#{$cls-ui}-sides.gif', false, $relative-image-path-for-uis); background-position: 0 0; @if $background-gradient == null { background-repeat: repeat-y; diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss new file mode 100644 index 000000000..6ef7778f9 --- /dev/null +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss @@ -0,0 +1,144 @@ +@mixin extjs-reset-extras { + .#{$prefix}border-box { + .#{$prefix}reset { + //tab.scss + .#{$prefix}tab-default-top { + height: $tab-height + top($tabbar-top-strip-border-width); + } + .#{$prefix}tab-default-bottom { + height: $tab-height + bottom($tabbar-bottom-strip-border-width); + } + + //qtip.scss + .#{$prefix}tip-anchor { + width: 10px; + height: 10px; + } + + //field.scss + .#{$prefix}form-text { + height: $form-field-height; + } + + textarea.#{$prefix}form-field { + height: auto; + } + + .#{$prefix}field-default-toolbar .#{$prefix}form-text { + height: $form-toolbar-field-height; + } + + //triggerfield.scss + .#{$prefix}form-trigger { + height: $form-trigger-height; + } + + .#{$prefix}field-default-toolbar .#{$prefix}form-trigger { + height: $form-toolbar-trigger-height; + } + + //grid.scss + @if $include-ie or $compile-all { + &.#{$prefix}ie9 { + .#{$prefix}grid-header-ct { + padding-left: 1px; + } + } + } + } + } + + .#{$prefix}webkit { + .#{$prefix}reset { + //form.scss + * { + &:focus { + outline:none !important; + } + } + + //field + .#{$prefix}form-empty-field { + line-height: 15px; + } + + //fieldset + .#{$prefix}fieldset-header { + padding-top: 1px; + } + } + } + + /* Top Tabs */ + @include tab-bar-top-reset( + "tab-bar-top", + "tab-bar-body", + "tab-bar-strip", + $tabbar-top-body-padding, + $tabbar-top-body-border-width, + $tabbar-top-strip-border-width, + $tabbar-strip-height + ); + @include tab-bar-top-reset( + "tab-bar-top", + "tab-bar-body-default-plain", + "tab-bar-strip-default-plain", + $tabbar-top-plain-body-padding, + $tabbar-top-plain-body-border-width, + $tabbar-top-strip-border-width, + $tabbar-strip-height + ); + + /* Bottom Tabs */ + @include tab-bar-bottom-reset( + "tab-bar-bottom", + "tab-bar-body", + "tab-bar-strip", + $tabbar-bottom-body-padding, + $tabbar-bottom-body-border-width, + $tabbar-bottom-strip-border-width, + $tabbar-strip-height + ); + + @include tab-bar-bottom-reset( + "tab-bar-bottom", + "tab-bar-body-default-plain", + "tab-bar-strip-default-plain", + $tabbar-bottom-plain-body-padding, + $tabbar-bottom-plain-body-border-width, + $tabbar-bottom-strip-border-width, + $tabbar-strip-height + ); +} + +@mixin tab-bar-top-reset($toolbarCls, $bodyCls, $stripCls, $body-padding, $body-border-width, $strip-border-width, $strip-height) { + .#{$prefix}border-box { + .#{$prefix}reset { + .#{$prefix}#{$toolbarCls} { + .#{$prefix}#{$bodyCls} { + height: $tab-height + vertical($body-border-width) + vertical($body-padding); + } + + .#{$prefix}#{$stripCls} { + height: $strip-height; + } + } + } + } +} + +@mixin tab-bar-bottom-reset($toolbarCls, $bodyCls, $stripCls, $body-padding, $body-border-width, $strip-border-width, $strip-height) { + .#{$prefix}border-box { + .#{$prefix}reset { + .#{$prefix}#{$toolbarCls} { + .#{$prefix}#{$bodyCls} { + height: $tab-height + vertical($body-border-width) + vertical($body-padding); + } + + .#{$prefix}#{$stripCls} { + height: $strip-height; + } + } + } + } +}
\ No newline at end of file diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss index f673f4df4..f280c4e2a 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss @@ -5,17 +5,21 @@ * but this can be changed by changing the default value of $include-missing-images to * be true. */ -@mixin theme-background-image($theme-name, $path, $without-url: false, $relative: false) { +@function theme-background-image($theme-name, $path, $without-url: false, $relative: false) { $exists_image: theme-image($theme-name, $path, true, false); - + @if $exists_image { $exists: theme_image_exists($exists_image); - @if $exists or $include-missing-images { - background-image: theme-image($theme-name, $path, $without-url, $relative); + @if $exists == true { + @return theme-image($theme-name, $path, $without-url, $relative); } @else { @warn "@theme-background-image: Theme image not found: #{$exists_image}"; + + @if $include-missing-images { + @return theme-image($theme-name, $path, $without-url, $relative); + } } } @else { diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss index 135f61eae..6d0c20a74 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss @@ -63,14 +63,14 @@ } .#{$prefix}dd-drop-nodrop .#{$prefix}dd-drop-icon { - @include theme-background-image($theme-name, 'dd/drop-no.gif'); + background-image: theme-background-image($theme-name, 'dd/drop-no.gif'); } .#{$prefix}dd-drop-ok .#{$prefix}dd-drop-icon { - @include theme-background-image($theme-name, 'dd/drop-yes.gif'); + background-image: theme-background-image($theme-name, 'dd/drop-yes.gif'); } .#{$prefix}dd-drop-ok-add .#{$prefix}dd-drop-icon { - @include theme-background-image($theme-name, 'dd/drop-add.gif'); + background-image: theme-background-image($theme-name, 'dd/drop-add.gif'); } }
\ No newline at end of file diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_messagebox.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_messagebox.scss index 59844ec98..469406a0a 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_messagebox.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_messagebox.scss @@ -29,22 +29,22 @@ } .#{$prefix}message-box .#{$prefix}msg-box-wait { - @include theme-background-image($theme-name, 'shared/blue-loading.gif'); + background-image: theme-background-image($theme-name, 'shared/blue-loading.gif'); } .#{$prefix}message-box .ext-mb-info { - @include theme-background-image($theme-name, 'shared/icon-info.gif'); + background-image: theme-background-image($theme-name, 'shared/icon-info.gif'); } .#{$prefix}message-box .ext-mb-warning { - @include theme-background-image($theme-name, 'shared/icon-warning.gif'); + background-image: theme-background-image($theme-name, 'shared/icon-warning.gif'); } .#{$prefix}message-box .ext-mb-question { - @include theme-background-image($theme-name, 'shared/icon-question.gif'); + background-image: theme-background-image($theme-name, 'shared/icon-question.gif'); } .#{$prefix}message-box .ext-mb-error { - @include theme-background-image($theme-name, 'shared/icon-error.gif'); + background-image: theme-background-image($theme-name, 'shared/icon-error.gif'); } }
\ No newline at end of file diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_resizable.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_resizable.scss index 96205c0b1..5f5cb1c6d 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_resizable.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_resizable.scss @@ -190,33 +190,33 @@ .#{$prefix}resizable-handle-east, .#{$prefix}resizable-handle-west { background-position: left; - @include theme-background-image($theme-name, 'sizer/e-handle.gif'); + background-image: theme-background-image($theme-name, 'sizer/e-handle.gif'); } .#{$prefix}resizable-handle-south, .#{$prefix}resizable-handle-north { background-position: top; - @include theme-background-image($theme-name, 'sizer/s-handle.gif'); + background-image: theme-background-image($theme-name, 'sizer/s-handle.gif'); } .#{$prefix}resizable-handle-southeast { background-position: top left; - @include theme-background-image($theme-name, 'sizer/se-handle.gif'); + background-image: theme-background-image($theme-name, 'sizer/se-handle.gif'); } .#{$prefix}resizable-handle-northwest { background-position: bottom right; - @include theme-background-image($theme-name, 'sizer/nw-handle.gif'); + background-image: theme-background-image($theme-name, 'sizer/nw-handle.gif'); } .#{$prefix}resizable-handle-northeast { background-position: bottom left; - @include theme-background-image($theme-name, 'sizer/ne-handle.gif'); + background-image: theme-background-image($theme-name, 'sizer/ne-handle.gif'); } .#{$prefix}resizable-handle-southwest { background-position: top right; - @include theme-background-image($theme-name, 'sizer/sw-handle.gif'); + background-image: theme-background-image($theme-name, 'sizer/sw-handle.gif'); } } }
\ No newline at end of file diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_splitter.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_splitter.scss index b8ae2aac3..3fc87a63d 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_splitter.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_splitter.scss @@ -32,43 +32,43 @@ .#{$prefix}layout-split-left { background: no-repeat top right; - @include theme-background-image($theme-name, 'util/splitter/mini-left.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-left.gif'); } .#{$prefix}layout-split-right { background: no-repeat top left; - @include theme-background-image($theme-name, 'util/splitter/mini-right.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-right.gif'); } .#{$prefix}layout-split-top { background: no-repeat top left; - @include theme-background-image($theme-name, 'util/splitter/mini-top.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-top.gif'); } .#{$prefix}layout-split-bottom { background: no-repeat top left; - @include theme-background-image($theme-name, 'util/splitter/mini-bottom.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-bottom.gif'); } .#{$prefix}splitter-collapsed { .#{$prefix}layout-split-left { background: no-repeat top left; - @include theme-background-image($theme-name, 'util/splitter/mini-right.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-right.gif'); } .#{$prefix}layout-split-right { background: no-repeat top right; - @include theme-background-image($theme-name, 'util/splitter/mini-left.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-left.gif'); } .#{$prefix}layout-split-top { background: no-repeat top left; - @include theme-background-image($theme-name, 'util/splitter/mini-bottom.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-bottom.gif'); } .#{$prefix}layout-split-bottom { background: no-repeat top left; - @include theme-background-image($theme-name, 'util/splitter/mini-top.gif'); + background-image: theme-background-image($theme-name, 'util/splitter/mini-top.gif'); } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_tool.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_tool.scss index c9eb8df16..5d1a8ec89 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_tool.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/util/_tool.scss @@ -12,7 +12,7 @@ background-color: transparent; background-repeat: no-repeat; - @include theme-background-image($theme-name, 'tools/tool-sprites.gif'); + background-image: theme-background-image($theme-name, 'tools/tool-sprites.gif'); margin: 0; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_core.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_core.scss index cbaf2f01d..2ea7f5017 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_core.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_core.scss @@ -47,7 +47,7 @@ $neutral-color: #eeeeee !default; * @var {boolean} $include-not-found-images * True to include files which are not found when compiling your SASS */ -$include-missing-images: false !default; +$include-missing-images: true !default; /** * @var {boolean} $include-ie diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_menu.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_menu.scss index 161706510..6bbbd3a3e 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_menu.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/variables/_menu.scss @@ -11,6 +11,7 @@ $menu-separator-background-color: #FFF !default; //sizes $menu-item-indent: 27px !default; $menu-padding: 2px !default; +$menu-link-padding: 6px 2px 3px 32px !default; //text $menu-text-color: #222 !default; diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_button.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_button.scss index 7d14febed..6524599e1 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_button.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_button.scss @@ -54,11 +54,22 @@ .#{$prefix}btn-inner { display: block; white-space: nowrap; - text-align: center; background-color: transparent; background-repeat: no-repeat; background-position: left center; } + + .#{$prefix}btn-left .#{$prefix}btn-inner { + text-align: left; + } + + .#{$prefix}btn-center .#{$prefix}btn-inner { + text-align: center; + } + + .#{$prefix}btn-right .#{$prefix}btn-inner { + text-align: right; + } } .#{$prefix}btn-disabled { @@ -167,7 +178,7 @@ } .#{$prefix}btn-arrow { - @include theme-background-image($theme-name, 'button/arrow.gif'); + background-image: theme-background-image($theme-name, 'button/arrow.gif'); display: block; } @@ -176,24 +187,24 @@ .#{$prefix}btn-split-right, .#{$prefix}btn-over .#{$prefix}btn-split-right { background: transparent no-repeat right center; - @include theme-background-image($theme-name, 'button/s-arrow.gif'); + background-image: theme-background-image($theme-name, 'button/s-arrow.gif'); padding-right: $button-split-size !important; } .#{$prefix}btn-split-bottom, .#{$prefix}btn-over .#{$prefix}btn-split-bottom { background: transparent no-repeat center bottom; - @include theme-background-image($theme-name, 'button/s-arrow-b.gif'); + background-image: theme-background-image($theme-name, 'button/s-arrow-b.gif'); padding-bottom: $button-split-size; } .#{$prefix}toolbar .#{$prefix}btn-split-right { - @include theme-background-image($theme-name, 'button/s-arrow-noline.gif'); + background-image: theme-background-image($theme-name, 'button/s-arrow-noline.gif'); padding-right: $button-toolbar-split-size !important; } .#{$prefix}toolbar .#{$prefix}btn-split-bottom { - @include theme-background-image($theme-name, 'button/s-arrow-b-noline.gif'); + background-image: theme-background-image($theme-name, 'button/s-arrow-b-noline.gif'); } .#{$prefix}btn-split { @@ -209,8 +220,8 @@ text-align: inherit; } - .#{$prefix}btn-over .#{$prefix}btn-split-right { @include theme-background-image($theme-name, 'button/s-arrow-o.gif'); } - .#{$prefix}btn-over .#{$prefix}btn-split-bottom { @include theme-background-image($theme-name, 'button/s-arrow-bo.gif'); } + .#{$prefix}btn-over .#{$prefix}btn-split-right { background-image: theme-background-image($theme-name, 'button/s-arrow-o.gif'); } + .#{$prefix}btn-over .#{$prefix}btn-split-bottom { background-image: theme-background-image($theme-name, 'button/s-arrow-bo.gif'); } @include extjs-button-ui( /* UI + Scale */ @@ -707,7 +718,7 @@ right: 0; .#{$prefix}ie6 &, - .#{$prefix}quirks & { + .#{$prefix}quirks .#{$prefix}ie & { width: $icon-size; } } @@ -727,7 +738,7 @@ right: 0; .#{$prefix}ie6 &, - .#{$prefix}quirks & { + .#{$prefix}quirks .#{$prefix}ie & { width: $icon-size; } } @@ -855,16 +866,16 @@ .#{$prefix}frame-br, .#{$prefix}frame-tc, .#{$prefix}frame-bc { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-over-corners.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-over-corners.gif'); } .#{$prefix}frame-ml, .#{$prefix}frame-mr { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-over-sides.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-over-sides.gif'); } .#{$prefix}frame-mc { background-color: $background-color-over; @if $background-gradient-over != null { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-over-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-over-bg.gif'); } } } @@ -876,16 +887,16 @@ .#{$prefix}frame-br, .#{$prefix}frame-tc, .#{$prefix}frame-bc { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-corners.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-corners.gif'); } .#{$prefix}frame-ml, .#{$prefix}frame-mr { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-sides.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-sides.gif'); } .#{$prefix}frame-mc { background-color: $background-color-focus; @if $background-gradient-focus != null { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-bg.gif'); } } } @@ -898,16 +909,16 @@ .#{$prefix}frame-br, .#{$prefix}frame-tc, .#{$prefix}frame-bc { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-corners.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-corners.gif'); } .#{$prefix}frame-ml, .#{$prefix}frame-mr { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-sides.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-sides.gif'); } .#{$prefix}frame-mc { background-color: $background-color-pressed; @if $background-gradient-pressed != null { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-bg.gif'); } } } @@ -919,16 +930,16 @@ .#{$prefix}frame-br, .#{$prefix}frame-tc, .#{$prefix}frame-bc { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-corners.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-corners.gif'); } .#{$prefix}frame-ml, .#{$prefix}frame-mr { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-sides.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-sides.gif'); } .#{$prefix}frame-mc { background-color: $background-color-disabled; @if $background-gradient-disabled != null { - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-bg.gif'); } } } @@ -940,7 +951,7 @@ .#{$prefix}nlg { .#{$prefix}btn-#{$ui} { background-repeat: repeat-x; - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-bg.gif'); } } } @@ -949,7 +960,7 @@ .#{$prefix}nlg { .#{$prefix}btn-#{$ui}-over { background-repeat: repeat-x; - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-over-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-over-bg.gif'); } } } @@ -958,7 +969,7 @@ .#{$prefix}nlg { .#{$prefix}btn-#{$ui}-focus { background-repeat: repeat-x; - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-focus-bg.gif'); } } } @@ -968,7 +979,7 @@ .#{$prefix}btn-#{$ui}-menu-active, .#{$prefix}btn-#{$ui}-pressed { background-repeat: repeat-x; - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-pressed-bg.gif'); } } } @@ -977,7 +988,7 @@ .#{$prefix}nlg { .#{$prefix}btn-#{$ui}-disabled { background-repeat: repeat-x; - @include theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-bg.gif'); + background-image: theme-background-image($theme-name, 'btn/btn-#{$ui}-disabled-bg.gif'); } } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss index 459409c93..d30dc9bb8 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss @@ -66,7 +66,7 @@ right: 5px; a { - @include theme-background-image($theme-name, $datepicker-next-image); + background-image: theme-background-image($theme-name, $datepicker-next-image); } } @@ -74,7 +74,7 @@ left: 5px; a { - @include theme-background-image($theme-name, $datepicker-prev-image); + background-image: theme-background-image($theme-name, $datepicker-prev-image); } } @@ -107,7 +107,7 @@ .#{$prefix}btn-split-right { background: no-repeat right center !important; - @include theme-background-image($theme-name, $datepicker-month-arrow-image); + background-image: theme-background-image($theme-name, $datepicker-month-arrow-image); padding-right: 12px; } @@ -327,12 +327,12 @@ height: 28px; button { - @include theme-background-image($theme-name, $datepicker-tool-sprite-image); + background-image: theme-background-image($theme-name, $datepicker-tool-sprite-image); height: 15px; width: 15px; padding: 0; margin: 6px 12px 5px 15px; - border: none; + border: 0; outline: 0 none; &::-moz-focus-inner { border: 0; @@ -403,7 +403,7 @@ .#{$prefix}nlg { @if $datepicker-header-background-gradient != null { .#{$prefix}datepicker-header { - @include theme-background-image($theme-name, 'datepicker/datepicker-header-bg.gif'); + background-image: theme-background-image($theme-name, 'datepicker/datepicker-header-bg.gif'); background-repeat: repeat-x; background-position: top left; } @@ -412,7 +412,7 @@ @if $datepicker-footer-background-gradient != null { .#{$prefix}datepicker-footer, .#{$prefix}monthpicker-buttons { - @include theme-background-image($theme-name, 'datepicker/datepicker-footer-bg.gif'); + background-image: theme-background-image($theme-name, 'datepicker/datepicker-footer-bg.gif'); background-repeat: repeat-x; background-position: top left; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss index b32c63c0b..0e4722953 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss @@ -8,11 +8,7 @@ } .#{$prefix}surface tspan { - user-select: none; - -o-user-select: none; - -ms-user-select: none; - -moz-user-select: none; - -webkit-user-select: none; + @include no-select; } .#{$prefix}vml-sprite { diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_grid.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_grid.scss index 5c5fb7f16..bd4092a46 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_grid.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_grid.scss @@ -50,6 +50,10 @@ } } + .#{$prefix}accordion-item .#{$prefix}grid-header-ct { + border: 0 none; + } + @if $include-ie or $compile-all { .#{$prefix}border-box .#{$prefix}ie9 { .#{$prefix}grid-header-ct { @@ -125,14 +129,14 @@ .#{$prefix}grid-header-ct, .#{$prefix}column-header { background: repeat-x 0 top; - @include theme-background-image($theme-name, 'grid/column-header-bg.gif'); + background-image: theme-background-image($theme-name, 'grid/column-header-bg.gif'); } .#{$prefix}column-header-over, .#{$prefix}column-header-sort-ASC, .#{$prefix}column-header-sort-DESC { background: #ebf3fd repeat-x 0 top; - @include theme-background-image($theme-name, 'grid/column-header-over-bg.gif'); + background-image: theme-background-image($theme-name, 'grid/column-header-over-bg.gif'); } } } @@ -143,7 +147,7 @@ width: $grid-header-trigger-width; background: no-repeat left center; background-color: #c3daf9; - @include theme-background-image($theme-name, 'grid/grid3-hd-btn.gif'); + background-image: theme-background-image($theme-name, 'grid/grid3-hd-btn.gif'); position: absolute; right: 0; top: 0; @@ -176,12 +180,12 @@ .#{$prefix}column-header-sort-ASC .#{$prefix}column-header-text { padding-right: 16px; background: no-repeat right 6px; - @include theme-background-image($theme-name, 'grid/sort_asc.gif'); + background-image: theme-background-image($theme-name, 'grid/sort_asc.gif'); } .#{$prefix}column-header-sort-DESC .#{$prefix}column-header-text { padding-right: 16px; background: no-repeat right 6px; - @include theme-background-image($theme-name, 'grid/sort_desc.gif'); + background-image: theme-background-image($theme-name, 'grid/sort_desc.gif'); } //grid rows @@ -192,16 +196,14 @@ padding: $grid-row-padding; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: ignore; + @include no-select; .#{$prefix}grid-cell { @if $grid-row-cell-color { color: $grid-row-cell-color; } font: $grid-row-cell-font; - + background-color: $grid-row-cell-background; border-color: $grid-row-cell-border-color; border-style: $grid-row-cell-border-style; border-width: $grid-row-cell-border-width; @@ -274,9 +276,7 @@ font: $grid-cell-font; - -moz-user-select: none; - -khtml-user-select:none; - -webkit-user-select:ignore; + @include no-select; } .#{$prefix}grid-cell-inner { @@ -335,7 +335,7 @@ } .#{$prefix}grid-dirty-cell { - @include theme-background-image($theme-name, 'grid/dirty.gif'); + background-image: theme-background-image($theme-name, 'grid/dirty.gif'); background-position: 0 0; background-repeat: no-repeat; } @@ -353,13 +353,13 @@ .#{$prefix}grid-row .#{$prefix}grid-cell-special, .#{$prefix}grid-row-over .#{$prefix}grid-cell-special { - @include theme-background-image($theme-name, 'grid/cell-special-bg.gif'); + background-image: theme-background-image($theme-name, 'grid/cell-special-bg.gif'); } .#{$prefix}grid-row-focused .#{$prefix}grid-cell-special, .#{$prefix}grid-row-selected .#{$prefix}grid-cell-special { - @include theme-background-image($theme-name, 'grid/cell-special-selected-bg.gif'); + background-image: theme-background-image($theme-name, 'grid/cell-special-selected-bg.gif'); } } } @@ -386,7 +386,7 @@ .#{$prefix}grid-row .#{$prefix}grid-property-name .#{$prefix}grid-cell-inner, .#{$prefix}grid-row-over .#{$prefix}grid-property-name .#{$prefix}grid-cell-inner { padding-left: 12px; - @include theme-background-image($theme-name, 'grid/property-cell-bg.gif'); + background-image: theme-background-image($theme-name, 'grid/property-cell-bg.gif'); background-repeat: no-repeat; background-position: -16px 1px; } @@ -399,9 +399,7 @@ } .#{$prefix}unselectable { - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: ignore; + @include no-select; } .#{$prefix}grid-row-body-hidden { @@ -432,7 +430,7 @@ } .#{$prefix}grid-row-expander { - @include theme-background-image($theme-name, 'grid/group-collapse.gif'); + background-image: theme-background-image($theme-name, 'grid/group-collapse.gif'); background-color: transparent; width: 9px; @@ -446,7 +444,7 @@ .#{$prefix}grid-row-collapsed { .#{$prefix}grid-row-expander { - @include theme-background-image($theme-name, 'grid/group-expand.gif'); + background-image: theme-background-image($theme-name, 'grid/group-expand.gif'); } } @@ -473,11 +471,11 @@ } .col-move-top { - @include theme-background-image($theme-name, 'grid/col-move-top.gif'); + background-image: theme-background-image($theme-name, 'grid/col-move-top.gif'); } .col-move-bottom { - @include theme-background-image($theme-name, 'grid/col-move-bottom.gif'); + background-image: theme-background-image($theme-name, 'grid/col-move-bottom.gif'); } //pading toolbar @@ -510,7 +508,7 @@ .#{$prefix}grid-group-title { background: transparent no-repeat 0 -1px; - @include theme-background-image($theme-name, 'grid/group-collapse.gif'); + background-image: theme-background-image($theme-name, 'grid/group-collapse.gif'); color: $grid-grouped-title-color; font: $grid-grouped-title-font; @@ -520,7 +518,7 @@ .#{$prefix}grid-group-hd-collapsed { .#{$prefix}grid-group-title { - @include theme-background-image($theme-name, 'grid/group-expand.gif'); + background-image: theme-background-image($theme-name, 'grid/group-expand.gif'); } } @@ -529,15 +527,15 @@ } .#{$prefix}grid-group-collapsed .#{$prefix}grid-group-title { - @include theme-background-image($theme-name, 'grid/group-expand.gif'); + background-image: theme-background-image($theme-name, 'grid/group-expand.gif'); } .#{$prefix}group-by-icon { - @include theme-background-image($theme-name, 'grid/group-by.gif'); + background-image: theme-background-image($theme-name, 'grid/group-by.gif'); } .#{$prefix}show-groups-icon { - @include theme-background-image($theme-name, 'grid/group-by.gif'); + background-image: theme-background-image($theme-name, 'grid/group-by.gif'); } .#{$prefix}column-header-checkbox .#{$prefix}column-header-inner { @@ -552,7 +550,7 @@ .#{$prefix}column-header-checkbox .#{$prefix}column-header-text { height: 14px; width: 14px; - @include theme-background-image($theme-name, 'grid/unchecked.gif'); + background-image: theme-background-image($theme-name, 'grid/unchecked.gif'); background-position: -1px -1px; background-repeat: no-repeat; background-color: transparent; @@ -584,7 +582,7 @@ } .#{$prefix}grid-hd-checker-on .#{$prefix}column-header-text { - @include theme-background-image($theme-name, 'grid/checked.gif'); + background-image: theme-background-image($theme-name, 'grid/checked.gif'); } .#{$prefix}grid-row-checker { @@ -595,79 +593,79 @@ .#{$prefix}grid-row-selected .#{$prefix}grid-row-checker, .#{$prefix}grid-row-checked .#{$prefix}grid-row-checker { - @include theme-background-image($theme-name, 'grid/checked.gif'); + background-image: theme-background-image($theme-name, 'grid/checked.gif'); } //grid icons .#{$prefix}tbar-page-first { - background-image: theme-image($theme-name, 'grid/page-first.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-first.gif') !important; } .#{$prefix}tbar-loading { - background-image: theme-image($theme-name, 'grid/refresh.gif') !important; + background-image: theme-background-image($theme-name, 'grid/refresh.gif') !important; } .#{$prefix}tbar-page-last { - background-image: theme-image($theme-name, 'grid/page-last.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-last.gif') !important; } .#{$prefix}tbar-page-next { - background-image: theme-image($theme-name, 'grid/page-next.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-next.gif') !important; } .#{$prefix}tbar-page-prev { - background-image: theme-image($theme-name, 'grid/page-prev.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-prev.gif') !important; } .#{$prefix}item-disabled { .#{$prefix}tbar-loading { - background-image: theme-image($theme-name, 'grid/refresh-disabled.gif') !important; + background-image: theme-background-image($theme-name, 'grid/refresh-disabled.gif') !important; } .#{$prefix}tbar-page-first { - background-image: theme-image($theme-name, 'grid/page-first-disabled.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-first-disabled.gif') !important; } .#{$prefix}tbar-page-last { - background-image: theme-image($theme-name, 'grid/page-last-disabled.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-last-disabled.gif') !important; } .#{$prefix}tbar-page-next { - background-image: theme-image($theme-name, 'grid/page-next-disabled.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-next-disabled.gif') !important; } .#{$prefix}tbar-page-prev { - background-image: theme-image($theme-name, 'grid/page-prev-disabled.gif') !important; + background-image: theme-background-image($theme-name, 'grid/page-prev-disabled.gif') !important; } } //menu icons - .xg-hmenu-sort-asc .#{$prefix}menu-item-icon { - @include theme-background-image($theme-name, 'grid/hmenu-asc.gif'); + .#{$prefix}hmenu-sort-asc .#{$prefix}menu-item-icon { + background-image: theme-background-image($theme-name, 'grid/hmenu-asc.gif'); } - .xg-hmenu-sort-desc .#{$prefix}menu-item-icon { - @include theme-background-image($theme-name, 'grid/hmenu-desc.gif'); + .#{$prefix}hmenu-sort-desc .#{$prefix}menu-item-icon { + background-image: theme-background-image($theme-name, 'grid/hmenu-desc.gif'); } - .xg-hmenu-lock .#{$prefix}menu-item-icon { - @include theme-background-image($theme-name, 'grid/hmenu-lock.gif'); + .#{$prefix}hmenu-lock .#{$prefix}menu-item-icon { + background-image: theme-background-image($theme-name, 'grid/hmenu-lock.gif'); } - .xg-hmenu-unlock .#{$prefix}menu-item-icon { - @include theme-background-image($theme-name, 'grid/hmenu-unlock.gif'); + .#{$prefix}hmenu-unlock .#{$prefix}menu-item-icon { + background-image: theme-background-image($theme-name, 'grid/hmenu-unlock.gif'); } .#{$prefix}group-by-icon { - @include theme-background-image($theme-name, 'grid/group-by.gif'); + background-image: theme-background-image($theme-name, 'grid/group-by.gif'); } .#{$prefix}cols-icon .#{$prefix}menu-item-icon { - @include theme-background-image($theme-name, 'grid/columns.gif'); + background-image: theme-background-image($theme-name, 'grid/columns.gif'); } .#{$prefix}show-groups-icon { - @include theme-background-image($theme-name, 'grid/group-by.gif'); + background-image: theme-background-image($theme-name, 'grid/group-by.gif'); } // Drag/drop indicator styles @@ -682,7 +680,7 @@ position: absolute; top: -8px; left: -12px; - @include theme-background-image($theme-name, 'grid/dd-insert-arrow-right.png'); + background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-right.png'); height: 16px; width: 16px; } @@ -691,7 +689,7 @@ position: absolute; top: -8px; right: -11px; - @include theme-background-image($theme-name, 'grid/dd-insert-arrow-left.png'); + background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-left.png'); height: 16px; width: 16px; } @@ -699,11 +697,11 @@ .#{$prefix}ie6 { .#{$prefix}grid-drop-indicator-left { - @include theme-background-image($theme-name, 'grid/dd-insert-arrow-right.gif'); + background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-right.gif'); } .#{$prefix}grid-drop-indicator-right { - @include theme-background-image($theme-name, 'grid/dd-insert-arrow-left.gif'); + background-image: theme-background-image($theme-name, 'grid/dd-insert-arrow-left.gif'); } } @@ -720,6 +718,7 @@ .#{$prefix}form-display-field { font: $grid-row-editor-font; padding-top: 0; + padding-left: 4px; } .#{$prefix}panel-body { @@ -770,7 +769,7 @@ width: 4px; height: 4px; bottom: 0px; - @include theme-background-image($theme-name, 'panel/panel-default-framed-corners.gif'); + background-image: theme-background-image($theme-name, 'panel/panel-default-framed-corners.gif'); } &-bl { left: 0px; diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss index d03b3a03e..52153093b 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss @@ -42,7 +42,7 @@ //if an icon is defined show it @if $loadmask-msg-inner-icon != null { - background-image: theme-image($theme-name, $loadmask-msg-inner-icon); + background-image: theme-background-image($theme-name, $loadmask-msg-inner-icon); background-repeat: no-repeat; background-position: 5px center; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_menu.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_menu.scss index d3a8e040d..cf17f050c 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_menu.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_menu.scss @@ -7,6 +7,15 @@ background: $menu-background-color !important; padding: $menu-padding; } + + .#{$prefix}menu-item .#{$prefix}form-text { + user-select: text; + -webkit-user-select: text; + -o-user-select: text; + -ie-user-select: text; + -moz-user-select: text; + -ie-user-select: text; + } .#{$prefix}menu-icon-separator { position: absolute; @@ -16,7 +25,7 @@ border-left: solid 1px $menu-separator-border-color; background-color: $menu-separator-background-color; width: 2px; - height: 100%; + height: 100%!important; overflow: hidden; } @@ -47,8 +56,8 @@ .#{$prefix}menu-item-link { display: block; - padding: 0px $menu-padding; margin: 1px; + padding: $menu-link-padding; text-decoration: none !important; line-height: 16px; cursor: default; @@ -67,29 +76,29 @@ .#{$prefix}menu-item-icon { width: 16px; height: 16px; - margin: 4px 11px 0px 2px; + position: absolute; + top: 5px; + left: 4px; background: no-repeat center center; } .#{$prefix}menu-item-text { - position: relative; font-size: ceil($font-size * .9); color: $menu-text-color; - top: -4px; } .#{$prefix}menu-item-checked { .#{$prefix}menu-item-icon { - background-image: theme-image($theme-name, $menu-icon-checked); + background-image: theme-background-image($theme-name, $menu-icon-checked); } .#{$prefix}menu-group-icon { - background-image: theme-image($theme-name, $menu-icon-group-checked); + background-image: theme-background-image($theme-name, $menu-icon-group-checked); } } .#{$prefix}menu-item-unchecked { .#{$prefix}menu-item-icon { - background-image: theme-image($theme-name, $menu-icon-unchecked); + background-image: theme-background-image($theme-name, $menu-icon-unchecked); } .#{$prefix}menu-group-icon { background-image: none; @@ -110,7 +119,8 @@ height: 9px; top: 9px; right: 0px; - background: theme-image($theme-name, $menu-icon-arrow) no-repeat center center; + background: no-repeat center center; + background-image: theme-background-image($theme-name, $menu-icon-arrow); } .#{$prefix}menu-item-indent { @@ -135,11 +145,6 @@ @if $include-ie { .#{$prefix}ie { - .#{$prefix}menu-item-link { - line-height: 17px; - padding-bottom: 1px; - } - .#{$prefix}menu-item-disabled { .#{$prefix}menu-item-icon { @include opacity(.5); @@ -147,7 +152,7 @@ .#{$prefix}menu-item-text { // IE opacity/cleartype bug workaround - background-color: $menu-background-color; + background-color: transparent; } } @@ -174,7 +179,8 @@ @if not $supports-gradients or $compile-all { .#{$prefix}nlg { .#{$prefix}menu-item-active .#{$prefix}menu-item-link { - background: $menu-item-active-background-color theme-image($theme-name, $menu-item-active-background-image) repeat-x left top; + background: $menu-item-active-background-color repeat-x left top; + background-image: theme-background-image($theme-name, $menu-item-active-background-image); } } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_panel.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_panel.scss index f338a1af8..de24a2350 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_panel.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_panel.scss @@ -83,6 +83,12 @@ display: -moz-inline-stack; display: inline-block; } + + .#{$prefix}panel-header-text-container { + overflow: hidden; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + } .#{$prefix}panel-header-text { @include no-select; @@ -263,19 +269,19 @@ @if $ui-header-background-color != null and $ui-header-background-gradient != null { @if not $supports-gradients or $compile-all { .#{$prefix}nlg .#{$prefix}panel-header-#{$ui-label}-top { - background-image: theme-image($theme-name, 'panel-header/panel-header-#{$ui-label}-top-bg.gif'); + background-image: theme-background-image($theme-name, 'panel-header/panel-header-#{$ui-label}-top-bg.gif'); } .#{$prefix}nlg .#{$prefix}panel-header-#{$ui-label}-bottom { - background-image: theme-image($theme-name, 'panel-header/panel-header-#{$ui-label}-bottom-bg.gif'); + background-image: theme-background-image($theme-name, 'panel-header/panel-header-#{$ui-label}-bottom-bg.gif'); } .#{$prefix}nlg .#{$prefix}panel-header-#{$ui-label}-left { - background-image: theme-image($theme-name, 'panel-header/panel-header-#{$ui-label}-left-bg.gif'); + background-image: theme-background-image($theme-name, 'panel-header/panel-header-#{$ui-label}-left-bg.gif'); } .#{$prefix}nlg .#{$prefix}panel-header-#{$ui-label}-right { - background-image: theme-image($theme-name, 'panel-header/panel-header-#{$ui-label}-right-bg.gif'); + background-image: theme-background-image($theme-name, 'panel-header/panel-header-#{$ui-label}-right-bg.gif'); } } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss index bbd41f647..f2df2ca82 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss @@ -108,7 +108,8 @@ .#{$prefix}nlg { .#{$prefix}progress-#{$ui-label} { .#{$prefix}progress-bar { - background: theme-image($theme-name, 'progress/progress-#{$ui-label}-bg.gif') repeat-x; + background: repeat-x; + background-image: theme-background-image($theme-name, 'progress/progress-#{$ui-label}-bg.gif'); } } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss index 2f15fadaa..ffb2a2e7b 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss @@ -141,7 +141,7 @@ .#{$prefix}form-invalid-tip-body { background: 1px 1px no-repeat; - @include theme-background-image($theme-name, 'form/exclamation.gif'); + background-image: theme-background-image($theme-name, 'form/exclamation.gif'); padding-left: 22px; li { diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_slider.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_slider.scss index ee5f09e24..bd478b6ad 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_slider.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_slider.scss @@ -21,9 +21,7 @@ font-size:1px; -moz-outline:0 none; outline:0 none; - -moz-user-select: none; - -khtml-user-select:none; - -webkit-user-select:ignore; + @include no-select; display:block; overflow:hidden; } @@ -100,21 +98,21 @@ .#{$prefix}slider-horz, .#{$prefix}slider-horz .#{$prefix}slider-end, .#{$prefix}slider-horz .#{$prefix}slider-inner { - background-image: theme-image($theme-name, 'slider/slider-bg.png'); + background-image: theme-background-image($theme-name, 'slider/slider-bg.png'); } .#{$prefix}slider-horz .#{$prefix}slider-thumb { - background-image: theme-image($theme-name, 'slider/slider-thumb.png'); + background-image: theme-background-image($theme-name, 'slider/slider-thumb.png'); } .#{$prefix}slider-vert, .#{$prefix}slider-vert .#{$prefix}slider-end, .#{$prefix}slider-vert .#{$prefix}slider-inner { - background-image: theme-image($theme-name, 'slider/slider-v-bg.png'); + background-image: theme-background-image($theme-name, 'slider/slider-v-bg.png'); } .#{$prefix}slider-vert .#{$prefix}slider-thumb { - background-image: theme-image($theme-name, 'slider/slider-v-thumb.png'); + background-image: theme-background-image($theme-name, 'slider/slider-v-thumb.png'); } @if $include-ie { @@ -122,21 +120,21 @@ .#{$prefix}slider-horz, .#{$prefix}slider-horz .#{$prefix}slider-end, .#{$prefix}slider-horz .#{$prefix}slider-inner { - background-image: theme-image($theme-name, 'slider/slider-bg.gif'); + background-image: theme-background-image($theme-name, 'slider/slider-bg.gif'); } .#{$prefix}slider-horz .#{$prefix}slider-thumb { - background-image: theme-image($theme-name, 'slider/slider-thumb.gif'); + background-image: theme-background-image($theme-name, 'slider/slider-thumb.gif'); } .#{$prefix}slider-vert, .#{$prefix}slider-vert .#{$prefix}slider-end, .#{$prefix}slider-vert .#{$prefix}slider-inner { - background-image: theme-image($theme-name, 'slider/slider-v-bg.gif'); + background-image: theme-background-image($theme-name, 'slider/slider-v-bg.gif'); } .#{$prefix}slider-vert .#{$prefix}slider-thumb { - background-image: theme-image($theme-name, 'slider/slider-v-thumb.gif'); + background-image: theme-background-image($theme-name, 'slider/slider-v-thumb.gif'); } } } 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'); + } } } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss index 519171428..211e357e1 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss @@ -10,7 +10,7 @@ } .#{$prefix}nlg .#{$prefix}tab-bar { - background-image: theme-image($theme-name, 'tab-bar/tab-bar-bg.gif'); + background-image: theme-background-image($theme-name, 'tab-bar/tab-bar-default-bg.gif'); } .#{$prefix}tab-bar-default-plain, diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss index c3034af62..a9a8c0169 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss @@ -101,7 +101,7 @@ // Background for overflow button inserted by the Menu box overflow handler within a toolbar .#{$prefix}toolbar-more-icon { - background-image: theme-image($theme-name, 'toolbar/more.gif') !important; + background-image: theme-background-image($theme-name, 'toolbar/more.gif') !important; background-position: 2px center !important; background-repeat: no-repeat; } @@ -110,7 +110,7 @@ 'default', $background-color: $toolbar-background-color, $background-gradient: $toolbar-background-gradient, - $border-color: $tabbar-border-color + $border-color: $toolbar-border-color ); //plain toolbars have no border @@ -149,7 +149,7 @@ @if $background-gradient != null { .#{$prefix}nlg { .#{$prefix}toolbar-#{$ui} { - background-image: theme-image($theme-name, 'toolbar/toolbar-#{$ui}-bg.gif') !important; + background-image: theme-background-image($theme-name, 'toolbar/toolbar-#{$ui}-bg.gif') !important; background-repeat: repeat-x; } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tree.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tree.scss index a09d06ebb..b7029d670 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tree.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/_tree.scss @@ -71,43 +71,43 @@ //elbows .#{$prefix}tree-lines { .#{$prefix}tree-elbow { - background-image: theme-image($theme-name, 'tree/elbow.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow.gif'); } .#{$prefix}tree-elbow-end { - background-image: theme-image($theme-name, 'tree/elbow-end.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end.gif'); } .#{$prefix}tree-elbow-plus { - background-image: theme-image($theme-name, 'tree/elbow-plus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-plus.gif'); } .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-end-plus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end-plus.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-plus { - background-image: theme-image($theme-name, 'tree/elbow-minus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-minus.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-end-minus.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end-minus.gif'); } .#{$prefix}tree-elbow-line { - background-image: theme-image($theme-name, 'tree/elbow-line.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-line.gif'); } } .#{$prefix}tree-no-lines { .#{$prefix}tree-elbow-plus, .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-plus-nl.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-plus-nl.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-plus, .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-elbow-end-plus { - background-image: theme-image($theme-name, 'tree/elbow-end-minus-nl.gif'); + background-image: theme-background-image($theme-name, 'tree/elbow-end-minus-nl.gif'); } } @@ -116,7 +116,7 @@ .#{$prefix}tree-elbow-minus, .#{$prefix}tree-elbow-end-plus, .#{$prefix}tree-elbow-end-minus { - background-image: theme-image($theme-name, 'tree/arrows.gif'); + background-image: theme-background-image($theme-name, 'tree/arrows.gif'); } } @@ -136,16 +136,16 @@ .#{$prefix}tree-icon-leaf { width: $tree-elbow-width; - background-image: theme-image($theme-name, 'tree/leaf.gif'); + background-image: theme-background-image($theme-name, 'tree/leaf.gif'); } .#{$prefix}tree-icon-parent { width: $tree-elbow-width; - background-image: theme-image($theme-name, 'tree/folder.gif'); + background-image: theme-background-image($theme-name, 'tree/folder.gif'); } .#{$prefix}grid-tree-node-expanded .#{$prefix}tree-icon-parent { - background-image: theme-image($theme-name, 'tree/folder-open.gif'); + background-image: theme-background-image($theme-name, 'tree/folder-open.gif'); } .#{$prefix}grid-rowbody { @@ -155,7 +155,7 @@ .#{$prefix}tree-panel .#{$prefix}grid-cell-inner { padding: 0px; } - + .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell { border: none; } @@ -164,29 +164,26 @@ height: $tree-elbow-height; line-height: $tree-elbow-height; - vertical-align: middle; cursor: pointer; + white-space: nowrap; + vertical-align: middle; img { - float: left; - } - } - - .#{$prefix}ie { - .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner { - white-space: normal; + margin-top: 0; + display: inline-block; + vertical-align: top; } } - .#{$prefix}tree-checkbox { - float: left; margin: 2px 3px 0 0; - display: block; + display: inline-block; + vertical-align: top; width: $form-checkbox-size; height: $form-checkbox-size; - background: theme-image($theme-name, $form-checkbox-image) no-repeat; + background: no-repeat; + background-image: theme-background-image($theme-name, $form-checkbox-image); overflow: hidden; padding: 0; @@ -196,6 +193,7 @@ border: 0; } } + @if $include-ie { /* Hack for IE; causes alignment problem in IE9 standards mode so exclude that */ .#{$prefix}nbr.#{$prefix}ie { @@ -212,6 +210,25 @@ .#{$prefix}tree-panel .#{$prefix}grid-cell-inner { border-width: 0 !important; } + + .#{$prefix}ie6 .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img, + .#{$prefix}quirks .#{$prefix}ie .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img { + margin-top: -1px; + vertical-align: middle; + } + .#{$prefix}strict .#{$prefix}ie7 .#{$prefix}tree-panel .#{$prefix}grid-row .#{$prefix}grid-cell-inner img { + margin-top: -3px; + vertical-align: middle; + } + .#{$prefix}ie6 .#{$prefix}tree-checkbox, + .#{$prefix}quirks .#{$prefix}ie7 .#{$prefix}tree-checkbox { + margin-top: 0; + vertical-align: middle; + } + .#{$prefix}strict .#{$prefix}ie7 .#{$prefix}tree-checkbox { + margin-top: -2px; + vertical-align: middle; + } } @if $include-ff { @@ -223,23 +240,23 @@ } .#{$prefix}tree-drop-ok-append .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-append.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-append.gif'); } .#{$prefix}tree-drop-ok-above .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-above.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-above.gif'); } .#{$prefix}tree-drop-ok-below .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-below.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-below.gif'); } .#{$prefix}tree-drop-ok-between .#{$prefix}dd-drop-icon { - background-image: theme-image($theme-name, 'tree/drop-between.gif'); + background-image: theme-background-image($theme-name, 'tree/drop-between.gif'); } .#{$prefix}grid-tree-loading .#{$prefix}tree-icon { - background-image: theme-image($theme-name, 'tree/loading.gif'); + background-image: theme-background-image($theme-name, 'tree/loading.gif'); } .#{$prefix}tree-ddindicator { diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss index 7c27892d9..977a34ad4 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss @@ -50,7 +50,8 @@ font: $form-error-msg-font; line-height: $form-error-msg-line-height; - background: theme-image($theme-name, $form-exclamation-icon) no-repeat 0 2px; + background: no-repeat 0 2px; + background-image: theme-background-image($theme-name, $form-exclamation-icon); } .#{$prefix}form-invalid-icon { @@ -63,7 +64,8 @@ left: 0; top: 0; - background: theme-image($theme-name, $form-exclamation-icon) no-repeat 2px 3px; + background: no-repeat 2px 3px; + background-image: theme-background-image($theme-name, $form-exclamation-icon); ul { /* prevent inner elements from interfering with QuickTip hovering */ diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss index 866184cce..56bec9c1e 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss @@ -10,7 +10,8 @@ width: $form-checkbox-size; height: $form-checkbox-size; - background: theme-image($theme-name, $form-checkbox-image) no-repeat; + background: no-repeat; + background-image: theme-background-image($theme-name, $form-checkbox-image); overflow: hidden; padding: 0; @@ -48,7 +49,7 @@ /* Radios */ .#{$prefix}form-radio { - background-image: theme-image($theme-name, $form-radio-image); + background-image: theme-background-image($theme-name, $form-radio-image); } /* boxLabel */ diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss index 59c2f8deb..e72053806 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss @@ -1,13 +1,14 @@ @mixin extjs-form-checkboxgroup { .#{$prefix}form-checkboxgroup-body { - padding: 3px 4px; + //padding: 3px 4px; } .#{$prefix}form-invalid { .#{$prefix}form-checkboxgroup-body { border: 1px solid #c30; - background: #fff theme-image($theme-name, 'grid/invalid_line.gif') repeat-x bottom; + background: #fff repeat-x bottom; + background-image: theme-background-image($theme-name, 'grid/invalid_line.gif'); padding: 2px 3px; } } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss index 533829c32..4f1df5417 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss @@ -18,7 +18,7 @@ background-color: $form-field-background-color; @if $form-field-background-image { - background-image: theme-image($theme-name, $form-field-background-image); + background-image: theme-background-image($theme-name, $form-field-background-image); } border-color: $form-field-border-color; @@ -52,7 +52,7 @@ background: repeat-x 0 0; background-color: $form-field-background-color; @if $form-field-background-image { - background-image: theme-image($theme-name, $form-field-background-image); + background-image: theme-background-image($theme-name, $form-field-background-image); } resize: none; //Disable browser resizable textarea } @@ -76,7 +76,7 @@ textarea.#{$prefix}form-invalid-field { background-color: $form-field-invalid-background-color; @if $form-field-invalid-background-image { - background-image: theme-image($theme-name, $form-field-invalid-background-image); + background-image: theme-background-image($theme-name, $form-field-invalid-background-image); background-repeat: $form-field-invalid-background-repeat; background-position: $form-field-invalid-background-position; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss index 86cc6c818..c354d166a 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss @@ -2,7 +2,7 @@ .#{$prefix}fieldset { border: $fieldset-border; - padding: $fieldset-padding; + padding: 0 $fieldset-padding; margin-bottom: $fieldset-padding; display: block; /* preserve margins in IE */ @@ -46,10 +46,6 @@ padding: 0; } - .#{$prefix}ie .#{$prefix}fieldset-header { - margin-bottom: 10px; - } - .#{$prefix}ie9 .#{$prefix}fieldset-header { padding-top: 1px; } diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss index 633fdf992..ed4d79872 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss @@ -14,91 +14,92 @@ } .#{$prefix}html-editor-tb .#{$prefix}btn-text { - background:transparent theme-image($theme-name, 'editor/tb-sprite.gif') no-repeat; + background:transparent no-repeat; + background-image:theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-bold, .#{$prefix}menu-item img.#{$prefix}edit-bold { background-position:0 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-italic, .#{$prefix}menu-item img.#{$prefix}edit-italic { background-position:-16px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-underline, .#{$prefix}menu-item img.#{$prefix}edit-underline { background-position:-32px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-forecolor, .#{$prefix}menu-item img.#{$prefix}edit-forecolor { background-position:-160px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-backcolor, .#{$prefix}menu-item img.#{$prefix}edit-backcolor { background-position:-176px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-justifyleft, .#{$prefix}menu-item img.#{$prefix}edit-justifyleft { background-position:-112px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-justifycenter, .#{$prefix}menu-item img.#{$prefix}edit-justifycenter { background-position:-128px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-justifyright, .#{$prefix}menu-item img.#{$prefix}edit-justifyright { background-position:-144px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-insertorderedlist, .#{$prefix}menu-item img.#{$prefix}edit-insertorderedlist { background-position:-80px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-insertunorderedlist, .#{$prefix}menu-item img.#{$prefix}edit-insertunorderedlist { background-position:-96px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-increasefontsize, .#{$prefix}menu-item img.#{$prefix}edit-increasefontsize { background-position:-48px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-decreasefontsize, .#{$prefix}menu-item img.#{$prefix}edit-decreasefontsize { background-position:-64px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-sourceedit, .#{$prefix}menu-item img.#{$prefix}edit-sourceedit { background-position:-192px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tb .#{$prefix}edit-createlink, .#{$prefix}menu-item img.#{$prefix}edit-createlink { background-position: -208px 0; - background-image: theme-image($theme-name, 'editor/tb-sprite.gif'); + background-image: theme-background-image($theme-name, 'editor/tb-sprite.gif'); } .#{$prefix}html-editor-tip .#{$prefix}tip-bd .#{$prefix}tip-bd-inner { diff --git a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss index aa85d56d8..9464acef9 100644 --- a/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss +++ b/deluge/ui/web/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss @@ -4,7 +4,7 @@ } .#{$prefix}form-trigger { - background-image: theme-image($theme-name, 'form/trigger.gif'); + background-image: theme-background-image($theme-name, 'form/trigger.gif'); background-position: 0 0; width: $form-trigger-width; @@ -81,22 +81,22 @@ .#{$prefix}form-arrow-trigger { .#{$prefix}form-trigger-icon { - background-image: theme-image($theme-name, 'boundlist/trigger-arrow.png'); + background-image: theme-background-image($theme-name, 'boundlist/trigger-arrow.png'); } } .#{$prefix}form-date-trigger { - background-image: theme-image($theme-name, 'form/date-trigger.gif'); + background-image: theme-background-image($theme-name, 'form/date-trigger.gif'); } $spinner-btn-height: $form-trigger-height / 2; .#{$prefix}form-trigger-wrap { .#{$prefix}form-spinner-up, .#{$prefix}form-spinner-down { - background-image: theme-image($theme-name, 'form/spinner.gif'); + background-image: theme-background-image($theme-name, 'form/spinner.gif'); - width: $form-trigger-width; - height: $spinner-btn-height; + width: $form-trigger-width !important; + height: $spinner-btn-height !important; font-size: 0; /*for IE*/ @@ -125,8 +125,8 @@ .#{$prefix}form-trigger-wrap { .#{$prefix}form-spinner-up, .#{$prefix}form-spinner-down { - background-image: theme-image($theme-name, 'form/spinner-small.gif'); - height: $spinner-btn-height; + background-image: theme-background-image($theme-name, 'form/spinner-small.gif'); + height: $spinner-btn-height !important; } .#{$prefix}form-spinner-down { background-position: 0 (-$spinner-btn-height); @@ -154,9 +154,9 @@ .#{$prefix}form-clear-trigger { - background-image: theme-image($theme-name, 'form/clear-trigger.gif'); + background-image: theme-background-image($theme-name, 'form/clear-trigger.gif'); } .#{$prefix}form-search-trigger { - background-image: theme-image($theme-name, 'form/search-trigger.gif'); + background-image: theme-background-image($theme-name, 'form/search-trigger.gif'); } } diff --git a/deluge/ui/web/resources/themes/templates/resources/css/my-ext-theme.css b/deluge/ui/web/resources/themes/templates/resources/css/my-ext-theme.css deleted file mode 100644 index 907bb562d..000000000 --- a/deluge/ui/web/resources/themes/templates/resources/css/my-ext-theme.css +++ /dev/null @@ -1,59 +0,0 @@ -/* -Syntax error: File to import not found or unreadable: ext4/default/all. - Load paths: - /Users/Robert/github/sencha/sdk/extjs/resources/themes/templates/resources/sass - /Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/frameworks/blueprint/stylesheets - /Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/frameworks/compass/stylesheets - - on line 8 of /Users/Robert/github/sencha/sdk/extjs/resources/themes/templates/resources/sass/my-ext-theme.scss - -Backtrace: -/Users/Robert/github/sencha/sdk/extjs/resources/themes/templates/resources/sass/my-ext-theme.scss:8 -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/import_node.rb:64:in `import' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/import_node.rb:25:in `imported_file' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:148:in `visit_import' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:37:in `send' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:37:in `visit' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:18:in `visit' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:53:in `map' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:27:in `visit_children' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:39:in `with_environment' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:26:in `visit_children' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:37:in `visit' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:47:in `visit_root' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:37:in `send' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/base.rb:37:in `visit' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:18:in `visit' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:7:in `send' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/visitors/perform.rb:7:in `visit' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/tree/root_node.rb:20:in `render' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/engine.rb:291:in `_render' -/Library/Ruby/Gems/1.8/gems/sass-3.1.0.alpha.252/lib/sass/../sass/engine.rb:238:in `render' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:127:in `compile' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:113:in `timed' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:126:in `compile' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/logger.rb:45:in `red' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:125:in `compile' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:105:in `compile_if_required' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:92:in `run' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:90:in `each' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:90:in `run' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:113:in `timed' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/compiler.rb:89:in `run' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/commands/update_project.rb:36:in `perform' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/commands/base.rb:18:in `execute' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/commands/project_base.rb:19:in `execute' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/exec/sub_command_ui.rb:43:in `perform!' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/lib/compass/exec/sub_command_ui.rb:15:in `run!' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/bin/compass:25 -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/bin/compass:39:in `call' -/Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/bin/compass:39 -/usr/bin/compass:19:in `load' -/usr/bin/compass:19 -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Syntax error: File to import not found or unreadable: ext4/default/all.\A Load paths:\A /Users/Robert/github/sencha/sdk/extjs/resources/themes/templates/resources/sass\A /Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/frameworks/blueprint/stylesheets\A /Library/Ruby/Gems/1.8/gems/compass-0.11.beta.5/frameworks/compass/stylesheets\A \A on line 8 of /Users/Robert/github/sencha/sdk/extjs/resources/themes/templates/resources/sass/my-ext-theme.scss"; } diff --git a/deluge/ui/web/resources/themes/templates/resources/sass/config.rb b/deluge/ui/web/resources/themes/templates/resources/sass/config.rb index 87ed40a1d..77db7d41b 100644 --- a/deluge/ui/web/resources/themes/templates/resources/sass/config.rb +++ b/deluge/ui/web/resources/themes/templates/resources/sass/config.rb @@ -1,7 +1,5 @@ -# $ext_path: This should be the path of where the ExtJS SDK is installed -# Generally this will be in a lib/extjs folder in your applications root -# <root>/lib/extjs -$ext_path = "../../lib/extjs" +# $ext_path: This should be the path of the Ext JS SDK relative to this file +$ext_path = "../../extjs" # sass_path: the directory your Sass files are in. THIS file should also be in the Sass folder # Generally this will be in a resources/sass folder diff --git a/deluge/ui/web/resources/themes/templates/resources/sass/my-ext-theme.scss b/deluge/ui/web/resources/themes/templates/resources/sass/my-ext-theme.scss index b5d2c18f2..ba9ab972f 100644 --- a/deluge/ui/web/resources/themes/templates/resources/sass/my-ext-theme.scss +++ b/deluge/ui/web/resources/themes/templates/resources/sass/my-ext-theme.scss @@ -19,6 +19,7 @@ $include-default: false; @include extjs-form; @include extjs-form-field; @include extjs-form-fieldset; + @include extjs-form-file; @include extjs-form-checkboxfield; @include extjs-form-checkboxgroup; @include extjs-form-triggerfield; |
