diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index fd0f403..d1cfb67 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -441,15 +441,19 @@ div.repository-content { margin-left: 40px; } + table.branches>thead>tr>th, table.branches>tbody>tr>td{ padding: 12px; } + .branches .muted-link{ color: #777; } + .branches .muted-link:hover{ color: #4183c4; } + .branches .branch-name{ color: #4183c4; display: inline-block; @@ -458,10 +462,12 @@ background-color: rgba(209,227,237,0.5); border-radius: 3px; } + .branches .branch-meta{ color: #aaa; line-height: 20px; } + .branches .branch-a-b-count{ color: rgba(0,0,0,0.5); } @@ -472,13 +478,16 @@ text-align: right; float: left; } + .branches .a-b-count-widget .count-half:last-child { text-align: left; border-left: 1px solid #bbb; } + .branches .a-b-count-widget .count-half .count-value{ padding: 0 3px; } + .branches .branch-a-b-count span.badge { font-size: 100%; } @@ -512,7 +521,6 @@ padding: 4px; } - /****************************************************************************/ /* Activity */ /****************************************************************************/ @@ -661,6 +669,7 @@ a.button-link i { color: inherit; } + a.selected { font-weight: bold; color: black; @@ -675,11 +684,13 @@ margin-top: 12px; } -table.table-issues td .octicon-issue-opened, table.table-issues td .octicon-git-pull-request .open { +table.table-issues td .octicon-issue-opened, +table.table-issues td .octicon-git-pull-request .open { color: #6CC644; } -table.table-issues td .octicon-issue-closed, table.table-issues td .octicon-git-pull-request .closed{ +table.table-issues td .octicon-issue-closed, +table.table-issues td .octicon-git-pull-request .closed{ color : #BD2C00;; } @@ -887,42 +898,51 @@ border: 2px solid #fff; border-radius: 50%; } + .discussion-item-content { margin-left:36px; } + .discussion-item-content-head{ padding-right:20px; background-color: white; float:left } + pre.reset.discussion-item-content-text{ border-left: 1px solid rgb(238, 238, 238); margin: 0 0 0 5px; padding-left: 25px; } + .discussion-item-commit .discussion-item-content { font-size:12px; } + .discussion-item-icon .octicon { color: inherit; } + .discussion-item-merge .discussion-item-icon { background-color: #6e5494; color: white; padding-top: 1px; padding-left: 3px; } + .discussion-item-close .discussion-item-icon { background-color: #bd2c00; color: white; padding-top: 1px; } + .discussion-item-delete_branch .discussion-item-icon { padding-left: 2px; padding-top: 1px; background-color: #767676; color: white; } + .discussion-item-reopen .discussion-item-icon { background-color: #6cc644; padding-top: 1px; @@ -995,6 +1015,7 @@ .text-pending { color: #cea61b; } + .text-failure { color: #bd2c00; } @@ -1003,13 +1024,14 @@ padding: 10px 15px 10px 15px; border-bottom: 1px solid #eee; } + .build-statuses-list .build-status-item { background-color: #fafafa; padding: 10px 15px 10px 15px; border-bottom: 1px solid #eee; } -.merge-indicator{ +.merge-indicator { float:left; border-radius: 50%; width: 30px; @@ -1019,22 +1041,27 @@ vertical-align: middle; margin-right: 10px; } -.merge-indicator-success{ + +.merge-indicator-success { background-color: #6cc644; } -.merge-indicator-warning{ + +.merge-indicator-warning { background-color: #cea61b; } -.merge-indicator-alert{ + +.merge-indicator-alert { background-color: #888; } -.merge-indicator .octicon{ + +.merge-indicator .octicon { color: white; font-size: 16px; width: 15px; height: 15px; } -.merge-indicator-warning .octicon{ + +.merge-indicator-warning .octicon { color: white; font-size: 30px; } @@ -1043,92 +1070,94 @@ /* Diff */ /****************************************************************************/ table.diff { - font-size: 12px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - width: 100%; + font-size: 12px; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + width: 100%; } table.diff thead { - display: none; + display: none; } -table.inlinediff td.insert, table.inlinediff td.equal, table.inlinediff td.delete { - width: 900px; +table.inlinediff td.insert, +table.inlinediff td.equal, +table.inlinediff td.delete { + width: 900px; } td.insert, td.equal, td.delete, td.empty { - width: 50%; + width: 50%; } -table.diff td.body{ +table.diff td.body { position: relative; } -table.diff th.line-num{ +table.diff th.line-num { /*min-width: 20px;*/ width: 20px; } table.diff .add-comment { - position: absolute; - background: #4183c4; - top: 0; - left: -7px; - color: white; - padding: 2px 4px; - border: solid 1px #4183c4; - border-radius: 3px; - z-index: 99; - cursor: pointer; + position: absolute; + background: #4183c4; + top: 0; + left: -7px; + color: white; + padding: 2px 4px; + border: solid 1px #4183c4; + border-radius: 3px; + z-index: 99; + cursor: pointer; } table.diff .add-comment:hover { - padding: 4px 6px; - top: -1px; + padding: 4px 6px; + top: -1px; } -table.diff tr td.body b.add-comment{ +table.diff tr td.body b.add-comment { display: none; } -table.diff tr:hover td.body b.add-comment{ +table.diff tr:hover td.body b.add-comment { display: inline-block; } -.container-wide table.diff tr:hover td.body b.add-comment{ +.container-wide table.diff tr:hover td.body b.add-comment { display: none; } .container-wide table.diff tr:hover td.body:hover b.add-comment, -.container-wide table.diff tr:hover th.line-num:hover + td b.add-comment{ +.container-wide table.diff tr:hover th.line-num:hover + td b.add-comment { display: inline-block; } table.diff tbody tr.not-diff { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } tr.not-diff .box { - margin-bottom: 0px; + margin-bottom: 0px; } table.diff tbody tr.not-diff:hover { - background-color: #fff; + background-color: #fff; } -table.diff tbody tr.not-diff:hover td{ - background-color: #fff; +table.diff tbody tr.not-diff:hover td { + background-color: #fff; } .not-diff > .comment-box-container { - white-space: normal; - line-height: initial; - padding: 10px; + white-space: normal; + line-height: initial; + padding: 10px; } .diff .oldline:before, .diff .newline:before { - content: attr(line-number); + content: attr(line-number); } .diff .skipline:before { @@ -1136,32 +1165,36 @@ } .diffstat-bar { - display: inline-block; - /* For IE 6/7 */ - *display: inline; - *zoom: 1; - margin-left: 3px; - font-size: 16px; - color: #ddd; - letter-spacing: 1px; - text-align: left; - text-decoration: none; - -webkit-font-smoothing: antialiased; + display: inline-block; + /* For IE 6/7 */ + *display: inline; + *zoom: 1; + margin-left: 3px; + font-size: 16px; + color: #ddd; + letter-spacing: 1px; + text-align: left; + text-decoration: none; + -webkit-font-smoothing: antialiased; } + .text-diff-added { - color: #55a532; + color: #55a532; } + .text-diff-deleted { - color: #bd2c00; + color: #bd2c00; } + .diffstat { - font-size: 12px; - font-weight: bold; - color: #666; - white-space: nowrap; - letter-spacing: 0px; + font-size: 12px; + font-weight: bold; + color: #666; + white-space: nowrap; + letter-spacing: 0px; } -.diff-same{ + +.diff-same { background: #DDD; color: #BBB; font-size: 16px; @@ -1169,76 +1202,93 @@ font-weight: bold; text-align: center; } + /* ------- for imageDiff */ -.diff-image-frame{ +.diff-image-frame { display: table-cell; *float: left; /* for ie7 */ vertical-align: middle; padding: 20px; background-color: #eee; } -.diff-image-frame.diff-old{ + +.diff-image-frame.diff-old { padding-right: 2px; } -.diff-image-frame.diff-new{ + +.diff-image-frame.diff-new { padding-left: 2px; } -.diff-image-frame .diff-meta{ + +.diff-image-frame .diff-meta { margin-top: 12px; color: #999; font-family: Helvetica,arial,freesans,clean,sans-serif; font-size: 12px; } -.diff-image-frame.diff-old .diff-meta .diff{ + +.diff-image-frame.diff-old .diff-meta .diff { color: #bd2c00; } -.diff-image-frame.diff-new .diff-meta .diff{ + +.diff-image-frame.diff-new .diff-meta .diff { color: #55a532; } -.diff-image-frame img{ + +.diff-image-frame img { max-height: 410px; max-width: 410px; background: url(../images/checker.png); } -.diff-image-render.diff2up{ + +.diff-image-render.diff2up { width:100%; text-align: center; display: table; } -.diff-image-frame.diff-new img{ + +.diff-image-frame.diff-new img { border: 1px solid #55a532; } -.diff-image-frame.diff-old img{ + +.diff-image-frame.diff-old img { border: 1px solid #bd2c00; } -.diff-image-stack{ + +.diff-image-stack { position: relative; background: #EEE; padding-top: 20px; } + .diff-image-stack .diff-old, -.diff-image-stack .diff-new{ +.diff-image-stack .diff-new { position:absolute; overflow: hidden; margin:0 20px; } + .diff-image-stack img { max-width: none; background: url(../images/checker.png); } -.diff-image-stack .diff-new{ + +.diff-image-stack .diff-new { border: 1px solid #55a532; background: #EEE; } -.diff-image-stack .diff-old{ + +.diff-image-stack .diff-old { border: 1px solid #bd2c00; } -.diff-swipe-handle{ + +.diff-swipe-handle { position:absolute; margin-left: 325px; left: 100px; } -.diff-silde-bar{ + +.diff-silde-bar { width: 200px; position: absolute; left: 325px; @@ -1247,19 +1297,22 @@ border: 1px solid gray; height: 8px; } -.image-diff-tools{ + +.image-diff-tools { text-align: center; padding: 4px; background: #f7f7f7; } -.image-diff-tools{ + +.image-diff-tools { font-family: 'Helvetica Neue', Helvetica, arial, freesans, clean, sans-serif; font-size: 12px; background: #f7f7f7; margin: 0; text-align: center; } -.image-diff-tools li{ + +.image-diff-tools li { background: none; display: inline; cursor: pointer; @@ -1268,33 +1321,39 @@ position: relative; color: #666; } -.image-diff-tools li:last-child{ + +.image-diff-tools li:last-child { border-right: none; } + .image-diff-tools li.active { font-weight: bold; } -.no-canvas .need-canvas{ - display: none; -} -.diff-image-stack.swipe .diff-new{ - border-right: 1px solid #888; -} -.diff-image-stack.swipe .diff-swipe-handle{ - margin-left: 15px; - left: 410px; -} -.diff-image-stack.swipe .diff-silde-bar{ + +.no-canvas .need-canvas { display: none; } -.diff-image-stack.onion .diff-silde-bar{ +.diff-image-stack.swipe .diff-new { + border-right: 1px solid #888; +} + +.diff-image-stack.swipe .diff-swipe-handle { + margin-left: 15px; + left: 410px; +} + +.diff-image-stack.swipe .diff-silde-bar { + display: none; +} + +.diff-image-stack.onion .diff-silde-bar { background: -ms-linear-gradient(left, #bd2c00 0%,#55a532 100%); /* IE10+ */ background: linear-gradient(to right, #bd2c00 0%,#55a532 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bd2c00', endColorstr='#55a532',GradientType=1 ); /* IE6-9 */ } -.diff-image-stack.blink .diff-silde-bar{ +.diff-image-stack.blink .diff-silde-bar { border-style: dotted; background-image: linear-gradient(to right, #bd2c00, #bd2c00 50%, #55a532 50%, #55a532 100%); background-size: 2px 2px; @@ -1564,7 +1623,7 @@ /****************************************************************************/ /* File finder */ /****************************************************************************/ -#tree-finder-field{ +#tree-finder-field { border: none; box-shadow: none; padding: 0; @@ -1574,33 +1633,40 @@ height: inherit; width: 300px; } -.find-input{ + +.find-input { font-size: 18px; margin-bottom: 20px; } -#tree-finder-results td{ + +#tree-finder-results td { padding:7px 6px; } -#tree-finder-results td.icon{ + +#tree-finder-results td.icon { width:16px; padding: 7px 2px 7px 6px; } -#tree-finder-results .tree-browser-result .icon-chevron-right{ + +#tree-finder-results .tree-browser-result .icon-chevron-right { visibility: hidden; } -#tree-finder-results .tree-browser-result.navigation-focus .icon-chevron-right{ + +#tree-finder-results .tree-browser-result.navigation-focus .icon-chevron-right { visibility: visible; } -#tree-finder-results .navigation-focus td{ + +#tree-finder-results .navigation-focus td { background: #fff; } /****************************************************************************/ /* blame */ /****************************************************************************/ -.blobview pre.blob{ +.blobview pre.blob { padding-left: 0; } -.blobview ol.linenums{ + +.blobview ol.linenums { margin-left: 0; padding-left: 50px; } @@ -1614,12 +1680,14 @@ .line-age-legend { display: none; } + .blame-container .line-age-legend { display: block; float: right; font-size: 12px; color: #777; } + .blame-container .line-age-legend ol { display: inline-block; *display: inline; @@ -1627,6 +1695,7 @@ list-style: none; margin: 0 5px; } + .blame-container .line-age-legend ol li { display: inline-block; *display: inline; @@ -1634,17 +1703,21 @@ width: 8px; height: 10px; } + .blame-container pre.blob{ margin-left: 350px; } -.blame-container pre.prettyprint ol.linenums li.blame-sep{ + +.blame-container pre.prettyprint ol.linenums li.blame-sep { border-top: 1px solid rgb(219, 219, 219); margin-top: -1px; } + .blame-container .hide-if-blame { display: none; } -.blame{ + +.blame { font-size: 12px; white-space: normal; width: 340px; @@ -1652,19 +1725,23 @@ min-height: 100px; display: none; } -.blame-container .blame{ + +.blame-container .blame { display: block; } -.blame .blame-commit-title{ + +.blame .blame-commit-title { font-weight: bold; color: #333; line-height: 1.1; } -.blame .avatar{ + +.blame .avatar { margin-right: 4px; margin-bottom: 4px; } -.blame .blame-info{ + +.blame .blame-info { background: white; box-shadow:rgba(113, 135, 164, 0.65098) 0px 0px 4px 0px; position: absolute; @@ -1672,51 +1749,57 @@ padding: 2px; border-right: 2px solid; } -.no-box-shadow .blame .blame-info{ + +.no-box-shadow .blame .blame-info { border-top: 1px solid #888; border-bottom: 1px solid #888; border-left: 1px solid #888; } -.blame-sha{ + +.blame-sha { font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; float: right; text-align: right; } -.blame-sha .muted-link{ + +.blame-sha .muted-link { color: #777; } -.blame-sha .muted-link:hover{ + +.blame-sha .muted-link:hover { color: #4183c4; } -.blame .blame-info:hover{ +.blame .blame-info:hover { z-index: 100; box-shadow:rgba(113, 135, 164, 0.65098) 0px 0px 4px 3px; } -.blame .blame-info.blame-last{ + +.blame .blame-info.blame-last { background: #FDFCED; } -.blame-info.heat1{ border-right-color:#ffeca7} -.blame-info.heat2{ border-right-color:#ffdd8c} -.blame-info.heat3{ border-right-color:#ffdd7c} -.blame-info.heat4{ border-right-color:#fba447} -.blame-info.heat5{ border-right-color:#f68736} -.blame-info.heat6{ border-right-color:#f37636} -.blame-info.heat7{ border-right-color:#ca6632} -.blame-info.heat8{ border-right-color:#c0513f} -.blame-info.heat9{ border-right-color:#a2503a} -.blame-info.heat10{border-right-color:#793738} -.heat1{background-color:#ffeca7} -.heat2{background-color:#ffdd8c} -.heat3{background-color:#ffdd7c} -.heat4{background-color:#fba447} -.heat5{background-color:#f68736} -.heat6{background-color:#f37636} -.heat7{background-color:#ca6632} -.heat8{background-color:#c0513f} -.heat9{background-color:#a2503a} -.heat10{background-color:#793738} +.blame-info.heat1 { border-right-color:#ffeca7 } +.blame-info.heat2 { border-right-color:#ffdd8c } +.blame-info.heat3 { border-right-color:#ffdd7c } +.blame-info.heat4 { border-right-color:#fba447 } +.blame-info.heat5 { border-right-color:#f68736 } +.blame-info.heat6 { border-right-color:#f37636 } +.blame-info.heat7 { border-right-color:#ca6632 } +.blame-info.heat8 { border-right-color:#c0513f } +.blame-info.heat9 { border-right-color:#a2503a } +.blame-info.heat10{ border-right-color:#793738 } + +.heat1 { background-color:#ffeca7 } +.heat2 { background-color:#ffdd8c } +.heat3 { background-color:#ffdd7c } +.heat4 { background-color:#fba447 } +.heat5 { background-color:#f68736 } +.heat6 { background-color:#f37636 } +.heat7 { background-color:#ca6632 } +.heat8 { background-color:#c0513f } +.heat9 { background-color:#a2503a } +.heat10{ background-color:#793738 } /****************************************************************************/ /* Mobile */ @@ -1751,9 +1834,9 @@ /* Suppress transition animation on load */ /****************************************************************************/ body.page-load * { - -webkit-transition: none !important; - -moz-transition: none !important; - -ms-transition: none !important; - -o-transition: none !important; - transition: none !important; + -webkit-transition: none !important; + -moz-transition: none !important; + -ms-transition: none !important; + -o-transition: none !important; + transition: none !important; }