Skip to content

Commit 51caefc

Browse files
author
p01
committed
Style cleanup + added .resource-different-origin class
1 parent 3ba0f61 commit 51caefc

File tree

2 files changed

+11
-45
lines changed

2 files changed

+11
-45
lines changed

src/resource-manager/resource_style.css

Lines changed: 9 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -152,21 +152,12 @@
152152

153153

154154
/* Expander cell */
155-
156-
.resource-manager td:nth-child(1) {
157-
width: 16px;
158-
}
159-
160155
.searchcell {
161156
width: 250px;
162157
}
163158

164-
/* WIP style */
165-
.expand-collapse
166-
{
167-
/* margin:0 0 0 16px;*/
168-
/* background:rgba(0,0,0,.1);*/
169-
}
159+
160+
170161
.expand-collapse > ul
171162
{
172163
margin:0;
@@ -190,7 +181,6 @@
190181
border: 0px none currentColor;
191182
color: #666666;
192183
height: 13px;
193-
/* margin: 0px 2px 0px -15px;*/
194184
margin:0px 2px 0px 0px;
195185
padding: 0px;
196186
width: 13px;
@@ -204,16 +194,6 @@
204194
{
205195
background-position:1px 1px;
206196
}
207-
/*
208-
.resources li:nth-child(2n-1)
209-
{
210-
background-color:#f8f8f8;
211-
}
212-
.resources li:hover
213-
{
214-
background-color:#D4E3F4;
215-
}
216-
*/
217197

218198
/* resource detail view */
219199
.resource-detail-container,
@@ -273,6 +253,7 @@ a.external:hover
273253
}
274254
.resource-detail-image
275255
{
256+
object-fit:contain;
276257
-o-object-fit:contain;
277258
min-width:64px;
278259
min-height:64px;
@@ -287,9 +268,15 @@ a.external:hover
287268

288269

289270
/* ---------- */
271+
.resource-different-origin
272+
{/* note: same color as the .string class */
273+
color:#a54;
274+
}
275+
290276
.children-expand-collapse
291277
{
292278
display:block;
279+
margin-left:16px;
293280
}
294281
.collapsed .children-expand-collapse
295282
{
@@ -305,26 +292,5 @@ a.external:hover
305292
}
306293
.children-expand-collapse .header-expand-collapse
307294
{
308-
padding-left:16px;
309295
white-space:nowrap;
310296
}
311-
.children-expand-collapse .children-expand-collapse .header-expand-collapse
312-
{
313-
padding-left:32px;
314-
}
315-
.children-expand-collapse .children-expand-collapse .children-expand-collapse .header-expand-collapse
316-
{
317-
padding-left:48px;
318-
}
319-
.children-expand-collapse .children-expand-collapse .children-expand-collapse .children-expand-collapse .header-expand-collapse
320-
{
321-
padding-left:64px;
322-
}
323-
.children-expand-collapse .children-expand-collapse .children-expand-collapse .children-expand-collapse .children-expand-collapse .header-expand-collapse
324-
{
325-
padding-left:80px;
326-
}
327-
.children-expand-collapse .children-expand-collapse .children-expand-collapse .children-expand-collapse .children-expand-collapse .children-expand-collapse .header-expand-collapse
328-
{
329-
padding-left:96px;
330-
}

src/resource-manager/resource_templates.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ templates.resource_tree =
4545
'span',
4646
(r.filename||r.human_url),
4747
[],
48-
'style',''+ (frame.sameOrigin!==false?'':'color:red;'),
48+
'class',(frame.sameOrigin!==false?'':'resource-different-origin'),
4949
'data-tooltip',(r&&'js-script-select'),
5050
'data-tooltip-text',(r&&'frame: '+r.human_url)
5151
],
@@ -140,7 +140,7 @@ templates.resource_tree =
140140
'span',
141141
(r.filename||r.human_url),
142142
[],
143-
'style',(r.sameOrigin!==false?'':'color:red'),
143+
'class',(r.sameOrigin!==false?'':'resource-different-origin'),
144144
'data-tooltip',(r&&'js-script-select'),
145145
'data-tooltip-text',(r&&groupName+': '+r.human_url)
146146
],

0 commit comments

Comments
 (0)