From 5d0b8f03191fffb12c8fba1baeb78402a4d21dfe Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Tue, 6 Jan 2015 16:23:53 +0000 Subject: [PATCH] Add text to the user login form. Added some extra markup to page.tpl.php to accomodate the new columns and added a new SASS partial to add the CSS styling. --- sass/partials/common/_user-login.scss | 12 ++++++++++++ tpl/page.tpl.php | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 sass/partials/common/_user-login.scss diff --git a/sass/partials/common/_user-login.scss b/sass/partials/common/_user-login.scss new file mode 100644 index 00000000..2bcd130d --- /dev/null +++ b/sass/partials/common/_user-login.scss @@ -0,0 +1,12 @@ +.page-user.not-logged-in { + #content-inner { + .column-left, + .column-right { + @include span-columns(6); + } + + .column-right { + @include omega; + } + } +} diff --git a/tpl/page.tpl.php b/tpl/page.tpl.php index ce05d6a6..5a325a75 100644 --- a/tpl/page.tpl.php +++ b/tpl/page.tpl.php @@ -98,13 +98,21 @@ <?php print $messages; ?> <?php print render($page['help']); ?> <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?> - <div id="content-inner" class="clearfix"><?php print render($page['content']); ?></div> + <div id="content-inner" class="clearfix"> + <div class="column-left"> + <?php print render($page['content']); ?> + </div> <!-- /.column-left --> + + <div class="column-right"> + <?php print $drupalorg_login_text; ?> + </div> <!-- /.column-right --> + </div> <?php if (!empty($feed_icons)): ?> <div id="feeds">Subscribe with RSS <?php print $feed_icons; ?></div> <?php endif; ?> </div> <!-- /#content --> - </div> <!-- /#column-left --> + </div> <?php if ($page['sidebar_second']): ?> <div id="aside" role="complementary" > -- GitLab