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
cfb67193
Commit
cfb67193
authored
Sep 04, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed discard modal not showing
parent
93e84c8f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue
...avascripts/ide/components/commit_sidebar/stage_button.vue
+2
-2
app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue
...ascripts/ide/components/commit_sidebar/unstage_button.vue
+1
-1
app/assets/stylesheets/page_bundles/ide.scss
app/assets/stylesheets/page_bundles/ide.scss
+8
-7
No files found.
app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue
View file @
cfb67193
...
...
@@ -46,7 +46,7 @@ export default {
:aria-label=
"__('Stage changes')"
:title=
"__('Stage changes')"
type=
"button"
class=
"btn btn-blank
d-flex
align-items-center"
class=
"btn btn-blank align-items-center"
data-container=
"body"
data-boundary=
"viewport"
data-placement=
"bottom"
...
...
@@ -63,7 +63,7 @@ export default {
:aria-label=
"__('Discard changes')"
:title=
"__('Discard changes')"
type=
"button"
class=
"btn btn-blank
d-flex
align-items-center"
class=
"btn btn-blank align-items-center"
data-container=
"body"
data-boundary=
"viewport"
data-placement=
"bottom"
...
...
app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue
View file @
cfb67193
...
...
@@ -32,7 +32,7 @@ export default {
:aria-label=
"__('Unstage changes')"
:title=
"__('Unstage changes')"
type=
"button"
class=
"btn btn-blank
d-flex
align-items-center"
class=
"btn btn-blank align-items-center"
data-container=
"body"
data-boundary=
"viewport"
data-placement=
"bottom"
...
...
app/assets/stylesheets/page_bundles/ide.scss
View file @
cfb67193
...
...
@@ -657,7 +657,9 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
outline
:
0
;
.multi-file-discard-btn
{
display
:
flex
;
>
.btn
{
display
:
flex
;
}
}
}
...
...
@@ -678,16 +680,15 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
}
.multi-file-discard-btn
{
display
:
none
;
>
.btn
{
display
:
none
;
width
:
32px
;
height
:
32px
;
}
svg
{
top
:
0
;
}
.btn
{
width
:
32px
;
height
:
32px
;
}
}
.multi-file-commit-form
{
...
...
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