Patchset ACK'd and pushed. Mainn
----- Original Message ----- > From: "Brian McLaughlin" <[email protected]> > To: [email protected] > Sent: Friday, September 14, 2012 12:43:47 PM > Subject: [PATCH conductor] Remove unneeded My Account button in Header > > --- > src/app/stylesheets/_header.scss | 9 +++++---- > src/app/views/layouts/application.html.haml | 1 - > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/src/app/stylesheets/_header.scss > b/src/app/stylesheets/_header.scss > index a1468df..b14025b 100644 > --- a/src/app/stylesheets/_header.scss > +++ b/src/app/stylesheets/_header.scss > @@ -17,9 +17,10 @@ header#header { > } > > #widget-container { > - li.header-widget a{ > - text-decoration:none; > - font-family: $screenfont; // $headfont (Overpass) is set for > whole header, which aligns wrong in the line > - } > + ul {float:right;} > + li.header-widget a{ > + text-decoration:none; > + font-family: $screenfont; // $headfont (Overpass) is set for > whole header, which aligns wrong in the line > + } > } > } > diff --git a/src/app/views/layouts/application.html.haml > b/src/app/views/layouts/application.html.haml > index 780c1b8..26ad06f 100644 > --- a/src/app/views/layouts/application.html.haml > +++ b/src/app/views/layouts/application.html.haml > @@ -46,7 +46,6 @@ > %ul > - if current_user > %li.header-widget= link_to format_user_name(current_user), > account_path > - %li.header-widget= link_to t('masthead.my_account'), > account_path > %li.header-widget= link_to t('masthead.logout'), logout_path > - else > %li.header-widget= link_to t('masthead.login'), login_path > -- > 1.7.11.4 > >
