Skip to content
Snippets Groups Projects
Commit f89c1dd0 authored by Andrey's avatar Andrey
Browse files

Fixes to dropdown, font colors for new project and merge request

parent d2b328ea
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -5,7 +5,7 @@
*/
 
.issue-box {
@include border-radius(3px);
@include border-radius(2px);
 
display: inline-block;
padding: 10px $gl-padding;
Loading
Loading
Loading
Loading
@@ -10,8 +10,8 @@
margin-left: -$gl-padding;
margin-right: -$gl-padding;
color: $gl-gray;
border-bottom: 1px solid #f1f2f4;
border-right: 1px solid #f1f2f4;
border-bottom: 1px solid #ECEEF1;
border-right: 1px solid #ECEEF1;
 
&:last-child {
border-bottom: none;
Loading
Loading
Loading
Loading
@@ -54,21 +54,22 @@
margin-top: -15px;
padding: 10px 0;
margin-bottom: 0;
color: $gl-gray;
color: #5c5d5e;
font-size: 16px;
 
.author {
color: $gl-gray;
color: #5c5d5e;
}
 
.issue-id {
font-size: 19px;
color: $gl-text-color;
color: #5c5d5e;
}
}
 
.issue-title {
margin: 0;
font-size: 23px;
color: #313236;
}
 
.description {
Loading
Loading
Loading
Loading
@@ -3,12 +3,11 @@
*
*/
.mr-state-widget {
background: #f8fafc;
background: #F7F8FA;
margin-bottom: 20px;
color: $gl-gray;
border: 1px solid #eef0f2;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
@include border-radius(3px);
border: 1px solid #dce0e6;
@include border-radius(2px);
 
form {
margin-bottom: 0;
Loading
Loading
@@ -76,11 +75,17 @@
.mr-widget-footer {
padding: 15px;
}
.normal {
color: #5c5d5e;
}
 
.mr-widget-body {
h4 {
font-weight: bold;
font-weight: 600;
font-size: 17px;
margin: 5px 0;
color: #313236;
}
 
p:last-child {
Loading
Loading
@@ -102,9 +107,7 @@
margin: -$gl-padding;
padding: $gl-padding;
text-align: center;
border-top: 1px solid #e7e9ed;
margin-top: 18px;
margin-bottom: 3px;
margin-bottom: 1px;
}
 
.mr_source_commit,
Loading
Loading
@@ -120,10 +123,12 @@
}
 
.label-branch {
color: #222;
color: #313236;
font-family: $monospace_font;
font-weight: bold;
overflow: hidden;
font-size: 14px;
margin: 0 3px;
}
 
.mr-list {
Loading
Loading
Loading
Loading
@@ -72,12 +72,12 @@
 
.common-note-form {
margin: 0;
background: #f8fafc;
background: #F7F8FA;
padding: $gl-padding;
margin-left: -$gl-padding;
margin-right: -$gl-padding;
border-right: 1px solid #f1f2f4;
border-top: 1px solid #f1f2f4;
border-right: 1px solid #ECEEF1;
border-top: 1px solid #ECEEF1;
margin-bottom: -$gl-padding;
}
 
Loading
Loading
@@ -168,7 +168,7 @@
.comment-hints {
color: #999;
background: #FFF;
padding: 5px;
padding: 7px;
margin-top: -11px;
border: 1px solid $border-color;
font-size: 13px;
Loading
Loading
Loading
Loading
@@ -18,7 +18,7 @@ ul.notes {
font-size: 14px;
padding-top: 10px;
padding-bottom: 10px;
background: #f8fafc;
background: #FDFDFD;
 
.timeline-icon {
.avatar {
Loading
Loading
Loading
Loading
@@ -24,7 +24,7 @@
%ul.dropdown-menu
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
.light
.normal
%span Request to merge
%span.label-branch #{source_branch_with_namespace(@merge_request)}
%span into
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment