diff options
author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-24 13:32:51 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-24 13:32:51 +0400 |
commit | d23022c6f68bd78a1d3b63a8bf7551145b1f46fd (patch) | |
tree | 1234c1bcba3ada78e9bd5961e0f157c96ad98b0d /app/assets | |
parent | a6f58b9c435e1680f102ae68a8aedea981a52486 (diff) |
Working on dashboard restyle and events refactoring
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/common.scss | 81 | ||||
-rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/lists.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/main.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/commits.scss | 46 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/events.scss | 105 |
5 files changed, 131 insertions, 106 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c5b37916086..f13a1d6d196 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -185,36 +185,6 @@ span.update-author { } } -.event_label { - @extend .label; - background-color: #999; - - &.pushed { - background-color: #4A97BD; - } - - &.opened { - background-color: #469847; - } - - &.closed { - background-color: #B94A48; - } - - &.merged { - background-color: #2A2; - } - - &.joined { - background-color: #1ca9dd; - } - - &.left { - background-color: #888; - float:none; - } -} - form { @extend .form-horizontal; @@ -355,41 +325,6 @@ p.time { border:2px solid #ddd; } -.event_feed { - min-height:40px; - border-bottom:1px solid #ddd; - .avatar { - width:32px; - } - .event_icon { - float:right; - margin-right:2px; - img { - width:20px; - } - } - ul { - margin-left:50px; - margin-bottom:5px; - .avatar { - width:24px; - } - } - - padding: 15px 5px; - &:last-child { border:none } - .wll:hover { background:none } - - .event_commits { - margin-top: 5px; - - li.commit { - background: transparent; - padding:5px; - border:none; - } - } -} .ico { background: url("images.png") no-repeat -85px -77px; @@ -639,22 +574,6 @@ li.note { background:#fff; } -/** - * Push event widget - * - */ -.event_lp { - @extend .ui-box; - color:#777; - margin-bottom:20px; - padding:8px; - @include border-radius(4px); - min-height:22px; - - .avatar { - width:24px; - } -} .supp_diff_link, .mr_show_all_commits { diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index 402ba04bd00..5585c35c089 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -1,6 +1,6 @@ /** LISTS **/ -ul { +ul { /** * List li block element #1 * @@ -18,7 +18,7 @@ ul { .author { color: #999; } p { - padding-top:5px; + padding-top:5px; margin:0; color:#222; img { diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 75001d3a7c3..14b289c0a5d 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -143,6 +143,7 @@ $hover: #fdf5d9; @import "sections/projects.scss"; @import "sections/merge_requests.scss"; @import "sections/graph.scss"; +@import "sections/events.scss"; /** * This scss file redefine chozen selectbox styles for diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 75e38aeea93..33b051351f3 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -1,7 +1,7 @@ .commit-box { @extend .main_box; - .commit-head { + .commit-head { @extend .top_box_content; .commit-title { @@ -29,11 +29,11 @@ .sha-block { text-align:right; - &:first-child { + &:first-child { padding-bottom:6px; } - a { + a { border-bottom: 1px solid #aaa; margin-left: 9px; } @@ -54,7 +54,7 @@ } /** - * + * * COMMIT SHOw * */ @@ -71,7 +71,7 @@ background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); - span { + span { font-size:14px; } } @@ -111,8 +111,8 @@ } } - &.img_compared { - img { + &.img_compared { + img { max-width:300px; } } @@ -120,12 +120,12 @@ } .diff_file_content{ - table { + table { border:none; margin:0px; padding:0px; tr { - td { + td { font-size:12px; } } @@ -145,29 +145,29 @@ moz-user-select: none; -khtml-user-select: none; user-select: none; - a { + a { float:left; width:35px; font-weight:normal; color:#666; - &:hover { + &:hover { text-decoration:underline; } } } - .line_content { - white-space:pre; + .line_content { + white-space:pre; height:14px; margin:0px; padding:0px; border:none; - &.new { + &.new { background: #CFD; } - &.old { + &.old { background: #FDD; } - &.matched { + &.matched { color:#ccc; background:#fafafa; } @@ -182,32 +182,32 @@ /** COMMIT ROW **/ -.commit { +.commit { @extend .wll; - .browse_code_link_holder { + .browse_code_link_holder { @extend .span2; float:right; } - .committed_ago { + .committed_ago { float:right; @extend .cgray; } - code { + code { background:#FCEEC1; color:$style_color; } - .commit_short_id { + .commit_short_id { float:left; @extend .lined; min-width:65px; font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; } - - .commit-author-name { + + .commit-author-name { color: #777; } } diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss new file mode 100644 index 00000000000..7c414d052d3 --- /dev/null +++ b/app/assets/stylesheets/sections/events.scss @@ -0,0 +1,105 @@ +/** + * Events labels + * + */ +.event_label { + /*@extend .label;*/ + /*background-color: #999;*/ + + /*&.pushed {*/ + /*background-color: #4A97BD;*/ + /*}*/ + + /*&.opened {*/ + /*background-color: #469847;*/ + /*}*/ + + /*&.closed {*/ + /*background-color: #B94A48;*/ + /*}*/ + + /*&.merged {*/ + /*background-color: #2A2;*/ + /*}*/ + + /*&.joined {*/ + /*background-color: #1ca9dd;*/ + /*}*/ + + /*&.left {*/ + /*background-color: #888;*/ + /*float:none;*/ + /*}*/ +} + +/** + * Dashboard events feed + * + */ +.event-item { + min-height:40px; + border-bottom:1px solid #eee; + .event-title { + color:#333; + font-weight: bold; + .author_name { + color:#777; + } + } + .event-body { + p { + color:#666; + } + } + .avatar { + width:32px; + } + .event_icon { + float: right; + border: 1px solid #EEE; + padding: 5px; + @include border-radius(5px); + background: #F9F9F9; + img { + width:20px; + } + } + ul { + margin-left:50px; + margin-bottom:5px; + .avatar { + width:22px; + } + } + + padding: 15px 5px; + &:last-child { border:none } + .wll:hover { background:none } + + .event_commits { + margin-top: 5px; + + li.commit { + background: transparent; + padding:5px; + border:none; + } + } +} + +/** + * Push event widget + * + */ +.event_lp { + @extend .ui-box; + color:#777; + margin-bottom:20px; + padding:8px; + @include border-radius(4px); + min-height:22px; + + .avatar { + width:24px; + } +} |