Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-18 03:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix sidebar style

Browse Source
This commit is contained in:
Naoki Takezoe
2015-12-07 16:01:03 +09:00
parent 9475215fa6
commit 7853b22522
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/gitbucket/core/account/edit.scala.html
View File

@@ -13,12 +13,12 @@
@if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
<form action="@url(account.userName)/_edit" method="POST" validate="true">
<div class="box">
<div class="box-header">Profile</div>
<div class="box-header"><span class="strong">Profile</span></div>
<div class="box-content-bottom">
<div class="row">
<div class="col-md-6">
@if(account.password.nonEmpty){
<fieldset>
<fieldset class="form-group">
<label for="password" class="strong">
Password (input to change password):
</label>
@@ -26,24 +26,24 @@
<span id="error-password" class="error"></span>
</fieldset>
}
<fieldset>
<fieldset class="form-group">
<label for="fullName" class="strong">Full Name:</label>
<input type="text" name="fullName" id="fullName" class="form-control" value="@account.fullName"/>
<span id="error-fullName" class="error"></span>
</fieldset>
<fieldset>
<fieldset class="form-group">
<label for="mailAddress" class="strong">Mail Address:</label>
<input type="text" name="mailAddress" id="mailAddress" class="form-control" value="@if(!LDAPUtil.isDummyMailAddress(account)){@account.mailAddress}"/>
<span id="error-mailAddress" class="error"></span>
</fieldset>
<fieldset>
<fieldset class="form-group">
<label for="url" class="strong">URL (optional):</label>
<input type="text" name="url" id="url" class="form-control" value="@account.url"/>
<span id="error-url" class="error"></span>
</fieldset>
</div>
<div class="col-md-6">
<fieldset>
<fieldset class="form-group">
<label for="avatar" class="strong">Image (optional):</label>
@helper.html.uploadavatar(Some(account))
</fieldset>

3
src/main/twirl/gitbucket/core/account/menu.scala.html
View File

@@ -2,6 +2,9 @@
@import context._
<div class="box">
<ul class="nav nav-tabs nav-stacked side-menu">
<li>
<span class="header strong">Personal settings</span>
</li>
<li@if(active=="profile"){ class="active"}>
<a href="@path/@loginAccount.get.userName/_edit">Profile</a>
</li>

3
src/main/twirl/gitbucket/core/admin/menu.scala.html
View File

@@ -4,6 +4,9 @@
<div class="row">
<div class="col-md-3">
<ul class="nav nav-tabs nav-stacked side-menu" id="system-admin-menu-container">
<li>
<span class="header strong">System administration</span>
</li>
<li@if(active=="users"){ class="active"}>
<a href="@path/admin/users">User Management</a>
</li>

2
src/main/twirl/gitbucket/core/admin/system.scala.html
View File

@@ -7,7 +7,7 @@
@helper.html.information(info)
<form action="@path/admin/system" method="POST" validate="true" class="form-horizontal">
<div class="box">
<div class="box-header">System Settings</div>
<div class="box-header"><span class="strong">System Settings</span></div>
<div class="box-content-bottom">
<!--====================================================================-->
<!-- GITBUCKET_HOME -->

25
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -544,10 +544,21 @@ ul.nav-stacked.side-menu {
ul.nav-stacked.side-menu li {
background-color: #f9f9f9;
margin-bottom: -3px;
}
ul.nav-stacked.side-menu li span.header {
border-top-right-radius: 3px;
border-top-left-radius: 3px;
border: 1px solid #d8d8d8;
display: block;
padding: 8px 15px 9px;
margin-right: 2px;
background-color: #f5f5f5;
}
ul.nav-stacked.side-menu li a:hover {
background-color: white;
background-color: transparent;
}
ul.nav-stacked.side-menu li.active a {
@@ -559,15 +570,25 @@ ul.nav-stacked.side-menu li.active a {
ul.nav-stacked.side-menu li.active a:hover {
background-color: white;
color: #333;
color: #4183c4;
font-weight: bold;
border-left: 2px solid #cc6666;
}
.nav-tabs.nav-stacked.side-menu > li > a {
border: 1px solid #d8d8d8;
border-radius: 0px;
background-color: white;
color: #4183c4;
padding: 8px 15px 9px;
}
/*
.nav-tabs.nav-stacked.side-menu > li:first-child > a {
border-top-right-radius: 3px;
border-top-left-radius: 3px;
}
*/
.nav-tabs.nav-stacked.side-menu > li:last-child > a {
border-bottom-right-radius: 3px;