diff options
Diffstat (limited to 'public/less')
| -rw-r--r-- | public/less/_admin.less | 2 | ||||
| -rw-r--r-- | public/less/_base.less | 20 | ||||
| -rw-r--r-- | public/less/_form.less | 6 | ||||
| -rw-r--r-- | public/less/_home.less | 2 | ||||
| -rw-r--r-- | public/less/_install.less | 2 | ||||
| -rw-r--r-- | public/less/_repository.less | 183 | ||||
| -rw-r--r-- | public/less/_user.less | 2 |
7 files changed, 211 insertions, 6 deletions
diff --git a/public/less/_admin.less b/public/less/_admin.less index 93115a7f8f..3c119a9504 100644 --- a/public/less/_admin.less +++ b/public/less/_admin.less @@ -1,6 +1,6 @@ .admin { padding-top: 15px; - padding-bottom: @footer-margin * 3; + padding-bottom: @footer-margin * 2; .table.segment { padding: 0; diff --git a/public/less/_base.less b/public/less/_base.less index 4bbb098ea4..0e604648a2 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -92,6 +92,13 @@ img { &.small { font-size: 0.75em; } + + &.truncate { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: inline-block; + } } .message { @@ -111,6 +118,19 @@ img { border-color: #F0C36D; } } + .info { + &.header { + background-color: #d9edf7!important; + border-color: #85c5e5; + } + &.segment { + border-color: #85c5e5; + } + } + + .normal.header { + font-weight: normal; + } .avatar.image { border-radius: 3px; diff --git a/public/less/_form.less b/public/less/_form.less index 03c0144d98..85a0b21787 100644 --- a/public/less/_form.less +++ b/public/less/_form.less @@ -9,7 +9,11 @@ .ui.attached.header { background: #f0f0f0; .right { - margin-top: -6px; + margin-top: -5px; + .button { + padding: 8px 10px; + font-weight: normal; + } } } .repository { diff --git a/public/less/_home.less b/public/less/_home.less index 93df7b1902..14517fa9e8 100644 --- a/public/less/_home.less +++ b/public/less/_home.less @@ -1,5 +1,5 @@ .home { - padding-bottom: @footer-margin * 3; + padding-bottom: @footer-margin * 2; .logo { max-width: 250px; } diff --git a/public/less/_install.less b/public/less/_install.less index 7bd6265f14..33c927fb10 100644 --- a/public/less/_install.less +++ b/public/less/_install.less @@ -1,6 +1,6 @@ .install { padding-top: 45px; - padding-bottom: @footer-margin * 3; + padding-bottom: @footer-margin * 2; form { @input-padding: 320px !important; label { diff --git a/public/less/_repository.less b/public/less/_repository.less index 5c8d68f414..365914f24f 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -2,7 +2,7 @@ @mega-octicon-width: 30px; padding-top: 15px; - padding-bottom: @footer-margin * 3; + padding-bottom: @footer-margin * 2; .head { .column { @@ -424,6 +424,187 @@ } } } + + &.commits { + .header { + .ui.right { + .search { + input { + font-weight: normal; + padding: 5px 10px; + } + } + .button { + float: right; + margin-left: 5px; + margin-top: 1px; + } + } + } + } + .commits.table { + font-size: 13px; + th, td { + &:first-child { + padding-left: 15px; + } + } + td { + line-height: 15px; + } + .author { + min-width: 180px; + } + .message span { + max-width: 500px; + } + .date { + width: 120px; + } + } + .sha.label { + font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; + font-size: 14px; + padding: 6px 10px 4px 10px; + font-weight: normal; + } + + .diff-detail-box { + margin: 15px 0; + line-height: 30px; + ol { + clear: both; + padding-left: 0; + margin-top: 5px; + margin-bottom: 28px; + li { + list-style: none; + padding-bottom: 4px; + margin-bottom: 4px; + border-bottom: 1px dashed #DDD; + padding-left: 6px; + } + } + span.status{ + display: inline-block; + width: 12px; + height: 12px; + margin-right: 8px; + vertical-align: middle; + &.modify { + background-color: #f0db88; + } + &.add { + background-color: #b4e2b4; + } + &.del { + background-color: #e9aeae; + } + &.rename { + background-color: #dad8ff; + } + } + } + .diff-box { + .count { + margin-right: 12px; + .bar { + background-color: #e75316; + height: 12px; + width: 40px; + display: inline-block; + margin: 2px 4px 0 4px; + vertical-align: text-top; + .add { + background-color: #77c64a; + height: 12px; + } + } + } + .file { + color: #888; + } + } + .diff-file-box { + .header { + border-bottom: 1px solid #d4d4d5!important; + } + .file-body.file-code { + .lines-num { + text-align: right; + color: #999; + background: #fafafa; + width: 1%; + } + .lines-num-old { + border-right: 1px solid #DDD; + } + } + .code-diff { + font-size: 13px; + td { + padding: 0; + border-top: none; + } + pre { + margin: 0; + } + .lines-num { + border-right: 1px solid #d4d4d5; + padding: 0 5px; + } + tbody { + tr { + &.tag-code { + td, pre { + background-color: #E0E0E0 !important; + border-color: #ADADAD!important; + } + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + } + // &.same-code { + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + // } + &.del-code { + td, pre { + background-color: #ffe2dd !important; + border-color: #e9aeae !important; + } + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + } + &.add-code { + td, pre { + background-color: #d1ffd6 !important; + border-color: #b4e2b4 !important; + } + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + } + &:hover { + td { + background-color: #FFF8D2 !important; + border-color: #F0DB88 !important; + } + pre { + background-color: transparent !important; + } + } + } + } + } + } + .code-view { + overflow: auto; + overflow-x: auto; + overflow-y: hidden; + } } .ui.comments { diff --git a/public/less/_user.less b/public/less/_user.less index ac2b4032ba..b07e30fe31 100644 --- a/public/less/_user.less +++ b/public/less/_user.less @@ -1,6 +1,6 @@ .user { padding-top: 15px; - padding-bottom: @footer-margin * 3; + padding-bottom: @footer-margin * 2; &.settings { .key.list { |