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
Léo-Paul Géneau
gitlab-ce
Commits
bf73bb30
Commit
bf73bb30
authored
Jul 26, 2018
by
Annabel Gray
Committed by
Clement Ho
Jul 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "BS4: Create new Merge request boxes have different styles"
parent
1f70de18
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-0
app/views/projects/merge_requests/creations/_new_compare.html.haml
.../projects/merge_requests/creations/_new_compare.html.haml
+1
-1
changelogs/unreleased/48636-new-mr-card-styles.yml
changelogs/unreleased/48636-new-mr-card-styles.yml
+5
-0
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
bf73bb30
...
@@ -835,3 +835,5 @@ $font-family-monospace: $monospace-font;
...
@@ -835,3 +835,5 @@ $font-family-monospace: $monospace-font;
$input-line-height
:
20px
;
$input-line-height
:
20px
;
$btn-line-height
:
20px
;
$btn-line-height
:
20px
;
$table-accent-bg
:
$gray-light
;
$table-accent-bg
:
$gray-light
;
$card-border-color
:
$border-color
;
$card-cap-bg
:
$gray-light
;
app/views/projects/merge_requests/creations/_new_compare.html.haml
View file @
bf73bb30
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
=
dropdown_filter
(
_
(
"Search branches"
))
=
dropdown_filter
(
_
(
"Search branches"
))
=
dropdown_content
=
dropdown_content
=
dropdown_loading
=
dropdown_loading
.
panel
-footer
.
card
-footer
.text-center
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
.text-center
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
%ul
.list-unstyled.mr_source_commit
%ul
.list-unstyled.mr_source_commit
...
...
changelogs/unreleased/48636-new-mr-card-styles.yml
0 → 100644
View file @
bf73bb30
---
title
:
Fix new MR card styles
merge_request
:
20822
author
:
type
:
fixed
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