summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/generic/lists.scss2
-rw-r--r--app/assets/stylesheets/gl_bootstrap.scss4
-rw-r--r--app/assets/stylesheets/sections/dashboard.scss3
-rw-r--r--app/assets/stylesheets/sections/issues.scss4
-rw-r--r--app/assets/stylesheets/sections/merge_requests.scss16
-rw-r--r--app/views/projects/merge_requests/_show.html.haml2
6 files changed, 15 insertions, 16 deletions
diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss
index 2e3559f3c8c..0cab6c44c91 100644
--- a/app/assets/stylesheets/generic/lists.scss
+++ b/app/assets/stylesheets/generic/lists.scss
@@ -8,7 +8,7 @@
list-style: none;
li {
- padding: 10px;
+ padding: 10px 15px;
min-height: 20px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 514ab8cdfa4..8ab305695fd 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -262,6 +262,10 @@ ul.breadcrumb {
&.panel-small {
.panel-heading {
padding: 6px 15px;
+ font-size: 13px;
+ a {
+ color: #777;
+ }
}
}
}
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 0ec21ff50fa..abc9e57f2ac 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -60,7 +60,7 @@
}
.project-row, .group-row {
- padding: 8px 12px !important;
+ padding: 8px 15px !important;
font-size: 14px;
line-height: 24px;
@@ -74,7 +74,6 @@
.arrow {
float: right;
- padding: 0px 5px;
margin: 0;
font-size: 20px;
color: #666;
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss
index 02c9123178f..949c528bdbd 100644
--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -1,6 +1,6 @@
.issues-list {
.issue {
- padding: 10px;
+ padding: 10px 15px;
position: relative;
.issue-title {
@@ -42,7 +42,7 @@
height: 32px;
float: left;
margin-right: 12px;
- padding: 6px 10px;
+ padding: 6px 15px;
border: 1px solid #ccc;
@include border-radius(4px);
}
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 5d716ddec3b..c1eaae82e5e 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -20,18 +20,14 @@
}
.merge-request .merge-request-tabs{
- border-color: #AAA;
+ border-bottom: 2px solid $border_primary;
+ padding-bottom: 10px;
+ margin-bottom: 20px;
+
li {
a {
- border-color: #AAA;
- padding: 14px 40px;
+ padding: 20px 40px;
font-size: 14px;
- background-color: #F9F9F9;
- }
- &.active a {
- border-color: #AAA;
- border-bottom-color: #FFF;
- background-color: #FFF;
}
}
}
@@ -70,7 +66,7 @@
.mr-list {
.merge-request {
- padding: 10px;
+ padding: 10px 15px;
position: relative;
.merge-request-title {
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 38a0ed567fc..1072728af28 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -7,7 +7,7 @@
= render "projects/merge_requests/show/participants"
- if @commits.present?
- %ul.nav.nav-tabs.merge-request-tabs
+ %ul.nav.nav-pills.merge-request-tabs
%li.notes-tab{data: {action: 'notes'}}
= link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment