Skip to content

Commit 4f0c8d8

Browse files
Merge branch '6.0/main-container-css-class'
2 parents 79a71a8 + e3dd5b8 commit 4f0c8d8

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

html/Callbacks/RTIR/Elements/Header/Head

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ if ($m->request_comp->path =~ m{^/RTIR/}) {
5050
$ARGSRef->{URL} //= RT::IR->HREFTo("index.html");
5151
$ARGSRef->{Name} //= RT->Config->Get('rtirname');
5252
$ARGSRef->{LogoURL} //= RT->Config->Get('WebPath')."/static/images/RTIR/rtir-logo.svg";
53-
push @{$ARGSRef->{BodyClass}}, 'rtir';
53+
push @{$ARGSRef->{MainContainerClass}}, 'rtir';
5454
}
5555
# add rtir body class if it's a ticket timer for an RTIR ticket
5656
elsif ($m->request_comp->path =~ m{^/Helpers/TicketTimer}) {
5757
my $ticket = RT::Ticket->new( $session{'CurrentUser'} );
5858
my ($ok) = $ticket->Load($DECODED_ARGS->{id});
5959
if ($ok && RT::IR->OurQueue($ticket->QueueObj)) {
60-
push @{$ARGSRef->{BodyClass}}, 'rtir';
60+
push @{$ARGSRef->{MainContainerClass}}, 'rtir';
6161
}
6262
}
6363
</%init>

static/css/rtir-styles.css

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
/* TODO: this section of stlying has been commented out to disable the colored header until we re-implement.
2-
body.rtir div#header,
3-
body.rtir .ticket-timer .ticket-link {
2+
.main-container.rtir div#header,
3+
.main-container.rtir .ticket-timer .ticket-link {
44
background: #404080;
55
color: #fff;
66
}
77
*/
88

9-
body.rtir .overdue {
9+
.main-container.rtir .overdue {
1010
color: red;
1111
}
1212

1313
/* top border colors */
14-
body.rtir .titlebox.ticket-info-articles, body.rtir .titlebox.tickets-list-report, body.rtir .titlebox.tickets-list-incident,
15-
body.rtir .titlebox.tickets-list-investigation, body.rtir .titlebox.tickets-list-countermeasure { border-top: 3px solid #388E3C; }
16-
body.rtir .titlebox.ticket-info-time { border-top: 3px solid #7B1FA2; }
17-
body.rtir .titlebox.ticket-info-message { border-top: 3px solid #1976D2; }
18-
body.rtir .titlebox.ticket-info-details { border-top: 3px solid #D32F2F; }
19-
body.rtir .titlebox.ticket-info-cve { border-top: 3px solid #1574b3; } /* The color is from header of https://nvd.nist.gov/ */
14+
.main-container.rtir .titlebox.ticket-info-articles, .main-container.rtir .titlebox.tickets-list-report, .main-container.rtir .titlebox.tickets-list-incident,
15+
.main-container.rtir .titlebox.tickets-list-investigation, .main-container.rtir .titlebox.tickets-list-countermeasure { border-top: 3px solid #388E3C; }
16+
.main-container.rtir .titlebox.ticket-info-time { border-top: 3px solid #7B1FA2; }
17+
.main-container.rtir .titlebox.ticket-info-message { border-top: 3px solid #1976D2; }
18+
.main-container.rtir .titlebox.ticket-info-details { border-top: 3px solid #D32F2F; }
19+
.main-container.rtir .titlebox.ticket-info-cve { border-top: 3px solid #1574b3; } /* The color is from header of https://nvd.nist.gov/ */
2020

21-
body.rtir .incidents .actions .btn {
21+
.main-container.rtir .incidents .actions .btn {
2222
border: none;
2323
}
2424

25-
body.rtir .incidents .actions #create-incident {
25+
.main-container.rtir .incidents .actions #create-incident {
2626
background: #4040a0;
2727
}
2828

29-
body.rtir .incidents .actions #create-incident:hover {
29+
.main-container.rtir .incidents .actions #create-incident:hover {
3030
background: #4040f0;
3131
}
3232

33-
body.rtir .incidents .actions #link-incident {
33+
.main-container.rtir .incidents .actions #link-incident {
3434
background: #316531;
3535
}
3636

37-
body.rtir .incidents .actions #link-incident:hover {
37+
.main-container.rtir .incidents .actions #link-incident:hover {
3838
background: #3f833f;
3939
}
4040

41-
body.rtir .titlebox.external-feeds tr.oddline+.oddline .collection-as-table,
42-
body.rtir .titlebox.external-feeds tr.evenline+.evenline .collection-as-table {
41+
.main-container.rtir .titlebox.external-feeds tr.oddline+.oddline .collection-as-table,
42+
.main-container.rtir .titlebox.external-feeds tr.evenline+.evenline .collection-as-table {
4343
padding-bottom: 0.7rem;
4444
}
4545

@@ -56,16 +56,16 @@ h3.rtir-reply-all {
5656
}
5757

5858
[data-bs-theme=light] {
59-
body.rtir input[type="reset"],
60-
body.rtir input[type="submit"],
61-
body.rtir input[class="btn"] {
59+
.main-container.rtir input[type="reset"],
60+
.main-container.rtir input[type="submit"],
61+
.main-container.rtir input[class="btn"] {
6262
background: #4040a0;
6363
color: #fff;
6464
}
6565

66-
body.rtir input[type="reset"]:hover,
67-
body.rtir input[type="submit"]:hover,
68-
body.rtir input[class="btn"]:hover {
66+
.main-container.rtir input[type="reset"]:hover,
67+
.main-container.rtir input[type="submit"]:hover,
68+
.main-container.rtir input[class="btn"]:hover {
6969
background: #4040f0;
7070
color: #fff;
7171
}

0 commit comments

Comments
 (0)