Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 08:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CSS style

Browse Source
This commit is contained in:
Naoki Takezoe
2016-04-09 22:37:18 +09:00
parent a58ce07736
commit 443498433d
8 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(account.userName){ @html.main(account.userName){
<div class="container body"> <div class="container body">
<div style="float: left; width: 250px;"> <div class="main-sidebar">
<div class="block"> <div class="block">
<div class="account-image">@avatar(account.userName, 240)</div> <div class="account-image">@avatar(account.userName, 240)</div>
<div class="account-fullname">@account.fullName</div> <div class="account-fullname">@account.fullName</div>
@@ -25,7 +25,7 @@
</div> </div>
} }
</div> </div>
<div style="margin-left: 260px; overflow: hidden;"> <div class="main-content">
<ul class="nav nav-tabs" style="margin-bottom: 5px;"> <ul class="nav nav-tabs" style="margin-bottom: 5px;">
<li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li> <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
@if(account.isGroupAccount){ @if(account.isGroupAccount){

10
src/main/twirl/gitbucket/core/dashboard/issues.scala.html
View File

@@ -11,12 +11,10 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Issues"){ @html.main("Issues"){
@sidebar(recentRepositories, userRepositories){ @sidebar(recentRepositories, userRepositories){
<div style="overflow: hidden;"> @dashboard.html.tab("issues")
@dashboard.html.tab("issues") <div class="container">
<div class="container"> @issuesnavi(filter, openCount, closedCount, condition)
@issuesnavi(filter, openCount, closedCount, condition) @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
@issueslist(issues, page, openCount, closedCount, condition, filter, groups)
</div>
</div> </div>
} }
} }

10
src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
View File

@@ -11,12 +11,10 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Pull Requests"){ @html.main("Pull Requests"){
@sidebar(recentRepositories, userRepositories){ @sidebar(recentRepositories, userRepositories){
<div style="overflow: hidden;"> @dashboard.html.tab("pulls")
@dashboard.html.tab("pulls") <div class="container">
<div class="container"> @issuesnavi(filter, openCount, closedCount, condition)
@issuesnavi(filter, openCount, closedCount, condition) @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
@issueslist(issues, page, openCount, closedCount, condition, filter, groups)
</div>
</div> </div>
} }
} }

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

@@ -11,14 +11,12 @@
@Html(information) @Html(information)
</div> </div>
} }
<div style="overflow: hidden;"> @dashboard.html.tab()
@dashboard.html.tab() <div class="container">
<div class="container"> <div class="pull-right">
<div class="pull-right"> <a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
<a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
</div>
@helper.html.activities(activities)
</div> </div>
@helper.html.activities(activities)
</div> </div>
} }
} }

2
src/main/twirl/gitbucket/core/search/menu.scala.html
View File

@@ -3,7 +3,6 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.menu("", repository){ @html.menu("", repository){
<div style="overflow: hidden;">
<ul class="nav nav-tabs" style="margin-bottom: 20px;"> <ul class="nav nav-tabs" style="margin-bottom: 20px;">
<li@if(active=="code"){ class="active"}> <li@if(active=="code"){ class="active"}>
<a href="@url(repository)/search?q=@urlEncode(query)&type=code"> <a href="@url(repository)/search?q=@urlEncode(query)&type=code">
@@ -36,5 +35,4 @@
<input type="hidden" name="type" value="@active"/> <input type="hidden" name="type" value="@active"/>
</form> </form>
@body @body
</div>
} }

54
src/main/twirl/gitbucket/core/settings/menu.scala.html
View File

