diff options
Diffstat (limited to 'public/less')
| -rw-r--r-- | public/less/_base.less | 10 | ||||
| -rw-r--r-- | public/less/_repository.less | 72 | ||||
| -rw-r--r-- | public/less/_review.less | 103 | ||||
| -rw-r--r-- | public/less/index.less | 1 |
4 files changed, 161 insertions, 25 deletions
diff --git a/public/less/_base.less b/public/less/_base.less index 6327ebf61f..b2734872c1 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -371,7 +371,11 @@ pre, code { } } +.file-comment { + font: 12px Consolas,"Liberation Mono",Menlo,Courier,monospace; + color: rgba(0,0,0,.87); +} .overflow.menu { .items { @@ -443,6 +447,12 @@ footer { .hide { display: none; + &.show-outdated { + display: none !important; + } + &.hide-outdated { + display: none !important; + } } .center { text-align: center; diff --git a/public/less/_repository.less b/public/less/_repository.less index c222eef160..8ac4b9fc5a 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -705,6 +705,21 @@ margin-right: -1px; font-size: 25px; } + &.octicon-comment { + margin-top: 4px; + margin-left: -35px; + font-size: 24px; + } + &.octicon-eye { + margin-top: 3px; + margin-left: -35px; + margin-right: 0px; + font-size: 22px; + } + &.octicon-x { + margin-left: -33px; + font-size: 25px; + } } .detail { font-size: 0.9rem; @@ -883,38 +898,44 @@ width: 140px; } } - td.sha .sha.label { - margin: 0; - } + td.sha .sha.label { + margin: 0; + } &.ui.basic.striped.table tbody tr:nth-child(2n) { background-color: rgba(0, 0, 0, .02)!important; } } - #commits-table td.sha .sha.label, #repo-files-table .sha.label{ - &.isSigned{ - border: 1px solid #BBB; - .detail.icon{ - background: #FAFAFA; - margin: -6px -10px -4px 0px; - padding: 5px 3px 5px 6px; - border-left: 1px solid #BBB; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - } - &.isSigned.isVerified{ - border: 1px solid #21BA45; - background: #21BA4518; - .detail.icon{ - border-left: 1px solid #21BA4580; - } - } + #commits-table td.sha .sha.label, #repo-files-table .sha.label{ + &.isSigned{ + border: 1px solid #BBB; + .detail.icon{ + background: #FAFAFA; + margin: -6px -10px -4px 0px; + padding: 5px 3px 5px 6px; + border-left: 1px solid #BBB; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } + &.isSigned.isVerified{ + border: 1px solid #21BA45; + background: #21BA4518; + .detail.icon{ + border-left: 1px solid #21BA4580; + } } + } .diff-detail-box { - margin: 15px 0; + padding: 7px 0; + background: #fff; line-height: 30px; + >div:after{ + clear: both; + content: ""; + display: block; + } ol { clear: both; padding-left: 0; @@ -947,8 +968,9 @@ background-color: #dad8ff; } } - .ui.right { - margin-bottom: 15px; + .detail-files { + background: #fff; + margin: 0px; } } .diff-box .header { diff --git a/public/less/_review.less b/public/less/_review.less new file mode 100644 index 0000000000..a1b2e1932f --- /dev/null +++ b/public/less/_review.less @@ -0,0 +1,103 @@ +.ui.button.add-code-comment { + font-size: 14px; + height: 16px; + padding: 2px 0 0; + position: relative; + width: 16px; + z-index: 5; + float: left; + margin: -2px -10px -2px -20px; + opacity: 0; + transition: transform 0.1s ease-in-out; + transform: scale(1, 1); + + &:hover { + transform: scale(1.2, 1.2); + } +} + +.focus-lines-new .ui.button.add-code-comment.add-code-comment-right, +.focus-lines-old .ui.button.add-code-comment.add-code-comment-left { + opacity: 1; +} + +.comment-code-cloud { + padding: 4px; + margin: 0 auto; + position: relative; + border: 1px solid #f1f1f1; + margin-top: 13px; + margin-right: 10px; + margin-bottom: 5px; + + &:before { + content: " "; + width: 0; + height: 0; + border-left: 13px solid transparent; + border-right: 13px solid transparent; + border-bottom: 13px solid #f1f1f1; + left: 20px; + position: absolute; + top: -13px; + } + + .attached.tab { + border: none; + padding: 0; + margin: 0; + + &.markdown { + padding: 1em; + min-height: 168px; + } + } + + .right.menu.options .item { + padding: 0.85714286em 0.442857em; + cursor: pointer; + } + + .ui.form textarea { + border: 0px; + } + + .ui.attached.tabular.menu { + background: #f7f7f7; + border: 1px solid #d4d4d5; + padding-top: 5px; + padding-left: 5px; + margin-top: 0px; + } + + .footer { + border-top: 1px solid #f1f1f1; + margin-top: 10px; + + .markdown-info { + display: inline-block; + margin: 5px 0; + font-size: 12px; + color: rgba(0,0,0,.6) + } + + .ui.right.floated { + padding-top: 6px; + } + + &:after{ + clear: both; + content: ""; + display: block; + } + } + + .comment-form-reply { + margin: 0.5em !important; + } +} + +.file-comment { + font: 12px Consolas,"Liberation Mono",Menlo,Courier,monospace; + color: rgba(0,0,0,.87); +} diff --git a/public/less/index.less b/public/less/index.less index 9bca53c44c..0ffd6c9be6 100644 --- a/public/less/index.less +++ b/public/less/index.less @@ -12,3 +12,4 @@ @import "_dashboard"; @import "_admin"; @import "_explore"; +@import "_review"; |