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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
bf697092
Commit
bf697092
authored
Nov 21, 2019
by
Juan J. Ramirez
Committed by
Mike Greiling
Nov 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for inconsistent margins in project detail
Small missing margin fix Adding changelog to MR
parent
9884b4db
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
4 deletions
+19
-4
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-2
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+6
-1
changelogs/unreleased/13768-fix-redo-icn.yml
changelogs/unreleased/13768-fix-redo-icn.yml
+5
-0
changelogs/unreleased/35468-fixdetail-margins.yml
changelogs/unreleased/35468-fixdetail-margins.yml
+5
-0
No files found.
app/assets/stylesheets/framework/wells.scss
View file @
bf697092
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
color
:
$gl-text-color
;
color
:
$gl-text-color
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
margin-bottom
:
$gl-padding
;
margin-bottom
:
$gl-padding
-8
;
.card.card-body-segment
{
.card.card-body-segment
{
padding
:
$gl-padding
;
padding
:
$gl-padding
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
bf697092
...
@@ -748,7 +748,7 @@
...
@@ -748,7 +748,7 @@
display
:
inline-block
;
display
:
inline-block
;
&
:not
(
:last-child
)
{
&
:not
(
:last-child
)
{
margin-right
:
$gl-padding
;
margin-right
:
$gl-padding
-8
;
}
}
&
.right
{
&
.right
{
...
@@ -798,7 +798,7 @@
...
@@ -798,7 +798,7 @@
}
}
.btn
{
.btn
{
margin-top
:
$gl-padding
;
margin-top
:
$gl-padding
-8
;
padding
:
$gl-btn-vert-padding
$gl-btn-padding
;
padding
:
$gl-btn-vert-padding
$gl-btn-padding
;
line-height
:
$gl-btn-line-height
;
line-height
:
$gl-btn-line-height
;
...
...
app/assets/stylesheets/pages/tree.scss
View file @
bf697092
.tree-holder
{
.tree-holder
{
.nav-block
{
.nav-block
{
margin
:
1
0
px
0
;
margin
:
1
6
px
0
;
.btn
.fa
,
.btn
.fa
,
.btn
svg
{
.btn
svg
{
...
@@ -15,8 +15,13 @@
...
@@ -15,8 +15,13 @@
}
}
.tree-controls
{
.tree-controls
{
display
:
flex
;
text-align
:
right
;
text-align
:
right
;
.btn
{
margin-left
:
8px
;
}
.btn-group
{
.btn-group
{
margin-left
:
10px
;
margin-left
:
10px
;
}
}
...
...
changelogs/unreleased/13768-fix-redo-icn.yml
0 → 100644
View file @
bf697092
---
title
:
Replacing incorrect icon for Retry in Pipeline list page
merge_request
:
20510
author
:
type
:
changed
changelogs/unreleased/35468-fixdetail-margins.yml
0 → 100644
View file @
bf697092
---
title
:
Fixes to inconsistent margins/sapcing in the project detail page
merge_request
:
20395
author
:
type
:
changed
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