@@ -1,32 +1,30 @@
@(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context) @(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
<div style="overflow: hidden;"> <ul class="nav nav-tabs" style="margin-bottom: 20px;">
<ul class="nav nav-tabs" style="margin-bottom: 20px;"> <li@if(active=="options"){ class="active"}>
<li@if(active=="options"){ class="active"}> <a href="@url(repository)/settings/options">Options</a>
<a href="@url(repository)/settings/options">Options</a> </li>
</li> <li@if(active=="collaborators"){ class="active"}>
<li@if(active=="collaborators"){ class="active"}> <a href="@url(repository)/settings/collaborators">Collaborators</a>
<a href="@url(repository)/settings/collaborators">Collaborators</a> </li>
</li> @if(!repository.branchList.isEmpty){
@if(!repository.branchList.isEmpty){ <li@if(active=="branches"){ class="active"}>
<li@if(active=="branches"){ class="active"}> <a href="@url(repository)/settings/branches">Branches</a>
<a href="@url(repository)/settings/branches">Branches</a> </li>
</li> }
<li@if(active=="hooks"){ class="active"}>
<a href="@url(repository)/settings/hooks">Service Hooks</a>
</li>
<li@if(active=="danger"){ class="active"}>
<a href="@url(repository)/settings/danger">Danger Zone</a>
</li>
@gitbucket.core.plugin.PluginRegistry().getRepositorySettingTabs.map { tab =>
@tab(repository, context).map { link =>
<li@if(active==link.id){ class="active"}>
<a href="@url(repository)/@link.path">@link.label</a>
</li>
} }
<li@if(active=="hooks"){ class="active"}> }
<a href="@url(repository)/settings/hooks">Service Hooks</a> </ul>
</li> @body
<li@if(active=="danger"){ class="active"}>
<a href="@url(repository)/settings/danger">Danger Zone</a>
</li>
@gitbucket.core.plugin.PluginRegistry().getRepositorySettingTabs.map { tab =>
@tab(repository, context).map { link =>
<li@if(active==link.id){ class="active"}>
<a href="@url(repository)/@link.path">@link.label</a>
</li>
}
}
</ul>
@body
</div>

60
src/main/twirl/gitbucket/core/wiki/edit.scala.html
View File

@@ -13,37 +13,35 @@
<a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a> <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
</div> </div>
<h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1> <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
<div style="overflow: hidden;"> <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
<form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true"> <span id="error-pageName" class="error"></span>
<span id="error-pageName" class="error"></span> <input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name."/>
<input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name."/> <div class="muted attachable">
<div class="muted attachable"> @helper.html.preview(
@helper.html.preview( repository = repository,
repository = repository, content = page.map(_.content).getOrElse(""),
content = page.map(_.content).getOrElse(""), enableWikiLink = true,
enableWikiLink = true, enableRefsLink = false,
enableRefsLink = false, enableLineBreaks = false,
enableLineBreaks = false, enableTaskList = false,
enableTaskList = false, hasWritePermission = false,
hasWritePermission = false, style = "height: 400px;",
style = "height: 400px;", styleClass = "monospace",
styleClass = "monospace", placeholder = "",
placeholder = "", uid = 1
uid = 1 )
) <div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div>
<div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="message">Edit Message</label>
<label for="message">Edit Message</label> <input type="text" id="message" name="message" value="" class="form-control" placeholder="Write a small message here explaining this change. (Optional)"/>
<input type="text" id="message" name="message" value="" class="form-control" placeholder="Write a small message here explaining this change. (Optional)"/> </div>
</div> <div class="form-group pull-right">
<div class="form-group pull-right"> <input type="hidden" name="currentPageName" value="@pageName"/>
<input type="hidden" name="currentPageName" value="@pageName"/> <input type="hidden" name="id" value="@page.map(_.id)"/>
<input type="hidden" name="id" value="@page.map(_.id)"/> <input type="submit" value="Save" class="btn btn-success">
<input type="submit" value="Save" class="btn btn-success"> </div>
</div> </form>
</form>
</div>
} }
} }
<script> <script>

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

@@ -201,6 +201,7 @@ div.main-sidebar {
div.main-content { div.main-content {
margin-left: 260px; margin-left: 260px;
overflow: hidden;
} }
div.main-center { div.main-center {
@@ -215,6 +216,7 @@ div.dashboard-sidebar {
div.dashboard-content { div.dashboard-content {
margin-left: 310px; margin-left: 310px;
overflow: hidden;
} }
div.body { div.body {