[Rt-commit] rtir branch, master, updated. 4.0.1rc1-192-gb0d2085a

? sunnavy sunnavy at bestpractical.com
Mon Jun 8 18:05:01 EDT 2020


The branch, master has been updated
       via  b0d2085a518dbc73d45da65c7a54af0ede020e16 (commit)
       via  6be13ac0d8fe9312c226abcab1b869a56bcce9ef (commit)
       via  4880ddcae249d6291ae563a0d5f7cfbcae9cfe3e (commit)
      from  b0154405d167654a419489c2cf1b972c4fbd26ee (commit)

Summary of changes:
 html/Callbacks/RTIR/Elements/MakeClicky/Default | 20 ++++++++++----------
 static/css/rtir-styles.css                      | 10 ++++++++++
 2 files changed, 20 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 4880ddcae249d6291ae563a0d5f7cfbcae9cfe3e
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Thu Jun 4 17:26:34 2020 -0500

    Fix clickylink border and hover for dark theme

diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
index 417eda90..291bbdc1 100644
--- a/static/css/rtir-styles.css
+++ b/static/css/rtir-styles.css
@@ -190,3 +190,13 @@ body.rtir .titlebox.external-feeds tr.oddline+.oddline .collection-as-table,
 body.rtir .titlebox.external-feeds tr.evenline+.evenline .collection-as-table {
     padding-bottom: 0.7rem;
 }
+
+/* elevator-dark styles for rtir */
+
+.rtir.darkmode .clickylink a.button {
+    border: 1px solid #717171;
+}
+
+.rtir.darkmode .clickylink a.button:hover {
+    background: #3A474D !important;
+}

commit 6be13ac0d8fe9312c226abcab1b869a56bcce9ef
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Jun 8 13:51:15 2020 -0500

    Add missing btn class to clicky links

diff --git a/html/Callbacks/RTIR/Elements/MakeClicky/Default b/html/Callbacks/RTIR/Elements/MakeClicky/Default
index af2560f7..16e37c21 100644
--- a/html/Callbacks/RTIR/Elements/MakeClicky/Default
+++ b/html/Callbacks/RTIR/Elements/MakeClicky/Default
@@ -82,7 +82,7 @@ my %actions;
         # don't execute on non-rtir tickets or in SelfService
         return $super unless defined $args{type} and !$SelfService;
 
-        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
+        my $result = qq{ <a class="button btn btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
             .loc('lookup "[_1]"', $host) .qq{</a>};
         return $super . qq{ <span class="clickylink">$result</span>};
     },
@@ -96,7 +96,7 @@ my %actions;
         # don't execute on non-rtir tickets or in SelfService
         return $super unless defined $args{type} and !$SelfService;
 
-        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
+        my $result = qq{ <a class="button btn btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
             .loc('lookup "[_1]"', $host) .qq{</a>};
         return $super . qq{ <span class="clickylink">$result</span>};
     },
@@ -108,17 +108,17 @@ my %actions;
 
         $args{host} ||= $args{value};
         my $escaped_host = $escaper->($args{host});
-        my $result .= qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
+        my $result .= qq{ <a class="button btn btn-sm btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
                       .loc('Lookup IP') .q{</a>};
         if ( $args{incident} && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
-            $result .= qq{ <a class="button btn-sm btn-primary create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
+            $result .= qq{ <a class="button btn btn-sm btn-primary create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
             RT::IR->HREFTo("Create.html?Incident=".$args{incident}."&Lifecycle=".RT::IR->lifecycle_countermeasure.qq{&IP-Value=$escaped_host})
             .qq{">Block</a>};
         }
         if ( $args{'object'} && $args{'object'}->id ) {
             my $cf = RT::IR::GetCustomField('IP');
             my $tid = $args{'object'}->id;
-            $result .= qq{ <a class="button btn-sm btn-primary" href="}.
+            $result .= qq{ <a class="button btn btn-sm btn-primary" href="}.
             RT::IR->HREFTo("Edit.html?id=".$tid
                 .qq{&Object-RT::Ticket-$tid-CustomField-}. $cf->id .qq{-AddValue=$escaped_host}
                 .q{&SaveChanges=1})
@@ -154,14 +154,14 @@ my %actions;
         my $email = $args{'value'}; $email =~ s/^<|>$//g;
         my $escaped_email = $escaper->($email);
 
-        my $result = qq{<a class="button btn-sm btn-primary" href="}.
+        my $result = qq{<a class="button btn btn-sm btn-primary" href="}.
             RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=email&q=$escaped_email}). qq{">}
             .loc('lookup email') .q{</a>};
         if ( $args{'incident'} ) {
             if ( $r->uri =~ /Lookup.html$/ ) {
                 $result .= qq{<input type="checkbox" name="Requestorbox-$escaped_email" unchecked />};
             }
-            $result .= qq{ <a class="button btn-sm btn-primary" href="}.
+            $result .= qq{ <a class="button btn btn-sm btn-primary" href="}.
                 RT::IR->HREFTo( "Create.html"
                 . qq{?Incident=$args{'incident'}}
                 . qq{&Lifecycle=}.RT::IR->lifecycle_investigation
@@ -171,7 +171,7 @@ my %actions;
         }
         my $domain = (split /@/, $email, 2)[1];
         my $escaped_domain = $escaper->($domain);
-        $result .= ' <a class="button btn-sm btn-primary" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_domain}). '">'
+        $result .= ' <a class="button btn btn-sm btn-primary" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_domain}). '">'
                .loc('lookup "[_1]"', $domain) .'</a>';
         return $escaper->($args{'value'}) . qq{ <span class="clickylink">$result</span>};
     },
@@ -182,7 +182,7 @@ my %actions;
         return $escaper->($args{value}) unless defined $args{type} and !$SelfService;
 
         $args{value} = $escaper->($args{value});
-        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
+        my $result = qq{ <a class="button btn btn-sm btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
                .loc('lookup') .qq{</a>};
         return $args{value} . qq{ <span class="clickylink">$result</span>};
     },
@@ -193,7 +193,7 @@ my %actions;
         return $escaper->($args{value}) unless defined $args{type} and !$SelfService;
 
         $args{value} = $escaper->($args{value});
-        my $result = qq{ <a class="button btn-sm btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
+        my $result = qq{ <a class="button btn btn-sm btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
                .loc('lookup host') .qq{</a>};
         return $args{value} . qq{ <span class="clickylink">$result</span>};
     },

commit b0d2085a518dbc73d45da65c7a54af0ede020e16
Merge: b0154405 6be13ac0
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Jun 9 05:59:39 2020 +0800

    Merge branch '5.0/fix-clickylink-border-hover-dark-theme'


-----------------------------------------------------------------------


More information about the rt-commit mailing list