Commit 31fcac9f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ui-improvements' into 'master'

Ui improvements
parents a54bef0a 87e0fe6f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
list-style: none; list-style: none;
li { li {
padding: 10px; padding: 10px 15px;
min-height: 20px; min-height: 20px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
......
...@@ -262,6 +262,10 @@ ul.breadcrumb { ...@@ -262,6 +262,10 @@ ul.breadcrumb {
&.panel-small { &.panel-small {
.panel-heading { .panel-heading {
padding: 6px 15px; padding: 6px 15px;
font-size: 13px;
a {
color: #777;
}
} }
} }
} }
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} }
.project-row, .group-row { .project-row, .group-row {
padding: 8px 12px !important; padding: 8px 15px !important;
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
.arrow { .arrow {
float: right; float: right;
padding: 0px 5px;
margin: 0; margin: 0;
font-size: 20px; font-size: 20px;
color: #666; color: #666;
......
.issues-list { .issues-list {
.issue { .issue {
padding: 10px; padding: 10px 15px;
position: relative; position: relative;
.issue-title { .issue-title {
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
height: 32px; height: 32px;
float: left; float: left;
margin-right: 12px; margin-right: 12px;
padding: 6px 10px; padding: 6px 15px;
border: 1px solid #ccc; border: 1px solid #ccc;
@include border-radius(4px); @include border-radius(4px);
} }
......
...@@ -20,18 +20,14 @@ ...@@ -20,18 +20,14 @@
} }
.merge-request .merge-request-tabs{ .merge-request .merge-request-tabs{
border-color: #AAA; border-bottom: 2px solid $border_primary;
padding-bottom: 10px;
margin-bottom: 20px;
li { li {
a { a {
border-color: #AAA; padding: 20px 40px;
padding: 14px 40px;
font-size: 14px; font-size: 14px;
background-color: #F9F9F9;
}
&.active a {
border-color: #AAA;
border-bottom-color: #FFF;
background-color: #FFF;
} }
} }
} }
...@@ -70,7 +66,7 @@ ...@@ -70,7 +66,7 @@
.mr-list { .mr-list {
.merge-request { .merge-request {
padding: 10px; padding: 10px 15px;
position: relative; position: relative;
.merge-request-title { .merge-request-title {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= render "projects/merge_requests/show/participants" = render "projects/merge_requests/show/participants"
- if @commits.present? - if @commits.present?
%ul.nav.nav-tabs.merge-request-tabs %ul.nav.nav-pills.merge-request-tabs
%li.notes-tab{data: {action: 'notes'}} %li.notes-tab{data: {action: 'notes'}}
= link_to project_merge_request_path(@project, @merge_request) do = link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment %i.icon-comment
......
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