Skip to content

Commit e3a7725

Browse files
Keep a consistent order within the sidebar information section.
1 parent bfc9455 commit e3a7725

File tree

10 files changed

+36
-46
lines changed

10 files changed

+36
-46
lines changed

extension/changelog.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
"version": { "major": 7, "minor": 5, "build": 1 },
44
"title": "Beta",
55
"date": false,
6-
"logs": { "features": [], "fixes": [], "changes": [], "removed": [] }
6+
"logs": {
7+
"features": [],
8+
"fixes": [],
9+
"changes": [
10+
{ "message": "Keep a consistent order within the sidebar information section.", "contributor": "DeKleineKobini" }
11+
],
12+
"removed": []
13+
}
714
},
815
{
916
"version": { "major": 7, "minor": 5, "build": 0 },

extension/manifest.json

-3
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,6 @@
176176
"matches": ["https://www.torn.com/*.php*"],
177177
"exclude_matches": ["https://www.torn.com/logout.php*", "https://www.torn.com/loader.php?sid=attack&*"],
178178
"css": [
179-
"scripts/features/oc-time/ttOCTime.css",
180-
"scripts/features/oc2-time/ttOC2Time.css",
181-
"scripts/features/faction-oc-time/ttFactionOCTime.css",
182179
"scripts/features/custom-links/ttCustomLinks.css",
183180
"scripts/features/update-notice/ttUpdateNotice.css",
184181
"scripts/features/sidebar-notes/ttSidebarNotes.css",

extension/scripts/features/company-addiction/ttCompanyAddiction.js

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
document.newElement({ type: "a", class: "title", text: "Company Addiction: ", href: LINKS.companyEmployees }),
4444
companyAddictionElement,
4545
],
46+
style: { order: 3 },
4647
})
4748
);
4849
}

extension/scripts/features/faction-oc-time/ttFactionOCTime.css

-14
This file was deleted.

extension/scripts/features/faction-oc-time/ttFactionOCTime.js

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
type: "section",
6262
id: "factionOCTimer",
6363
children: [document.newElement({ type: "a", class: "title", text: "Faction OC: ", href: LINKS.organizedCrimes }), factionOCElement],
64+
style: { order: 2 },
6465
})
6566
);
6667
}

extension/scripts/features/oc-time/ttOCTime.css

-14
This file was deleted.

extension/scripts/features/oc-time/ttOCTime.js

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
type: "section",
5555
id: "ocTimer",
5656
children: [document.newElement({ type: "a", class: "title", text: "OC: ", href: LINKS.organizedCrimes }), timeLeftElement],
57+
style: { order: 1 },
5758
})
5859
);
5960
}

extension/scripts/features/oc2-time/ttOC2Time.css

-14
This file was deleted.

extension/scripts/features/oc2-time/ttOC2Time.js

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
type: "section",
5454
id: "oc2Timer",
5555
children: [document.newElement({ type: "a", class: "title", text: "OC: ", href: LINKS.organizedCrimes }), ...elements],
56+
style: { order: 1 },
5657
})
5758
);
5859
}

extension/scripts/global/globalStyle.css

+24
Original file line numberDiff line numberDiff line change
@@ -488,3 +488,27 @@ body[data-layout="hospital"] #sidebarroot .pill {
488488
width: 10px;
489489
background: url(https://www.torn.com/images/v2/main/info_msg/ordinary_importance.png) left top no-repeat;
490490
}
491+
492+
/**
493+
* Sidebar Information
494+
*/
495+
496+
.tt-sidebar-information {
497+
display: flex;
498+
flex-direction: column;
499+
}
500+
501+
.tt-sidebar-information .title {
502+
font-weight: bold;
503+
text-decoration: none;
504+
color: inherit;
505+
margin: inherit;
506+
}
507+
508+
.tt-sidebar-information .countdown.short {
509+
color: var(--tt-color-red);
510+
}
511+
512+
.tt-sidebar-information .countdown.medium {
513+
color: var(--tt-color-orange);
514+
}

0 commit comments

Comments
 (0)