# HG changeset patch # User Denis Laxalde # Date 2017-04-13 07:49:48 # Node ID eaf3819631c206722c7594d8f54ed769a95f54b4 # Parent 7a3fc3f3e89a7193a557e47fbe0563cac38c4c92 gitweb: plug followlines UI in filerevision view Mostly copy CSS rules from style-paper.css into style-gitweb.css. The only modification is addition of !important on "background-color" rule for "pre.sourcelines > span.followlines-selected" selector as the background color is otherwise overriden by "pre.sourcelines.stripes > :nth-child(4n+4)" rule. diff --git a/mercurial/templates/gitweb/filerevision.tmpl b/mercurial/templates/gitweb/filerevision.tmpl --- a/mercurial/templates/gitweb/filerevision.tmpl +++ b/mercurial/templates/gitweb/filerevision.tmpl @@ -64,7 +64,9 @@ file |
-
{text%fileline}
+
{text%fileline}
+ + {footer} diff --git a/mercurial/templates/static/style-gitweb.css b/mercurial/templates/static/style-gitweb.css --- a/mercurial/templates/static/style-gitweb.css +++ b/mercurial/templates/static/style-gitweb.css @@ -149,6 +149,62 @@ pre.sourcelines.stripes > span:target { font-family: monospace; } +/* Followlines */ +div.page_body pre.sourcelines > span.followlines-select:hover { + cursor: cell; +} + +pre.sourcelines > span.followlines-selected { + background-color: #99C7E9 !important; +} + +div#followlines { + background-color: #B7B7B7; + border: 1px solid #CCC; + border-radius: 5px; + padding: 4px; + position: fixed; +} + +div.followlines-cancel { + text-align: right; +} + +div.followlines-cancel > button { + line-height: 80%; + padding: 0; + border: 0; + border-radius: 2px; + background-color: inherit; + font-weight: bold; +} + +div.followlines-cancel > button:hover { + color: #FFFFFF; + background-color: #CF1F1F; +} + +div.followlines-link { + margin: 2px; + margin-top: 4px; + font-family: sans-serif; +} + +div#followlines-tooltip { + display: none; + position: fixed; + background-color: #ffc; + border: 1px solid #999; + padding: 2px; +} + +.sourcelines:hover > div#followlines-tooltip { + display: inline; +} + +.sourcelines:hover > div#followlines-tooltip.hidden { + display: none; +} /* Graph */ div#wrapper { position: relative; diff --git a/tests/test-hgweb.t b/tests/test-hgweb.t --- a/tests/test-hgweb.t +++ b/tests/test-hgweb.t @@ -337,7 +337,7 @@ static file $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server 200 Script output follows - content-length: 7032 + content-length: 8012 content-type: text/css body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; } @@ -491,6 +491,62 @@ static file font-family: monospace; } + /* Followlines */ + div.page_body pre.sourcelines > span.followlines-select:hover { + cursor: cell; + } + + pre.sourcelines > span.followlines-selected { + background-color: #99C7E9 !important; + } + + div#followlines { + background-color: #B7B7B7; + border: 1px solid #CCC; + border-radius: 5px; + padding: 4px; + position: fixed; + } + + div.followlines-cancel { + text-align: right; + } + + div.followlines-cancel > button { + line-height: 80%; + padding: 0; + border: 0; + border-radius: 2px; + background-color: inherit; + font-weight: bold; + } + + div.followlines-cancel > button:hover { + color: #FFFFFF; + background-color: #CF1F1F; + } + + div.followlines-link { + margin: 2px; + margin-top: 4px; + font-family: sans-serif; + } + + div#followlines-tooltip { + display: none; + position: fixed; + background-color: #ffc; + border: 1px solid #999; + padding: 2px; + } + + .sourcelines:hover > div#followlines-tooltip { + display: inline; + } + + .sourcelines:hover > div#followlines-tooltip.hidden { + display: none; + } /* Graph */ div#wrapper { position: relative;