Skip to content

Commit 4e47301

Browse files
stickzstickz
authored
Merge pull request #2645 from Novik/develop
Mark ruTorrent v4.3 as stable
2 parents c2ad2a2 + d780e34 commit 4e47301

120 files changed

Lines changed: 4219 additions & 2201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎css/category-panel.css‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
:host {
2+
display: contents;
3+
font-size: 11px;
4+
--open-background-image: url(../images/pnl_open.gif);
5+
--close-background-image: url(../images/pnl_close.gif);
6+
--heading-background-color: #f0f0f0;
7+
--heading-border-color: #a0a0a0;
8+
}
9+
10+
:host([closed]) slot[name="content"] {
11+
display: none;
12+
}
13+
14+
15+
div[part=heading] {
16+
display: flex;
17+
background: var(--open-background-image) 2px no-repeat;
18+
background-color: var(--heading-background-color);
19+
border-bottom: 1px solid var(--heading-border-color);
20+
border-top: 1px solid var(--heading-border-color);
21+
padding: 2px 5px 2px 21px;
22+
margin: 0px;
23+
line-height: 16px;
24+
cursor: pointer;
25+
-moz-user-select: none;
26+
-moz-user-focus: normal;
27+
-moz-user-input: enabled;
28+
user-select: none;
29+
}
30+
31+
:host([closed]) div[part="heading"] {
32+
background-image: var(--close-background-image);
33+
}
34+
35+
.text {
36+
flex: 1;
37+
white-space: nowrap;
38+
}

‎css/panel-label.css‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
:host {
2+
display: flex;
3+
padding: 3px;
4+
flex-flow: row nowrap;
5+
align-items: center;
6+
height: 16px;
7+
cursor: pointer;
8+
overflow: hidden;
9+
--prefix-color: black;
10+
--prefix-fontsize: 19px;
11+
--badge-color: black;
12+
--badge-background-color: #f0f0f0;
13+
--status-image: url(../images/tstatus.png);
14+
--icon-size: 16px;
15+
}
16+
17+
:host([selected]) {
18+
background-color: #cfdeef;
19+
border-color: #cfdeef;
20+
}
21+
22+
div {
23+
margin-right: 0.5em;
24+
}
25+
26+
[part="prefix"] {
27+
color: var(--prefix-color);
28+
flex: 0 0 auto;
29+
display: flex;
30+
flex-flow: row nowrap;
31+
opacity: 0.1;
32+
font-family: monospace;
33+
font-size: var(--prefix-fontsize);
34+
margin-left: -2px;
35+
margin-right: 2px;
36+
}
37+
[part="prefix"] div {
38+
margin-right: 0px;
39+
min-width: 12px;
40+
max-width: 12px;
41+
}
42+
43+
[part="text"] {
44+
white-space: pre;
45+
}
46+
47+
[part="count"],
48+
[part="size"] {
49+
color: var(--badge-color);
50+
background-color: var(--badge-background-color);
51+
padding: var(--badge-padding, 0.1em 0.3em 0.1em 0.3em);
52+
border-radius: var(--badge-border-radius, 0.8em);
53+
white-space: pre;
54+
}
55+
56+
[part="icon"] {
57+
min-width: var(--icon-size);
58+
min-height: var(--icon-size);
59+
background-image: var(--status-image);
60+
background-position: var(--icon-offset, 0px 0px);
61+
background-repeat: no-repeat;
62+
background-size: var(--icon-image-size, unset);
63+
}
64+
65+
[part="icon"].icon-letter {
66+
background-image: none;
67+
color: var(--icon-letter-color, --badge-color);
68+
background-color: var(
69+
--icon-letter-background-color,
70+
--badge-background-color
71+
);
72+
border: 1px solid var(--icon-letter-border-color, rgba(128, 128, 128, 0.2));
73+
border-radius: calc(var(--icon-size) / 2);
74+
width: calc(var(--icon-size) - 2px);
75+
height: calc(var(--icon-size) - 2px);
76+
font-size: calc(var(--icon-size) - 5px);
77+
display: flex;
78+
font-style: normal;
79+
}
80+
81+
[part="icon"].icon-letter > span {
82+
flex: 1;
83+
text-align: center;
84+
font-weight: bold;
85+
line-height: calc(var(--icon-size) - 3px);
86+
}
87+
.icon-by-url {
88+
background-position: 0px 0px;
89+
background-size: var(--icon-size) var(--icon-size);
90+
background-image: none;
91+
}
92+
93+
:host([icon="down"]) {
94+
--icon-offset: 0px 0px;
95+
}
96+
:host([icon="up"]) {
97+
--icon-offset: 0px -16px;
98+
}
99+
:host([icon="search"]),
100+
:host([icon="inactive"]) {
101+
--icon-offset: 0px -32px;
102+
}
103+
:host([icon="paused"]) {
104+
--icon-offset: 0px -48px;
105+
}
106+
:host([icon="error-down"]) {
107+
--icon-offset: 0px -64px;
108+
}
109+
:host([icon="error-up"]) {
110+
--icon-offset: 0px -80px;
111+
}
112+
:host([icon="error"]) {
113+
--icon-offset: 0px -96px;
114+
}
115+
:host([icon="completed"]) {
116+
--icon-offset: 0px -112px;
117+
}
118+
:host([icon="queued-down"]) {
119+
--icon-offset: 0px -128px;
120+
}
121+
:host([icon="queued-up"]) {
122+
--icon-offset: 0px -144px;
123+
}
124+
:host([icon="up-down"]) {
125+
--icon-offset: 0px -160px;
126+
}
127+
:host([icon="checking"]),
128+
:host([icon="all"]) {
129+
--icon-offset: 0px -176px;
130+
}
131+
:host([icon="rss"]) {
132+
--icon-offset: 0px -208px;
133+
}
134+
:host([icon="rss-dis"]) {
135+
--icon-offset: 0px -192px;
136+
}
137+
:host([icon="rss-group"]) {
138+
--icon-offset: 0px -240px;
139+
}

‎css/style.css‎

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,30 @@ html, body {border: 0; margin: 0; padding: 0; cursor: default; overflow: hidden;
33
html, body, input,select,button,textarea{font-family: Tahoma, Arial, Helvetica, sans-serif;}
44
.light-theme { color-scheme: light; }
55
.dark-theme { color-scheme: dark; }
6+
:root {
7+
--menu-color: #000000;
8+
--menu-background-color: #ffffff;
9+
--menu-border-color: #d0d0d0;
10+
11+
--menu-disabled-color: #c0c0c0;
12+
--menu-disabled-background-color: #ffffff;
13+
14+
--menu-highlight-color: #ffffff;
15+
--menu-highlight-background-color: #cfdeef;
16+
17+
--settings-background-color: #fafafa;
18+
}
19+
category-list.rightalign-labelsize panel-label::part(size) {
20+
margin-left: auto;
21+
}
22+
category-list.hide-textoverflow panel-label::part(text) {
23+
overflow: hidden;
24+
text-overflow: ellipsis;
25+
}
26+
dialog {
27+
background-color: var(--settings-background-color);
28+
border-color: var(--menu-border-color);
29+
}
630
form{margin:0;}
731
div#preload {width: 0px; height: 0px; display: none; background-image: url(../images/toolbar.png); background-image: url(../images/tstatus.png); background-image: url(../images/t_bg.png); background-image: url(../images/r_bg.gif); background-image: url(../images/i_bg.gif); background-image: url(../images/asc.gif); background-image: url(../images/desc.gif); background-image: url(../images/close.png); background-image: url(../images/file.gif); background-image: url(../images/dir.gif); background-image: url(../images/pnl_open.gif); background-image: url(../images/pnl_close.gif)}
832
div#cover {width: 100%; height: 100%; left: 0px; top: 0px; position: absolute; z-index: 500; background: #FFFFFF}
@@ -28,24 +52,18 @@ div#sc ul li {margin: 0; padding: 0}
2852
div#sc li div {line-height: 14px; padding: 4px; font-weight: bold; font-size: 11px;}
2953
div#sc li.se_act div {background-color: #808080; color: #FFFFFF}
3054
ul.CMenu {width: 150px; left: 0px; top: 0px; display: none; border: 1px solid #A0A0A0; border-right: 2px solid #A0A0A0; border-bottom: 2px solid #808080; background: #F0F0F0; text-decoration: none; padding: 2px 0 0 2px; margin: 0; list-style-type: none; z-index: 1000}
31-
ul.CMenu li {float: left; margin-right: 1px; position: relative; width: 150px; background: #FFFFFF}
32-
ul.CMenu li a {display: block}
33-
ul.CMenu li a.dis {color: #C0C0C0}
34-
ul.CMenu li a.dis:hover {background-color: #FFFFFF; color: #C0C0C0}
35-
ul.CMenu li a {line-height: 16px; padding: 3px 4px 3px 16px; font-weight: normal}
36-
ul.CMenu li hr {width: 90%; border-top: 1px solid #D0D0D0; height: 0px; margin-top: 2px; margin-bottom: 2px; }
55+
ul.CMenu li {float: left; margin-right: 1px; position: relative; width: 150px; background: var(--menu-background-color); }
56+
ul.CMenu li a {display: block; line-height: 16px; padding: 3px 4px 3px 16px; font-weight: normal; background-color: var(--menu-background-color); color: var(--menu-color);}
57+
ul.CMenu li ul li a.dis, ul.CMenu li a.dis { color: var(--menu-disabled-color); }
58+
ul.CMenu li hr {width: 90%; border-top: 1px solid var(--menu-border-color); height: 0px; margin-top: 2px; margin-bottom: 2px; }
3759
.ie ul.CMenu li hr { line-height:1px; font-size:1px; margin: 0 }
3860
ul.CMenu li a.exp {background: transparent url(../images/menuexp.gif) no-repeat scroll 140px center; }
3961
ul.CMenu li a.sel {background: transparent url(../images/menusel.gif) no-repeat scroll 4px center}
40-
ul.CMenu li a:hover {background-color: #CFDEEF; color: #000000}
62+
ul.CMenu li a:not(.dis):hover {background-color: var(--menu-highlight-background-color); color: var(--menu-highlight-color)}
4163

4264
ul.CMenu li:hover ul {display: block; position: absolute; top: 0; left: 146px; width:150px;}
4365
ul.CMenu li:hover ul li ul {display: none;}
44-
ul.CMenu li:hover ul li a {display: block; background-color: #FFFFFF; color: #000000}
45-
ul.CMenu li:hover ul li a:hover {background-color: #CFDEEF; color: #000000}
4666
ul.CMenu li:hover ul.left {left: -150px}
47-
ul.CMenu li ul li a.dis {color: #C0C0C0}
48-
ul.CMenu li ul li a.dis:hover {background-color: #FFFFFF; color: #C0C0C0}
4967

5068
span.htkey {text-align:right; position: absolute; right: 16px; z-index:100}
5169
#sel {width: 0px; height: 0px; position: absolute; left: 0px; top: 0px; border: 1px dotted #000000; display: none; z-index: 1000}
@@ -78,51 +96,23 @@ div#t div#plugins {background: transparent url(../images/plugin.png) no-repeat 0
7896
div#t a#mnu_go {margin: 3px 0 0 0; padding: 3px}
7997
div#t #ind {margin-top: 2px; background: transparent url(../images/ajax-loader.gif) no-repeat 0px center; width: 32px; margin-right: 2px; line-height: 26px; cursor: default; }
8098

81-
input.Textbox, input.Button, select {border: 1px solid #B0B0B0; font-size: 11px; padding: 2px}
99+
input.Textbox, button, input.Button, select {border: 1px solid #B0B0B0; font-size: 11px; padding: 2px}
82100
Input.TextboxShort {border: 1px solid #B0B0B0; font-size: 11px; padding: 2px; width: 50px}
83101
Input.TextboxMid {border: 1px solid #B0B0B0; font-size: 11px; padding: 2px; width: 110px}
84102
Input.TextboxLarge {border: 1px solid #B0B0B0; font-size: 11px; padding: 2px; width: 220px}
85103
Input.TextboxVShort {border: 1px solid #B0B0B0; font-size: 11px; padding: 2px; width: 30px}
86-
input.Button {padding: 1px 10px; background: #F0F0F0 url(../images/h.gif) repeat-x center bottom; width: 80px; height: 19px; border: 1px solid #A0A0A0; cursor: pointer }
87-
input.Button[disabled] { opacity: 0.3; cursor: default }
88-
input.Button:not([disabled]):hover { background-color: #F5F5F5; }
89-
input.Button:not([disabled]):hover:active { background-color: #FAFAFA; }
90-
#pview { display: flex; padding-right: 0px; }
91-
#pview > span { flex: 1; }
104+
button, input.Button {padding: 1px 10px; background: #F0F0F0 url(../images/h.gif) repeat-x center bottom; width: 80px; height: 19px; border: 1px solid #A0A0A0; cursor: pointer }
105+
button[disabled],input.Button[disabled] { opacity: 0.3; cursor: default }
106+
button:not([disabled]):hover, input.Button:not([disabled]):hover { background-color: #F5F5F5; }
107+
button:not([disabled]):hover:active, input.Button:not([disabled]):hover:active { background-color: #FAFAFA; }
92108
#pview_save_view_button { align-self: center; width: 38px; height: 19px; padding: 0px; line-height: 2px; font-size: 19px; }
93-
#pview_cont .label-text { white-space: pre; }
94-
.pview_custom_view .label-icon { background-image: none; background-color: #F0F0F0; border: 1px solid rgba(128,128,128,0.2); border-radius: 0.8em; min-width: 14px; min-height: 14px; display: flex; font-style: normal; }
95-
.pview_custom_view .label-icon > span { flex: 1; text-align: center; font-size: 11px; font-weight: bold; }
96109

97110
select {margin-top: 5px}
98111
a {font-size: 11px; color: #686868}
99112
table#maincont {margin: 5px 0 0 0; min-width: 600px;}
100113
table#maincont td.uicell {vertical-align: top; padding: 0 }
101114

102-
div#CatList {width: 0px; border: 1px solid #A0A0A0; background-color: #FFFFFF; overflow-y: auto; overflow-x: hidden; min-width: 160px; }
103-
div#CatList ul { margin: 0; padding: 0; list-style: none; white-space: nowrap}
104-
div#CatList ul li { display: flex; padding: 3px; flex-flow: row nowrap; align-items: center; height: 16px; font-size: 11px; cursor: pointer; border: 0px solid #FFFFFF; overflow: hidden;}
105-
div#CatList ul li.sel {background-color: #CFDEEF; border-color: #CFDEEF }
106-
div#CatList ul li div { margin-right: 0.5em; }
107-
div#CatList .label-prefix { flex: 0 0 auto; display: flex; flex-flow: row nowrap; opacity: 0.1; font-family: monospace; font-size: 19px; margin-left: -2px; margin-right: 2px; }
108-
div#CatList .label-prefix div { margin-right: 0px; width: 12px; }
109-
.label-icon { min-width: 16px; min-height: 16px; background-image: url(../images/tstatus.png); background-repeat: no-repeat; }
110-
.label-icon img { width: 16px; height: 16px; }
111-
.-_-_-all-_-_- .label-icon, #-_-_-all-_-_- .label-icon {background-position: 0px -176px;}
112-
#-_-_-dls-_-_- .label-icon {background-position: 0px 0px;}
113-
#-_-_-com-_-_- .label-icon {background-position: 0px -16px;}
114-
#-_-_-act-_-_- .label-icon {background-position: 0px -160px;}
115-
#-_-_-iac-_-_- .label-icon {background-position: 0px -32px;}
116-
#-_-_-err-_-_- .label-icon {background-position: 0px -96px;}
117-
.label-count,.label-size { background-color: #F0F0F0; padding: 0.1em 0.3em 0.1em 0.3em; border-radius: 0.8em; }
118-
#CatList.rightalign-labelsize .label-size {
119-
margin-left: auto;
120-
}
121-
#CatList.hide-textoverflow .label-text {
122-
overflow: hidden;
123-
text-overflow: ellipsis;
124-
}
125-
#flabel_cont li:not(.-_-_-all-_-_-) .label-icon { background-position: 0px -32px; }
115+
#CatList { display: block; margin: 0; padding: 0; width: 0px; border: 1px solid #A0A0A0; background-color: #FFFFFF; overflow-y: auto; overflow-x: hidden; min-width: 160px; }
126116

127117
.stable-icon {background-image: url(../images/tstatus.png); background-repeat: no-repeat}
128118
.Status_Down {background-position: 0px 0px}
@@ -148,7 +138,7 @@ div#stg {width: 600px; height: 560px; position: absolute; left: 0px; top: 50px;
148138
div#stg_c {overflow: hidden}
149139
div#stg-header { background-image: url(../images/settings.gif); }
150140

151-
div#stg .lm {width: 120px; height: 511px; margin: 5px; margin-right: 0; padding: 5px; float: left; position: relative; background-color: #FFFFFF; border: 1px solid #D0D0D0; overflow: auto}
141+
div#stg .lm {width: 120px; height: 511px; margin: 5px; margin-right: 0; padding: 5px; float: left; position: relative; background-color: var(--menu-background-color); border: 1px solid var(--menu-border-color); overflow: auto}
152142
.ie div#stg .lm {width: 125px; position: static;}
153143
.ie9 div#stg .lm {position: static}
154144
.ie div#stg {width: 605px;}
@@ -171,7 +161,7 @@ div.algnright {text-align: right; clear: right}
171161
.lm li a {color: #000000; padding: 1px 2px}
172162
.lm li a.focus {background-color: #E0E0E0}
173163
.ie .lm li a {margin: 0 0 0 -5px; padding: 0}
174-
.stg_con { display: none; float: right; position: relative; width: 450px; height: 500px; margin: 4px; background-color: #FAFAFA}
164+
.stg_con { display: none; float: right; position: relative; width: 450px; height: 500px; margin: 4px; background-color: var(--settings-background-color); }
175165
.ie9 .stg_con {position: static}
176166
fieldset {margin: 4px}
177167
* > fieldset {border: 1px solid #D0D0D0; -moz-border-radius: 6px; -webkit-border-radius:6px; border-radius:6px;}
@@ -220,7 +210,7 @@ div.graph_tab {background-color: #FFFFFF; overflow: hidden; display: block; -moz
220210
.graph_tab_tooltip { position: absolute; border: 1px solid #fdd; padding: 2px; background-color: #fee; color: black; font-size: 11px; font-weight: bold; font-family: Tahoma, Arial, Helvetica, sans-serif; opacity: 0.80; }
221211

222212
div.table_tab {background-color: #FFFFFF; overflow: hidden; display: block; -moz-user-select: none; -moz-user-focus: normal; -moz-user-input: enabled; user-select: none; }
223-
div#List {border: 1px solid #A0A0A0;}
213+
div#List,.main-table {border: 1px solid #A0A0A0;}
224214

225215
div.cont {padding: 6px; font-size: 11px;}
226216

@@ -275,8 +265,6 @@ span#loadimg {padding: 20px; background: transparent url(../images/ajax-loader.g
275265
div#HDivider:hover, div#VDivider:hover { background: #A0A0A0; }
276266
textarea { overflow: auto; }
277267

278-
.catpanel { background: url(../images/pnl_open.gif) 2px no-repeat; background-color: #F0F0F0; border-bottom: 1px solid #A0A0A0; border-top: 1px solid #A0A0A0; padding: 2px 21px; margin: 0px; line-height: 16px; font-size: 11px; cursor: pointer; -moz-user-select: none; -moz-user-focus: normal; -moz-user-input: enabled; user-select: none; }
279-
280268
div#tadd-header {background-image: url(../images/world.gif)}
281269
div#tadd {display: none; left: 100px; top: 100px; position: absolute; margin: 0 auto }
282270
div#tadd label {text-align: right; width: 75px; padding-right: 20px; float: left }

0 commit comments

Comments
 (0)