Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
31fcac9f
Commit
31fcac9f
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ui-improvements' into 'master'
Ui improvements
parents
a54bef0a
87e0fe6f
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
16 deletions
+15
-16
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/generic/lists.scss
+1
-1
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+4
-0
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+1
-2
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/issues.scss
+2
-2
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+6
-10
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/lists.scss
View file @
31fcac9f
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gl_bootstrap.scss
View file @
31fcac9f
...
...
@@ -262,6 +262,10 @@ ul.breadcrumb {
&
.panel-small
{
.panel-heading
{
padding
:
6px
15px
;
font-size
:
13px
;
a
{
color
:
#777
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/dashboard.scss
View file @
31fcac9f
...
...
@@ -60,7 +60,7 @@
}
.project-row
,
.group-row
{
padding
:
8px
1
2
px
!
important
;
padding
:
8px
1
5
px
!
important
;
font-size
:
14px
;
line-height
:
24px
;
...
...
@@ -74,7 +74,6 @@
.arrow
{
float
:
right
;
padding
:
0px
5px
;
margin
:
0
;
font-size
:
20px
;
color
:
#666
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/issues.scss
View file @
31fcac9f
.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
1
0
px
;
padding
:
6px
1
5
px
;
border
:
1px
solid
#ccc
;
@include
border-radius
(
4px
);
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/merge_requests.scss
View file @
31fcac9f
...
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_show.html.haml
View file @
31fcac9f
...
...
@@ -7,7 +7,7 @@
=
render
"projects/merge_requests/show/participants"
-
if
@commits
.
present?
%ul
.nav.nav-
tab
s.merge-request-tabs
%ul
.nav.nav-
pill
s.merge-request-tabs
%li
.notes-tab
{
data:
{
action:
'notes'
}}
=
link_to
project_merge_request_path
(
@project
,
@merge_request
)
do
%i
.icon-comment
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment