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

Merge branch 'master' into feature-tasklist

Browse Source 
Conflicts:
	src/main/twirl/issues/issuedetail.scala.html
This commit is contained in:
bati11
2014-10-11 12:07:14 +09:00
parent 26b14ded58 320585a530
commit 1fe448a83b
59 changed files with 1512 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,11 +617,81 @@ span.simplified-path {
color: #888;
}
/****************************************************************************/
/* nav pulls group */
/****************************************************************************/
.nav-pills-group:after {
display: table;
line-height: 0;
content: "";
}
.nav-pills-group:after {
clear: both;
}
.nav-pills-group > li {
float: left;
}
.nav-pills-group > li > a {
padding-right: 12px;
padding-left: 12px;
line-height: 14px;
color: #666;
font-weight: bold;
}
.nav-pills-group > li > a {
padding-top: 10px;
padding-bottom: 10px;
border-left : 1px solid #e5e5e5;
border-top : 1px solid #e5e5e5;
border-bottom : 1px solid #e5e5e5;
}
.nav-pills-group > .first > a {
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.nav-pills-group > .last > a {
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
border-right : 1px solid #e5e5e5;
}
.nav-pills-group > .active > a,
.nav-pills-group > .active > a:hover,
.nav-pills-group > .active > a:focus {
color: #ffffff;
background-color: #0088cc;
border-color: #0088cc;
}
/****************************************************************************/
/* Issues */
/****************************************************************************/
.btn-group.open .dropdown-toggle.flat {
background-image: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
a.button-link {
font-weight: normal;
color: gray;
}
a.selected {
font-weight: bold;
color: black;
}
span.issue-status {
display: block;
font-size: large;
text-align: center;
padding: 8px;
@@ -634,7 +704,7 @@ table.table-issues {
a.issue-title {
color: #333;
font-weight: bold;
size: 110%;
font-size: 120%;
}
ul.label-list {
@@ -671,8 +741,7 @@ span.milestone-alert {
}
a.milestone-title {
font-size: 120%;
font-weight: bold;
font-size: 180%;
}
div.milestone-description {
@@ -680,13 +749,12 @@ div.milestone-description {
color: #666;
}
div.milestone-menu {
font-size: 80%;
a.milestone-title {
color: #333;
}
div.milestone-menu a {
margin-left: 8px;
font-weight: bold;
div.milestone-menu {
margin-top: 8px;
}
div.milestone-menu a.delete {
@@ -698,13 +766,13 @@ div#milestone-progress-area {
}
div#milestone-progress-area div.milestone-progress {
width: 150px;
width: 130px;
margin-bottom: -6px;
}
div.milestone-progress {
position: relative;
height: 20px;
height: 10px;
color: white;
margin-bottom: 4px;
font-weight: bold;
@@ -725,11 +793,6 @@ span.milestone-progress {
-moz-border-radius: 4px;
}
span.milestone-percentage {
position: absolute;
padding-left: 8px;
}
div.issue-header {
padding-left: 8px;
padding-right: 8px;
@@ -861,20 +924,24 @@ div.author-info div.committer {
/****************************************************************************/
/* Diff */
/****************************************************************************/
table.inlinediff {
table.diff {
font-size: 12px;
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
width: 100%;
}
table.inlinediff thead {
table.diff thead {
display: none;
}
td.insert, td.equal, td.delete {
table.inlinediff td.insert, table.inlinediff td.equal, table.inlinediff td.delete {
width: 100%;
}
td.insert, td.equal, td.delete, td.empty {
width: 50%;
}
/****************************************************************************/
/* Repository Settings */
/****************************************************************************/