fix css more

fstachura · fstachura · commit ed7ff8d19669 · 2025-02-27T22:12:57.000+01:00
diff --git a/elixir/filters/configin.py b/elixir/filters/configin.py
@@ -1,5 +1,5 @@
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for Config.in includes
 # source "path/file"
@@ -23,7 +23,7 @@ def keep_configin(m):
     def untransform_formatted_code(self, ctx: FilterContext, html: str) -> str:
         def replace_configin(m):
             w = self.configin[decode_number(m.group(1)) - 1]
-            return f'<a href="{ ctx.get_absolute_source_url(w) }">{ w }</a>'
+            return format_source_link(ctx.get_absolute_source_url(w), w)
 
         return re.sub('__KEEPCONFIGIN__([A-J]+)', replace_configin, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/cppinc.py b/elixir/filters/cppinc.py
@@ -1,5 +1,5 @@
 import re
-from .utils import Filter, FilterContext, encode_number, decode_number, extension_matches
+from .utils import Filter, FilterContext, encode_number, decode_number, extension_matches, format_source_link
 
 # Filters for cpp includes like these:
 # #include "file"
@@ -24,8 +24,7 @@ def keep_cppinc(m):
     def untransform_formatted_code(self, ctx: FilterContext, html: str) -> str:
         def replace_cppinc(m):
             w = self.cppinc[decode_number(m.group(1)) - 1]
-            url = ctx.get_relative_source_url(w)
-            return f'<a href="{ url }">{ w }</a>'
+            return format_source_link(ctx.get_relative_source_url(w), w)
 
         return re.sub('__KEEPCPPINC__([A-J]+)', replace_cppinc, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/cpppathinc.py b/elixir/filters/cpppathinc.py
@@ -1,5 +1,5 @@
 import re
-from .utils import Filter, FilterContext, encode_number, decode_number, extension_matches
+from .utils import Filter, FilterContext, encode_number, decode_number, extension_matches, format_source_link
 
 # Filters for cpp includes like these:
 # #include <file>
@@ -36,7 +36,7 @@ def untransform_formatted_code(self, ctx: FilterContext, html: str) -> str:
         def replace_cpppathinc(m):
             w = self.cpppathinc[decode_number(m.group(1)) - 1]
             path = f'/include/{ w }'
-            return f'<a href="{ ctx.get_absolute_source_url(path) }">{ w }</a>'
+            return format_source_link(ctx.get_absolute_source_url(path), w)
 
         return re.sub('__KEEPCPPPATHINC__([A-J]+)', replace_cpppathinc, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/dtsi.py b/elixir/filters/dtsi.py
@@ -1,5 +1,5 @@
 import re
-from .utils import Filter, FilterContext, encode_number, decode_number, extension_matches
+from .utils import Filter, FilterContext, encode_number, decode_number, extension_matches, format_source_link
 
 # Filters for dts includes as follows:
 # Replaces include directives in dts/dtsi files with links to source
@@ -24,7 +24,7 @@ def keep_dtsi(m):
     def untransform_formatted_code(self, ctx: FilterContext, html: str) -> str:
         def replace_dtsi(m):
             w = self.dtsi[decode_number(m.group(1)) - 1]
-            return f'<a href="{ ctx.get_relative_source_url(w) }">{ w }</a>'
+            return format_source_link(ctx.get_relative_source_url(w), w)
 
         return re.sub('__KEEPDTSI__([A-J]+)', replace_dtsi, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/kconfig.py b/elixir/filters/kconfig.py
@@ -1,5 +1,5 @@
 import re
-from .utils import Filter, FilterContext, encode_number, decode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, encode_number, decode_number, filename_without_ext_matches, format_source_link
 
 # Filters for Kconfig includes
 # Replaces KConfig includes (source keyword) with links to included files
@@ -24,7 +24,7 @@ def keep_kconfig(m):
     def untransform_formatted_code(self, ctx: FilterContext, html: str) -> str:
         def replace_kconfig(m):
             w = self.kconfig[decode_number(m.group(1)) - 1]
-            return f'<a href="{ ctx.get_absolute_source_url(w) }">{ w }</a>'
+            return format_source_link(ctx.get_absolute_source_url(w), w)
 
         return re.sub('__KEEPKCONFIG__([A-J]+)', replace_kconfig, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/makefiledir.py b/elixir/filters/makefiledir.py
@@ -1,6 +1,6 @@
 from os.path import dirname
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for Makefile directory includes as follows:
 # obj-$(VALUE) += dir/
@@ -39,7 +39,7 @@ def replace_makefiledir(m):
 
             fpath = f'{ filedir }{ w }/Makefile'
 
-            return f'<a href="{ ctx.get_absolute_source_url(fpath) }">{ w }/</a>'
+            return format_source_link(ctx.get_absolute_source_url(fpath), w)
 
         return re.sub('__KEEPMAKEFILEDIR__([A-J]+)/', replace_makefiledir, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/makefiledtb.py b/elixir/filters/makefiledtb.py
@@ -1,6 +1,6 @@
 from os.path import dirname
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for Makefile file includes like these:
 # dtb-y += file.dtb
@@ -30,7 +30,7 @@ def replace_makefiledtb(m):
                 filedir += '/'
 
             npath = f'{ filedir }{ w }.dts'
-            return f'<a href="{ ctx.get_absolute_source_url(npath) }">{ w }.dtb</a>'
+            return format_source_link(ctx.get_absolute_source_url(npath), w+'.dtb')
 
         return re.sub('__KEEPMAKEFILEDTB__([A-J]+)\.dtb', replace_makefiledtb, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/makefilefile.py b/elixir/filters/makefilefile.py
@@ -1,6 +1,6 @@
 from os.path import dirname
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for files listed in Makefiles
 # path/file
@@ -38,7 +38,7 @@ def replace_makefilefile(m):
                 filedir += '/'
 
             npath = filedir + w
-            return f'<a href="{ ctx.get_absolute_source_url(npath) }">{ w }</a>'
+            return format_source_link(ctx.get_absolute_source_url(npath), w)
 
         return re.sub('__KEEPMAKEFILEFILE__([A-J]+)', replace_makefilefile, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/makefileo.py b/elixir/filters/makefileo.py
@@ -1,6 +1,6 @@
 from os.path import dirname
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for Makefile file includes like these:
 # file.o
@@ -30,7 +30,7 @@ def replace_makefileo(m):
                 filedir += '/'
 
             npath = f'{ filedir }{ w }.c'
-            return f'<a href="{ ctx.get_absolute_source_url(npath) }">{ w }.o</a>'
+            return format_source_link(ctx.get_absolute_source_url(npath), w+'.o')
 
         return re.sub('__KEEPMAKEFILEO__([A-J]+)\.o', replace_makefileo, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/makefilesrctree.py b/elixir/filters/makefilesrctree.py
@@ -1,5 +1,5 @@
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for files listed in Makefiles using $(srctree)
 # $(srctree)/Makefile
@@ -27,8 +27,7 @@ def keep_makefilesrctree(m):
     def untransform_formatted_code(self, ctx: FilterContext, html: str) -> str:
         def replace_makefilesrctree(m):
             w = self.makefilesrctree[decode_number(m.group(1)) - 1]
-            url = ctx.get_absolute_source_url(w)
-            return f'<a href="{ url }">$(srctree)/{ w }</a>'
+            return format_source_link(ctx.get_absolute_source_url(w), f'$(srctree)/{ w }')
 
         return re.sub('__KEEPMAKEFILESRCTREE__([A-J]+)', replace_makefilesrctree, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/makefilesubdir.py b/elixir/filters/makefilesubdir.py
@@ -1,6 +1,6 @@
 from os.path import dirname
 import re
-from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches
+from .utils import Filter, FilterContext, decode_number, encode_number, filename_without_ext_matches, format_source_link
 
 # Filters for Makefile directory includes as follows:
 # subdir-y += dir
@@ -31,7 +31,7 @@ def replace_makefilesubdir(m):
                 filedir += '/'
 
             npath = f'{ filedir }{ w }/Makefile'
-            return f'<a href="{ ctx.get_absolute_source_url(npath) }">{ w }</a>'
+            return format_source_link(ctx.get_absolute_source_url(npath), w)
 
         return re.sub('__KEEPMAKESUBDIR__([A-J]+)', replace_makefilesubdir, html, flags=re.MULTILINE)
 
diff --git a/elixir/filters/utils.py b/elixir/filters/utils.py
@@ -91,3 +91,6 @@ def decode_number(string):
 
     return int(result)
 
+def format_source_link(url: str, label: str) -> str:
+    return f'<a class="source-link" href="{ url }">{ label }</a>'
+
diff --git a/elixir/web.py b/elixir/web.py
@@ -558,7 +558,7 @@ def get_ident_url(ident, ident_family=None):
     html_code_block = format_code(fname, code)
 
     # Replace line numbers by links to the corresponding line in the current file
-    html_code_block = sub('href="#codeline-(\d+)', 'name="L\\1" id="L\\1" href="#L\\1', html_code_block)
+    html_code_block = sub('href="#codeline-(\d+)', 'class="line-link" name="L\\1" id="L\\1" href="#L\\1', html_code_block)
 
     for f in filters:
         html_code_block = f.untransform_formatted_code(filter_ctx, html_code_block)
@@ -642,8 +642,10 @@ def get_ident_url(ident, ident_family=None):
     html_code_block, html_code_other_block = format_diff(fname, diff, code, code_other)
 
     # Replace line numbers by links to the corresponding line in the current file
-    html_code_block = sub('href="#codeline-(\d+)', 'name="L\\1" id="L\\1" href="#L\\1', html_code_block)
-    html_code_other_block = sub('href="#codeline-(\d+)', 'name="OL\\1" id="OL\\1" href="#OL\\1', html_code_other_block)
+    html_code_block = sub('href="#codeline-(\d+)',
+                          'class="line-link" name="L\\1" id="L\\1" href="#L\\1', html_code_block)
+    html_code_other_block = sub('href="#codeline-(\d+)',
+                          'class="line-link" name="OL\\1" id="OL\\1" href="#OL\\1', html_code_other_block)
 
     for f in filters:
         html_code_block = f.untransform_formatted_code(filter_ctx, html_code_block)
diff --git a/static/style.css b/static/style.css
@@ -62,7 +62,6 @@ pre {
   font-size: 0.9em;
   line-height: 1.2;
   padding: 0;
-  color: #787878;
 }
 
 table {
@@ -882,7 +881,11 @@ span[id^='codeline-'] {
   padding-left: unset;
 }
 
-.diff span[id^='codeline-'] > a {
+.diff span[id^='codeline-'] span {
+  display: inline-block;
+}
+
+.diff .line-link {
   background: #e9e9e9;
   color: #999;
   padding-left: 1em;
@@ -938,12 +941,6 @@ span[id^='codeline-'].line-highlight {
   outline-offset: -1px;
 }
 
-.highlight pre {
-  padding-top: 0;
-}
-.highlight pre span:first-child {
-}
-
 .highlight .code a {
   color: inherit;
   font-weight: 700;
@@ -954,7 +951,8 @@ span[id^='codeline-'].line-highlight {
   border-bottom: 1px dotted #000;
 }
 
-.highlight a {
+.highlight .source-link,
+.highlight .ident {
   color: inherit;
   font-weight: 700;
   background: linear-gradient(to bottom, #0000 10%, #f4f6ff 10%, #f4f6ff 90%, #0000 90%);
@@ -1052,7 +1050,7 @@ span[id^='codeline-'].line-highlight {
 
 /* highlight */
 
-.highlight .code pre {
+.highlight pre {
   color: #000;
   -moz-tab-size: 8;
   -o-tab-size: 8;
