Patchwork [V3] css: fixed font-family

login
register
mail settings
Submitter Alexander Plavin
Date April 20, 2013, 2:56 p.m.
Message ID <50f4288b30ad581c1856.1366469792@debian-alexander.dolgopa>
Download mbox | patch
Permalink /patch/1466/
State Superseded
Commit 6bc76c0e60b98ee96fcb5df8b056b45307d0f7bc
Headers show

Comments

Alexander Plavin - April 20, 2013, 2:56 p.m.
# HG changeset patch
# User Alexander Plavin <me@aplavin.ru>
# Date 1366461998 -14400
#      Sat Apr 20 16:46:38 2013 +0400
# Branch stable
# Node ID 50f4288b30ad581c1856bef446021ab68a2128bb
# Parent  4ab185997587bb838aaacc86e17781c1a930d7bf
css: fixed font-family

There is no 'sans' font-family, replaced with 'sans-serif'
Alexander Plavin - April 20, 2013, 2:58 p.m.
I'm very sorry for sending such a simple patch multiple times. I had some
troubles with my Python installation and thought that tests were successful
while they were not.


2013/4/20 Alexander Plavin <me@aplavin.ru>

> # HG changeset patch
> # User Alexander Plavin <me@aplavin.ru>
> # Date 1366461998 -14400
> #      Sat Apr 20 16:46:38 2013 +0400
> # Branch stable
> # Node ID 50f4288b30ad581c1856bef446021ab68a2128bb
> # Parent  4ab185997587bb838aaacc86e17781c1a930d7bf
> css: fixed font-family
>
> There is no 'sans' font-family, replaced with 'sans-serif'
>
> diff -r 4ab185997587 -r 50f4288b30ad
> mercurial/templates/static/style-gitweb.css
> --- a/mercurial/templates/static/style-gitweb.css       Fri Apr 19
> 22:39:51 2013 +0400
> +++ b/mercurial/templates/static/style-gitweb.css       Sat Apr 20
> 16:46:38 2013 +0400
> @@ -1,4 +1,4 @@
> -body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid
> #d9d8d1; border-width:1px; margin:10px; }
> +body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1;
> border-width:1px; margin:10px; }
>  a { color:#0000cc; }
>  a:hover, a:visited, a:active { color:#880000; }
>  div.page_header { height:25px; padding:8px; font-size:18px;
> font-weight:bold; background-color:#d9d8d1; }
> diff -r 4ab185997587 -r 50f4288b30ad mercurial/templates/static/style.css
> --- a/mercurial/templates/static/style.css      Fri Apr 19 22:39:51 2013
> +0400
> +++ b/mercurial/templates/static/style.css      Sat Apr 20 16:46:38 2013
> +0400
> @@ -14,13 +14,13 @@
>    background-color: #666;
>    padding: 2pt;
>    color: white;
> -  font-family: sans;
> +  font-family: sans-serif;
>    font-weight: bold;
>  }
>  .navigate a {
>    background-color: #ccc;
>    padding: 2pt;
> -  font-family: sans;
> +  font-family: sans-serif;
>    color: black;
>  }
>
> diff -r 4ab185997587 -r 50f4288b30ad tests/test-hgweb-commands.t
> --- a/tests/test-hgweb-commands.t       Fri Apr 19 22:39:51 2013 +0400
> +++ b/tests/test-hgweb-commands.t       Sat Apr 20 16:46:38 2013 +0400
> @@ -1179,13 +1179,13 @@
>      background-color: #666;
>      padding: 2pt;
>      color: white;
> -    font-family: sans;
> +    font-family: sans-serif;
>      font-weight: bold;
>    }
>    .navigate a {
>      background-color: #ccc;
>      padding: 2pt;
> -    font-family: sans;
> +    font-family: sans-serif;
>      color: black;
>    }
>
> diff -r 4ab185997587 -r 50f4288b30ad tests/test-hgweb.t
> --- a/tests/test-hgweb.t        Fri Apr 19 22:39:51 2013 +0400
> +++ b/tests/test-hgweb.t        Sat Apr 20 16:46:38 2013 +0400
> @@ -312,10 +312,10 @@
>
>    $ "$TESTDIR/get-with-headers.py" --twice localhost:$HGPORT
> 'static/style-gitweb.css' - date etag server
>    200 Script output follows
> -  content-length: 4619
> +  content-length: 4607
>    content-type: text/css
>
> -  body { font-family: sans-serif; font-size: 12px; margin:0px;
> border:solid #d9d8d1; border-width:1px; margin:10px; }
> +  body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1;
> border-width:1px; margin:10px; }
>    a { color:#0000cc; }
>    a:hover, a:visited, a:active { color:#880000; }
>    div.page_header { height:25px; padding:8px; font-size:18px;
> font-weight:bold; background-color:#d9d8d1; }
>
Mads Kiilerich - April 20, 2013, 3:06 p.m.
This is (mostly) a bugfix and thus a candidate for going to the stable 
branch. It should thus be flagged as stable to make your intention 
explicit and help the reviewer.

(ContributingChanges gives small hints about this ... but it could 
perhaps be more explicit.)

On 04/20/2013 04:56 PM, Alexander Plavin wrote:
> # HG changeset patch
> # User Alexander Plavin <me@aplavin.ru>
> # Date 1366461998 -14400
> #      Sat Apr 20 16:46:38 2013 +0400
> # Branch stable
> # Node ID 50f4288b30ad581c1856bef446021ab68a2128bb
> # Parent  4ab185997587bb838aaacc86e17781c1a930d7bf
> css: fixed font-family
>
> There is no 'sans' font-family, replaced with 'sans-serif'
>
> diff -r 4ab185997587 -r 50f4288b30ad mercurial/templates/static/style-gitweb.css
> --- a/mercurial/templates/static/style-gitweb.css	Fri Apr 19 22:39:51 2013 +0400
> +++ b/mercurial/templates/static/style-gitweb.css	Sat Apr 20 16:46:38 2013 +0400
> @@ -1,4 +1,4 @@
> -body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
> +body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; }
>   a { color:#0000cc; }
>   a:hover, a:visited, a:active { color:#880000; }
>   div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }

This is probably a good change too, but a separate one and should be in 
a separate patch.

I assume it doesn't fix any "real" bug, and it should thus wait for 
'default' to be open again after 2.6 has been released.

/Mads

Patch

diff -r 4ab185997587 -r 50f4288b30ad mercurial/templates/static/style-gitweb.css
--- a/mercurial/templates/static/style-gitweb.css	Fri Apr 19 22:39:51 2013 +0400
+++ b/mercurial/templates/static/style-gitweb.css	Sat Apr 20 16:46:38 2013 +0400
@@ -1,4 +1,4 @@ 
-body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
+body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; }
 a { color:#0000cc; }
 a:hover, a:visited, a:active { color:#880000; }
 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
diff -r 4ab185997587 -r 50f4288b30ad mercurial/templates/static/style.css
--- a/mercurial/templates/static/style.css	Fri Apr 19 22:39:51 2013 +0400
+++ b/mercurial/templates/static/style.css	Sat Apr 20 16:46:38 2013 +0400
@@ -14,13 +14,13 @@ 
   background-color: #666;
   padding: 2pt;
   color: white;
-  font-family: sans;
+  font-family: sans-serif;
   font-weight: bold;
 }
 .navigate a {
   background-color: #ccc;
   padding: 2pt;
-  font-family: sans;
+  font-family: sans-serif;
   color: black;
 }
 
diff -r 4ab185997587 -r 50f4288b30ad tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t	Fri Apr 19 22:39:51 2013 +0400
+++ b/tests/test-hgweb-commands.t	Sat Apr 20 16:46:38 2013 +0400
@@ -1179,13 +1179,13 @@ 
     background-color: #666;
     padding: 2pt;
     color: white;
-    font-family: sans;
+    font-family: sans-serif;
     font-weight: bold;
   }
   .navigate a {
     background-color: #ccc;
     padding: 2pt;
-    font-family: sans;
+    font-family: sans-serif;
     color: black;
   }
   
diff -r 4ab185997587 -r 50f4288b30ad tests/test-hgweb.t
--- a/tests/test-hgweb.t	Fri Apr 19 22:39:51 2013 +0400
+++ b/tests/test-hgweb.t	Sat Apr 20 16:46:38 2013 +0400
@@ -312,10 +312,10 @@ 
 
   $ "$TESTDIR/get-with-headers.py" --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server
   200 Script output follows
-  content-length: 4619
+  content-length: 4607
   content-type: text/css
   
-  body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
+  body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; }
   a { color:#0000cc; }
   a:hover, a:visited, a:active { color:#880000; }
   div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }