Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 20:46:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small fix for UI styles

Browse Source
This commit is contained in:
Naoki Takezoe
2016-03-16 10:36:52 +09:00
parent d1f42e0ed7
commit 1d085d52bb
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/gitbucket/core/issues/create.scala.html
View File

@@ -14,7 +14,7 @@
<div class="panel panel-default issue-box">
<div class="panel-body">
<span id="error-title" class="error"></span>
<input type="text" id="issue-title" name="title" class="form-control input-lg" value="" placeholder="Title" autofocus/>
<input type="text" id="issue-title" name="title" class="form-control" value="" placeholder="Title" autofocus/>
@helper.html.preview(
repository = repository,
content = "",

2
src/main/twirl/gitbucket/core/issues/labellist.scala.html
View File

@@ -1,6 +1,6 @@
@(issueLabels: List[gitbucket.core.model.Label])
@if(issueLabels.isEmpty){
<li><span class="muted small">None yet</span></li>
<li><span class="muted">None yet</span></li>
}
@issueLabels.map { label =>
<li><span class="issue-label" style="background-color: #@label.color; color: #@label.fontColor;">@label.labelName</span></li>

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

@@ -51,7 +51,7 @@
<div class="pull-right">
<form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/update_branch">
<input type="hidden" name="expected_head_oid" value="@pullreq.commitIdFrom">
<button class="btn"@if(!status.canUpdate){ disabled="true"} id="update-branch-button">Update branch</button>
<button class="btn btn-default"@if(!status.canUpdate){ disabled="true"} id="update-branch-button">Update branch</button>
</form>
</div>
}
@@ -83,7 +83,7 @@
</div>
@if(status.hasMergePermission){
<div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa">
<input type="button" class="btn btn-lg @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
<input type="button" class="btn @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
&nbsp;&nbsp;You can also merge branches on the <a href="#" class="show-command-line">command line</a>.
<div id="command-line" style="display: none;margin-top: 15px;">
<hr />

2
src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
View File

@@ -35,7 +35,7 @@
</span>
<span class="edit-title" style="display: none;">
<span id="error-edit-title" class="error"></span>
<input type="text" style="width: 700px;" id="edit-title" value="@issue.title"/>
<input type="text" class="form-control" style="width: 700px;" id="edit-title" value="@issue.title"/>
</span>
</h1>
</div>

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

@@ -198,7 +198,7 @@ span.error {
}
.small {
font-size: 80%;
font-size: 90%;
}
.strong {
@@ -388,7 +388,6 @@ ul.dropdown-menu {
ul.dropdown-menu li {
border-bottom: 1px solid #eee;
font-size: 85%;
}
ul.dropdown-menu li a {