[PATCH 1 of 1] hgweb: side-by-side comparison functionality

Wujek Srujek wujek.srujek at gmail.com
Tue Jul 3 14:23:11 CDT 2012


I'm finished, I am actually waiting for the thumbs up from Matt (I think)
or down. Patrick once said that I should wait with the full patch (with all
templates, it will be a pretty big one) until the code itself get Ok-ed. I
wanted to wait until the weekend and ask again what I should do. As far as
the code, templates and CSS are concerned, it's ready for approval.

wujek

On Tue, Jul 3, 2012 at 9:14 PM, Michał Sznajder <michalsznajder at gmail.com>wrote:

> On Mon, Jun 18, 2012 at 6:48 PM, Wujek Srujek
> <wujek.srujek at googlemail.com> wrote:
> > Ok, so I fixed it (by adding the 'overflow' to the 'comparison' class in
> the
> > css file) and also fixed gitweb analogically. Thanks for the tip.
> >
> > wujek
> >
> >
> > On Mon, Jun 18, 2012 at 5:34 PM, Patrick Mézard <patrick at mezard.eu>
> wrote:
> >>
> >> Le 18/06/12 16:55, Wujek Srujek a écrit :
> >> > diff --git a/mercurial/templates/monoblue/filecomparison.tmpl
> >> > b/mercurial/templates/monoblue/filecomparison.tmpl
> >> > --- a/mercurial/templates/monoblue/filecomparison.tmpl
> >> > +++ b/mercurial/templates/monoblue/filecomparison.tmpl
> >> > @@ -57,7 +57,7 @@
> >> >        <span class="legendinfo replace">replaced</span>
> >> >      </div>
> >> >
> >> > -    <div class="comparison">
> >> > +    <div class="comparison" style="overflow: auto;">
> >> >      {comparison}
> >> >      </div>
> >> >
> >> > diff --git a/mercurial/templates/static/style-monoblue.css
> >> > b/mercurial/templates/static/style-monoblue.css
> >> > --- a/mercurial/templates/static/style-monoblue.css
> >> > +++ b/mercurial/templates/static/style-monoblue.css
> >> > @@ -29,7 +29,6 @@
> >> >    background: #FFFFFF;
> >> >    position: relative;
> >> >    color: #666;
> >> > -  overflow: auto;
> >> >  }
> >> >
> >> >  div.page-header {
> >>
> >> Looks better to me, the scrollbar only appears when necessary.
> >>
> >> --
> >> Patrick Mézard
>
> Any chance you will finish it before August release? Code freeze in
> aprox. 2 weeks.
>
> Michał Sznajder
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120703/25c4afc7/attachment.html>


More information about the Mercurial-devel mailing list