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
7500cd57
Commit
7500cd57
authored
Feb 02, 2022
by
Coung Ngo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete unused button css
parent
43bd1d3a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
14 deletions
+2
-14
app/assets/javascripts/notes/components/diff_with_note.vue
app/assets/javascripts/notes/components/diff_with_note.vue
+1
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-10
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+0
-2
app/views/discussions/_diff_with_notes.html.haml
app/views/discussions/_diff_with_notes.html.haml
+1
-1
No files found.
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
7500cd57
...
@@ -107,7 +107,7 @@ export default {
...
@@ -107,7 +107,7 @@ export default {
<td
v-if=
"error"
class=
"js-error-lazy-load-diff diff-loading-error-block"
>
<td
v-if=
"error"
class=
"js-error-lazy-load-diff diff-loading-error-block"
>
{{ __('Unable to load the diff') }}
{{ __('Unable to load the diff') }}
<button
<button
class=
"btn-link btn-link-retry
btn-no-padding
js-toggle-lazy-diff-retry-button"
class=
"btn-link btn-link-retry
gl-p-0
js-toggle-lazy-diff-retry-button"
@
click=
"fetchDiff"
@
click=
"fetchDiff"
>
>
{{ __('Try again') }}
{{ __('Try again') }}
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
7500cd57
...
@@ -158,12 +158,6 @@
...
@@ -158,12 +158,6 @@
line-height
:
$gl-btn-small-line-height
;
line-height
:
$gl-btn-small-line-height
;
}
}
&
.btn-xs
{
padding
:
2px
$gl-btn-padding
;
font-size
:
$gl-btn-xs-font-size
;
line-height
:
$gl-btn-xs-line-height
;
}
&
.btn-success
{
&
.btn-success
{
@include
btn-green
;
@include
btn-green
;
}
}
...
@@ -438,10 +432,6 @@ fieldset[disabled] .btn,
...
@@ -438,10 +432,6 @@ fieldset[disabled] .btn,
cursor
:
default
;
cursor
:
default
;
}
}
.btn-no-padding
{
padding
:
0
;
}
// This class helps convert `.gl-button` children so that they consistently
// This class helps convert `.gl-button` children so that they consistently
// match the style of `.btn` elements which might be around them. Ideally we
// match the style of `.btn` elements which might be around them. Ideally we
// wouldn't need this class.
// wouldn't need this class.
...
...
app/assets/stylesheets/framework/variables.scss
View file @
7500cd57
...
@@ -589,8 +589,6 @@ $gl-btn-vert-padding: 8px;
...
@@ -589,8 +589,6 @@ $gl-btn-vert-padding: 8px;
$gl-btn-horz-padding
:
12px
;
$gl-btn-horz-padding
:
12px
;
$gl-btn-small-font-size
:
13px
;
$gl-btn-small-font-size
:
13px
;
$gl-btn-small-line-height
:
18px
;
$gl-btn-small-line-height
:
18px
;
$gl-btn-xs-font-size
:
13px
;
$gl-btn-xs-line-height
:
13px
;
/*
/*
* Badges
* Badges
...
...
app/views/discussions/_diff_with_notes.html.haml
View file @
7500cd57
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
%td
.line_content.js-success-lazy-load
%td
.line_content.js-success-lazy-load
.js-code-placeholder
.js-code-placeholder
%td
.js-error-lazy-load-diff.hidden.diff-loading-error-block
%td
.js-error-lazy-load-diff.hidden.diff-loading-error-block
-
button
=
button_tag
(
_
(
"Try again"
),
class:
"btn-link gl-button btn-link-retry
btn-no-padding
js-toggle-lazy-diff-retry-button"
)
-
button
=
button_tag
(
_
(
"Try again"
),
class:
"btn-link gl-button btn-link-retry
gl-p-0
js-toggle-lazy-diff-retry-button"
)
=
_
(
"Unable to load the diff. %{button_try_again}"
).
html_safe
%
{
button_try_again:
button
}
=
_
(
"Unable to load the diff. %{button_try_again}"
).
html_safe
%
{
button_try_again:
button
}
=
render
"discussions/diff_discussion"
,
discussions:
[
discussion
],
expanded:
true
=
render
"discussions/diff_discussion"
,
discussions:
[
discussion
],
expanded:
true
-
else
-
else
...
...
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