Commit a8fbda94 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

bit reordering and cleanup unused styles

parent e228dae8
...@@ -13,20 +13,12 @@ body { ...@@ -13,20 +13,12 @@ body {
margin: 0 0; margin: 0 0;
} }
.container .sidebar {
width: 200px;
height: 100%;
min-height: 450px;
float: right;
}
.visible_link, .visible_link,
.author_link { .author_link {
color: $link_color; color: $link_color;
} }
.help li { color:#111 } .help li { color:$style_color; }
.back_link { .back_link {
text-decoration: underline; text-decoration: underline;
...@@ -96,28 +88,17 @@ table a code { ...@@ -96,28 +88,17 @@ table a code {
margin-right:50px margin-right:50px
} }
.handle:hover {
cursor: move;
}
span.update-author { span.update-author {
display: block; display: block;
}
span.update-author {
color: #999; color: #999;
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} strong {
span.update-author strong {
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
}
} }
/** UPDATE ITEM **/
span.update-author {
display: block;
}
/** END UPDATE ITEM **/
.dashboard-loader { .dashboard-loader {
float: left; float: left;
margin: 10px; margin: 10px;
...@@ -264,21 +245,6 @@ input.git_clone_url { ...@@ -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 { .line_holder {
&:hover { &:hover {
td { td {
...@@ -315,28 +281,6 @@ p.time { ...@@ -315,28 +281,6 @@ p.time {
border: 2px solid #ddd; 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 { .leftbar {
h5, .title { h5, .title {
padding: 5px 10px; padding: 5px 10px;
...@@ -365,49 +309,6 @@ p.time { ...@@ -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) */ /* Fix for readme code (stopped it from being yellow) */
.readme { .readme {
...@@ -426,21 +327,18 @@ p.time { ...@@ -426,21 +327,18 @@ p.time {
} }
.status_info { .status_info {
font-size: 18px; font-size: 14px;
padding: 5px 15px; padding: 5px 15px;
line-height: 48px; line-height: 26px;
text-align: center; text-align: center;
float: right; float: right;
position: relative; position: relative;
top: -15px; top: -5px;
left: 15px; @include border-radius(4px);
background: #F5F5F5;
&.success {
}
&.error { &.error {
color: #C32; background: #DA4E49;
border-bottom: 5px solid #C32; color: #FFF;
} }
} }
...@@ -459,16 +357,6 @@ p.time { ...@@ -459,16 +357,6 @@ p.time {
height: 150px; 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. // Fixes alignment on notes.
.new_note { .new_note {
label { label {
......
...@@ -101,3 +101,14 @@ input[type='search'].search-text-input { ...@@ -101,3 +101,14 @@ input[type='search'].search-text-input {
} }
fieldset legend { font-size: 17px; } 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;
}
}
...@@ -39,3 +39,17 @@ ol, ul { ...@@ -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 }
}
}
...@@ -90,6 +90,7 @@ $baseLineHeight: 18px !default; ...@@ -90,6 +90,7 @@ $baseLineHeight: 18px !default;
@import "sections/issues.scss"; @import "sections/issues.scss";
@import "sections/projects.scss"; @import "sections/projects.scss";
@import "sections/snippets.scss"; @import "sections/snippets.scss";
@import "sections/votes.scss";
@import "sections/merge_requests.scss"; @import "sections/merge_requests.scss";
@import "sections/graph.scss"; @import "sections/graph.scss";
@import "sections/events.scss"; @import "sections/events.scss";
......
.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;
}
}
...@@ -6,7 +6,7 @@ ...@@ -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" = 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 .profile_avatar_holder
= image_tag gravatar_icon(user.email, 60), class: "borders" = image_tag gravatar_icon(user.email, 60), class: "borders"
%h3 %h3.page_title
= user.name = user.name
%small %small
= user.email = user.email
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment