From f22a0633d08e38ac4bf92b5165a708e11b4d6598 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 03 Oct 2012 17:31:37 -0400 Subject: [PATCH] Implemented support for toggling User.canFork in Manager --- src/com/gitblit/wicket/pages/BasePage.html | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html index 6eefa17..4a642e7 100644 --- a/src/com/gitblit/wicket/pages/BasePage.html +++ b/src/com/gitblit/wicket/pages/BasePage.html @@ -8,14 +8,10 @@ <wicket:head> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title wicket:id="title">[page title]</title> - <link rel="stylesheet" href="bootstrap/css/bootstrap.css"/> - <link rel="stylesheet" type="text/css" href="gitblit.css"/> - <!-- Responsive CSS must be included after the above body css! --> - <!-- <link rel="stylesheet" href="bootstrap/css/bootstrap-responsive.css"/> --> <link rel="icon" href="gitblt-favicon.png" type="image/png" /> - <script type="text/javascript" src="bootstrap/js/jquery.js"></script> - <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <link rel="stylesheet" href="bootstrap/css/bootstrap.css"/> + <link rel="stylesheet" type="text/css" href="gitblit.css"/> </wicket:head> <body> @@ -34,15 +30,33 @@ <div wicket:id="userPanel">[user panel]</div> </footer> </div> + + <!-- Override Bootstrap's responsive menu background highlighting --> + <style> + @media (max-width: 979px) { + .nav-collapse .nav > li > a:hover, .nav-collapse .dropdown-menu a:hover { + background-color: #000070; + } + + .navbar div > ul .dropdown-menu li a { + color: #ccc; + } + } + </style> + <!-- Include scripts at end for faster page loading --> + <script type="text/javascript" src="bootstrap/js/jquery.js"></script> + <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> </body> <!-- user fragment --> <wicket:fragment wicket:id="userFragment"> <span class="userPanel" wicket:id="username"></span> <span class="userPanel" wicket:id="loginLink"></span> - <span class="userPanel" wicket:id="separator"></span> - <span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span> + <span class="hidden-phone"> + <span class="userPanel" wicket:id="separator"></span> + <span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span> + </span> </wicket:fragment> </html> \ No newline at end of file -- Gitblit v1.9.1