diff options
author | Unknwon <joe2010xtmf@163.com> | 2014-11-24 09:54:22 -0500 |
---|---|---|
committer | Unknwon <joe2010xtmf@163.com> | 2014-11-24 09:54:22 -0500 |
commit | 0cce61de3aa2b4055610a2329fadc95569370635 (patch) | |
tree | 8bd372847e6153787af71068dff9db640e1a90f6 /public | |
parent | 5b96e3fcc7132bf853bf82a06203d53978811015 (diff) | |
parent | 79dae254cf8bbbd942ae4925fc385396eaa95751 (diff) | |
download | gitea-0cce61de3aa2b4055610a2329fadc95569370635.tar.gz gitea-0cce61de3aa2b4055610a2329fadc95569370635.zip |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'public')
-rw-r--r-- | public/ng/css/gogs.css | 45 | ||||
-rw-r--r-- | public/ng/less/gogs/issue.less | 45 |
2 files changed, 87 insertions, 3 deletions
diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index 1bb1e84ad1..1eb73817a5 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -2019,10 +2019,12 @@ textarea#issue-add-content { #issue-list-nav li.right { margin-left: 4px; } -#issue-new > a { +#issue-new > a, +#milestone-new > a { padding: 0 !important; } -#issue-new > a button { +#issue-new > a button, +#milestone-new > a button { height: 29px; } #issue-list-menu { @@ -2127,6 +2129,45 @@ textarea#issue-add-content { margin-bottom: 12px; border-bottom: 1px dashed #AAA; } +#milestone-list { + padding-top: 6px; +} +#milestone-list .title-text { + font-size: 16px; +} +#milestone-list .desc { + color: #999; +} +#milestone-list .item { + padding-bottom: 18px; + margin-bottom: 18px; + border-bottom: 1px dashed #AAA; + position: relative; +} +#milestone-list .action { + position: absolute; + top: 0; + right: 0; +} +#milestone-list .status-bar > .bar { + margin: -2px 8px 0 8px; + width: 360px; + background-color: #DDD; + height: 14px; + vertical-align: middle; +} +#milestone-list .status-bar .opening { + background-color: #65ad4e; + width: 40%; + height: 14px; + vertical-align: top; +} +#milestone-list .action-bar { + margin-top: 8px; +} +#milestone-list .action-bar a { + margin-left: 12px; +} .org-header-alert .alert { margin-top: 10px; } diff --git a/public/ng/less/gogs/issue.less b/public/ng/less/gogs/issue.less index 79f9d793f0..86e47d77ef 100644 --- a/public/ng/less/gogs/issue.less +++ b/public/ng/less/gogs/issue.less @@ -243,7 +243,8 @@ textarea#issue-add-content { } } // new issue button -#issue-new { +#issue-new, +#milestone-new{ > a { padding: 0 !important; button { @@ -363,4 +364,46 @@ textarea#issue-add-content { margin-bottom: 12px; border-bottom: 1px dashed #AAA; } +} +// milestone items +#milestone-list{ + padding-top: 6px; + .title-text{ + font-size: 16px; + } + .desc { + color: #999; + } + .item { + padding-bottom: 18px; + margin-bottom: 18px; + border-bottom: 1px dashed #AAA; + position: relative; + } + .action{ + position: absolute; + top: 0; + right: 0; + } + .status-bar { + > .bar { + margin: -2px 8px 0 8px; + width: 360px; + background-color: #DDD; + height: 14px; + vertical-align:middle; + } + .opening{ + background-color: #65ad4e; + width: 40%; + height: 14px; + vertical-align: top; + } + } + .action-bar{ + margin-top: 8px; + a{ + margin-left: 12px; + } + } }
\ No newline at end of file |