← Back to team overview

fenics team mailing list archive

Re: [Branch ~fenics-core/fenics-doc/1.0] Rev 296: Removed <h2> as requested by Marie

 

On 05/31/2011 01:49 PM, Anders Logg wrote:
On Tue, May 31, 2011 at 01:05:44PM +0200, Marie E. Rognes wrote:
On 05/31/2011 01:04 PM, Harish Narayanan wrote:
On 5/31/11 1:03 PM, Marie E. Rognes wrote:
On 05/31/2011 12:58 PM, noreply@xxxxxxxxxxxxx wrote:
------------------------------------------------------------
revno: 296
committer: Harish Narayanan<hnarayanan@xxxxxxxxx>
branch nick: fenics-doc
timestamp: Tue 2011-05-31 12:57:19 +0200
message:
    Removed<h2>    as requested by Marie
modified:
    source/_themes/fenics/layout.html



I've merged fenics-doc/1.0 with fenics-doc as you might have noticed ;-)

Please push there.

Done.


Great, thanks :-)

What is the motivation for the merge?


Mainly, I didn't see the point of keeping a "dead branch" as the main branch.


Luckily the cronjob that
automatically pulls from fenics-doc and publishes it on the web page
is not running. (And I would like to keep it so until the pages are
ready for launch.)

I talked to Johannes about the cron-job before doing the merge, so I would hardly call it luck ;-)


As discussed last week (with either Marie or Harish, don't remember),
perhaps it is more natural now to put the web pages under fenics-web
instead of fenics-doc (now that the actual docs are located in the
projects)?

Yes!

--
Marie


Harish: what we will get from the designer is the main logo to be
placed in the top right corner of the red banner, or perhaps the
entire banner including the logo and the text "FEniCS Project" in that
special font. We will also get a bunch of icons in various sizes and
formats (desktop install, small thumbnail for newsitems etc), so feel
free to move ahead with the design/structuring of the main page any
time.

--
Anders



Follow ups

References