Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mike Slinn
2014-11-08 04:11:55 -08:00
151 changed files with 3871 additions and 3655 deletions

View File

@@ -36,9 +36,6 @@ h6 {
font-size: 18px;
}
h7 {
font-size: 14px;
}
/* ======================================================================== */
/* Global Header */
@@ -122,6 +119,11 @@ div.container {
width: 920px;
}
div.container-wide {
padding-left: 10px;
padding-right: 10px;
}
div.pagination {
margin-top: 0px;
margin-bottom: 0px;
@@ -510,6 +512,10 @@ a.header-link:hover {
text-decoration: none;
}
table.blobview {
table-layout: fixed;
}
table.table-file-list {
margin-bottom: 0px;
border: 1px solid #ddd;
@@ -592,6 +598,7 @@ pre.blob {
border: none;
background-color: white;
padding-left: 20px;
font-size: 12px;
}
#readme {
@@ -606,11 +613,109 @@ li.highlight {
background-color: #ffb;
}
span.simplified-path {
color: #888;
}
#branch-control-title {
margin: 5px 10px;
font-weight: bold;
}
#branch-control-close {
background: none;
border: none;
color: #aaa;
font-weight: bold;
line-height: 15px;
}
#branch-control-input {
border: solid 1px #ccc;
margin: 10px;
}
.new-branch-name {
font-weight: bold;
font-size: 1.2em;
padding-left: 16px;
}
/****************************************************************************/
/* 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;
@@ -623,7 +728,7 @@ table.table-issues {
a.issue-title {
color: #333;
font-weight: bold;
size: 110%;
font-size: 120%;
}
ul.label-list {
@@ -660,8 +765,7 @@ span.milestone-alert {
}
a.milestone-title {
font-size: 120%;
font-weight: bold;
font-size: 180%;
}
div.milestone-description {
@@ -669,13 +773,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 {
@@ -687,13 +790,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;
@@ -714,11 +817,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;
@@ -803,6 +901,20 @@ div.attachable div.clickable {
background-color: white;
}
ul.task-list {
padding-left: 2em;
margin-left: 0;
}
li.task-list-item {
list-style-type: none;
}
li.task-list-item input.task-list-item-checkbox {
margin: 0 4px 0.25em -20px;
vertical-align: middle;
}
/****************************************************************************/
/* Pull Request */
/****************************************************************************/
@@ -824,21 +936,36 @@ a.absent {
color: #c00;
}
/****************************************************************************/
/* Commit */
/****************************************************************************/
div.author-info div.committer {
display: block;
margin-left: 25px;
font-size: 12px;
}
/****************************************************************************/
/* 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 */
/****************************************************************************/