gitweb: Use light/dark for class names also in 'blame' view

Instead of using "light2" and "dark2" for class names in 'blame' view
(in place of "light" and "dark" classes in other places) to avoid
changing style on hover in 'blame' view while doing it for other views
(like 'shortlog'), use more advanced CSS, relying on the fact that
more specific selector wins.

While at it add a few comments to gitweb CSS file, and consolidate
some repeated info.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 47633376d1af3ac4345ced69560416d43f3a4c1f..8f68fe30914b2cf4f5337a303202b39eec3cdbd7 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -226,22 +226,25 @@ th {
        text-align: left;
 }
 
        text-align: left;
 }
 

-tr.light:hover {
-       background-color: #edece6;
-}
-
-tr.dark {
-       background-color: #f6f6f0;
+/* do not change row style on hover for 'blame' view */
+tr.light,
+table.blame .light:hover {
+       background-color: #ffffff;

 }
 
 }
 

-tr.dark2 {
+tr.dark,
+table.blame .dark:hover {

        background-color: #f6f6f0;
 }
 
        background-color: #f6f6f0;
 }
 

+/* currently both use the same, but it can change */
+tr.light:hover,

 tr.dark:hover {
        background-color: #edece6;
 }
 
 tr.dark:hover {
        background-color: #edece6;
 }
 

+/* boundary commits in 'blame' view */
+/* and commits without "previous" */

 tr.boundary td.sha1,
 tr.no-previous td.linenr {
        font-weight: bold;
 tr.boundary td.sha1,
 tr.no-previous td.linenr {
        font-weight: bold;

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ea1ab5f846ec34f41af803d23357fdacac3f9bb5..2cb60bedc65be8cdf43b9c0691a8a81e0a8f8cb4 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4801,7 +4801,7 @@ sub git_blame {
        git_print_page_path($file_name, $ftype, $hash_base);
 
        # page body
        git_print_page_path($file_name, $ftype, $hash_base);
 
        # page body

-       my @rev_color = qw(light2 dark2);
+       my @rev_color = qw(light dark);

        my $num_colors = scalar(@rev_color);
        my $current_color = 0;
        my %metainfo = ();
        my $num_colors = scalar(@rev_color);
        my $current_color = 0;
        my %metainfo = ();