MSyed has submitted this change and it was merged. Change subject: Add navbar ......................................................................
Add navbar Change-Id: I6ee6da1a523699a395cd3511a0262acc9ad29cc2 --- M source/index.html.erb M source/layouts/layout.erb 2 files changed, 33 insertions(+), 17 deletions(-) Approvals: MSyed: Verified; Looks good to me, approved diff --git a/source/index.html.erb b/source/index.html.erb index 5612707..f95bef3 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -1,3 +1 @@ -<div class="container"> - <h1>Home</h1> -</div> +<h1>Home</h1> diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index 619b4f7..ca76243 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -1,19 +1,37 @@ <!doctype html> <html> - <head> - <meta charset="utf-8"> + <head> + <meta charset="utf-8"> + <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"> + <title><%= current_page.data.title || "Wikimedia Foundation: Transparency Report" %></title> - <!-- Always force latest IE rendering engine or request Chrome Frame --> - <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"> + <%= stylesheet_link_tag "bootstrap.min.css" %> + <%= javascript_include_tag "all" %> + </head> - <!-- Use title if it's in the page YAML frontmatter --> - <title><%= current_page.data.title || "Wikimedia Foundation: Transparency Report" %></title> - - <%= stylesheet_link_tag "bootstrap.min.css" %> - <%= javascript_include_tag "all" %> - </head> - - <body class="<%= page_classes %>"> - <%= yield %> - </body> + <body class="<%= page_classes %>"> + <div class="container"> + <header> + <nav class="navbar navbar-default" role="navigation"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="#">Wikimedia Transparency Report</a> + </div> + <div class="collapse navbar-collapse"> + <ul class="nav navbar-nav navbar-right"> + <li><a href="/privacy">Privacy</a></li> + <li><a href="/content">Content</a></li> + <li><a href="/faq">FAQ</a></li> + </ul> + </div> + </nav> + </header> + <%= yield %> + </div> + </body> </html> -- To view, visit https://gerrit.wikimedia.org/r/136994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ee6da1a523699a395cd3511a0262acc9ad29cc2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport Gerrit-Branch: master Gerrit-Owner: Prtksxna <[email protected]> Gerrit-Reviewer: MSyed <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
