From a8fbda945eec91c597a26100eff000bb3eb9b6af Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 13 Dec 2012 21:44:55 +0200 Subject: [PATCH] bit reordering and cleanup unused styles --- app/assets/stylesheets/common.scss | 134 ++---------------- .../stylesheets/gitlab_bootstrap/common.scss | 11 ++ .../stylesheets/gitlab_bootstrap/lists.scss | 14 ++ app/assets/stylesheets/main.scss | 1 + app/assets/stylesheets/sections/votes.scss | 43 ++++++ app/views/team_members/show.html.haml | 2 +- 6 files changed, 81 insertions(+), 124 deletions(-) create mode 100644 app/assets/stylesheets/sections/votes.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 3b0f2960..a9777f56 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -13,20 +13,12 @@ body { margin: 0 0; } -.container .sidebar { - width: 200px; - height: 100%; - min-height: 450px; - float: right; -} - - .visible_link, .author_link { color: $link_color; } -.help li { color:#111 } +.help li { color:$style_color; } .back_link { text-decoration: underline; @@ -96,28 +88,17 @@ table a code { margin-right:50px } -.handle:hover { - cursor: move; -} - span.update-author { display: block; -} -span.update-author { color: #999; font-weight: normal; font-style: italic; -} -span.update-author strong { - font-weight: bold; - font-style: normal; + strong { + font-weight: bold; + font-style: normal; + } } -/** UPDATE ITEM **/ -span.update-author { - display: block; -} -/** END UPDATE ITEM **/ .dashboard-loader { float: left; margin: 10px; @@ -264,21 +245,6 @@ input.git_clone_url { } -/** bordered list **/ -ul.bordered-list { - margin: 5px 0px; - padding: 0px; - li { - padding: 5px 0; - border-bottom: 1px solid #EEE; - overflow: hidden; - display: block; - margin: 0px; - } -} - -ul.bordered-list li:last-child { border:none } - .line_holder { &:hover { td { @@ -315,28 +281,6 @@ p.time { border: 2px solid #ddd; } - -.ico { - background: url("images.png") no-repeat -85px -77px; - width: 19px; - height: 16px; - float: left; - position: relative; - margin-right: 10px; - top: 8px; - - &.project { - background-position: -37px -77px; - } - - &.activities { - background-position:-162px -22px; - } - &.projects { - background-position:-209px -21px; - } -} - .leftbar { h5, .title { padding: 5px 10px; @@ -365,49 +309,6 @@ p.time { } } -.votes { - font-size: 13px; - line-height: 15px; - .progress { - height: 4px; - margin: 0; - .bar { - float: left; - height: 100%; - } - .bar-success { - @include linear-gradient(#62C462, #51A351); - background-color: #468847; - } - .bar-danger { - @include linear-gradient(#EE5F5B, #BD362F); - background-color: #B94A48; - } - } - .upvotes { - display: inline-block; - color: #468847; - } - .downvotes { - display: inline-block; - color: #B94A48; - } -} -.votes-block { - margin: 14px 6px 6px 0; - .downvotes { - float: right; - } -} -.votes-inline { - display: inline-block; - margin: 0 8px; - .progress { - display: inline-block; - padding: 0 0 2px; - width: 45px; - } -} /* Fix for readme code (stopped it from being yellow) */ .readme { @@ -426,21 +327,18 @@ p.time { } .status_info { - font-size: 18px; + font-size: 14px; padding: 5px 15px; - line-height: 48px; + line-height: 26px; text-align: center; float: right; position: relative; - top: -15px; - left: 15px; - background: #F5F5F5; + top: -5px; + @include border-radius(4px); - &.success { - } &.error { - color: #C32; - border-bottom: 5px solid #C32; + background: #DA4E49; + color: #FFF; } } @@ -459,16 +357,6 @@ p.time { height: 150px; } -.gitlab_pagination { - span a { color: $link_color; } - .prev, .next, .current, .page a { - padding: 10px; - } - .current { - border-bottom: 2px solid $style_color; - } -} - // Fixes alignment on notes. .new_note { label { diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index dca558df..a663326e 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -101,3 +101,14 @@ input[type='search'].search-text-input { } fieldset legend { font-size: 17px; } + +/** PAGINATION **/ +.gitlab_pagination { + span a { color: $link_color; } + .prev, .next, .current, .page a { + padding: 10px; + } + .current { + border-bottom: 2px solid $style_color; + } +} diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index 5bd087b0..fc97af43 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -39,3 +39,17 @@ ol, ul { } } } + +/** light list with border-bottom between li **/ +ul.bordered-list { + margin: 5px 0px; + padding: 0px; + li { + padding: 5px 0; + border-bottom: 1px solid #EEE; + overflow: hidden; + display: block; + margin: 0px; + &:last-child { border:none } + } +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index dee7ce5a..ccae351e 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -90,6 +90,7 @@ $baseLineHeight: 18px !default; @import "sections/issues.scss"; @import "sections/projects.scss"; @import "sections/snippets.scss"; +@import "sections/votes.scss"; @import "sections/merge_requests.scss"; @import "sections/graph.scss"; @import "sections/events.scss"; diff --git a/app/assets/stylesheets/sections/votes.scss b/app/assets/stylesheets/sections/votes.scss new file mode 100644 index 00000000..4686f542 --- /dev/null +++ b/app/assets/stylesheets/sections/votes.scss @@ -0,0 +1,43 @@ +.votes { + font-size: 13px; + line-height: 15px; + .progress { + height: 4px; + margin: 0; + .bar { + float: left; + height: 100%; + } + .bar-success { + @include linear-gradient(#62C462, #51A351); + background-color: #468847; + } + .bar-danger { + @include linear-gradient(#EE5F5B, #BD362F); + background-color: #B94A48; + } + } + .upvotes { + display: inline-block; + color: #468847; + } + .downvotes { + display: inline-block; + color: #B94A48; + } +} +.votes-block { + margin: 14px 6px 6px 0; + .downvotes { + float: right; + } +} +.votes-inline { + display: inline-block; + margin: 0 8px; + .progress { + display: inline-block; + padding: 0 0 2px; + width: 45px; + } +} diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml index 9d03cd2c..af9a6e6b 100644 --- a/app/views/team_members/show.html.haml +++ b/app/views/team_members/show.html.haml @@ -6,7 +6,7 @@ = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn danger" .profile_avatar_holder = image_tag gravatar_icon(user.email, 60), class: "borders" - %h3 + %h3.page_title = user.name %small = user.email