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
fad7e376
Commit
fad7e376
authored
Sep 22, 2020
by
Andrei Cirnici
Committed by
Andrei Kyrnich @kyrnich
Sep 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply GitLab UI button styles to HAML buttons app/views/projects/blob
parent
bc6d5aa6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-1
app/views/projects/blob/_new_dir.html.haml
app/views/projects/blob/_new_dir.html.haml
+2
-2
app/views/projects/blob/_remove.html.haml
app/views/projects/blob/_remove.html.haml
+2
-2
app/views/projects/blob/_upload.html.haml
app/views/projects/blob/_upload.html.haml
+2
-2
app/views/projects/blob/_viewer_switcher.html.haml
app/views/projects/blob/_viewer_switcher.html.haml
+2
-2
No files found.
app/views/projects/blob/_editor.html.haml
View file @
fad7e376
...
...
@@ -30,7 +30,7 @@
.file-buttons
-
if
is_markdown
=
render
'shared/blob/markdown_buttons'
,
show_fullscreen_button:
false
=
button_tag
class:
'soft-wrap-toggle btn'
,
type:
'button'
,
tabindex:
'-1'
do
=
button_tag
class:
'soft-wrap-toggle btn
gl-button
'
,
type:
'button'
,
tabindex:
'-1'
do
%span
.no-wrap
=
custom_icon
(
'icon_no_wrap'
)
No wrap
...
...
app/views/projects/blob/_new_dir.html.haml
View file @
fad7e376
...
...
@@ -15,7 +15,7 @@
=
render
'shared/new_commit_form'
,
placeholder:
_
(
"Add new directory"
)
.form-actions
=
submit_tag
_
(
"Create directory"
),
class:
'btn btn-success'
=
link_to
"Cancel"
,
'#'
,
class:
"btn btn-cancel"
,
"data-dismiss"
=>
"modal"
=
submit_tag
_
(
"Create directory"
),
class:
'btn
gl-button
btn-success'
=
link_to
"Cancel"
,
'#'
,
class:
"btn
gl-button
btn-cancel"
,
"data-dismiss"
=>
"modal"
=
render
'shared/projects/edit_information'
app/views/projects/blob/_remove.html.haml
View file @
fad7e376
...
...
@@ -12,5 +12,5 @@
.form-group.row
.offset-sm-2.col-sm-10
=
button_tag
'Delete file'
,
class:
'btn btn-remove btn-remove-file'
=
link_to
"Cancel"
,
'#'
,
class:
"btn btn-cancel"
,
"data-dismiss"
=>
"modal"
=
button_tag
'Delete file'
,
class:
'btn
gl-button
btn-remove btn-remove-file'
=
link_to
"Cancel"
,
'#'
,
class:
"btn
gl-button
btn-cancel"
,
"data-dismiss"
=>
"modal"
app/views/projects/blob/_upload.html.haml
View file @
fad7e376
...
...
@@ -20,9 +20,9 @@
=
render
'shared/new_commit_form'
,
placeholder:
placeholder
.form-actions
=
button_tag
class:
'btn btn-success btn-upload-file'
,
id:
'submit-all'
,
type:
'button'
do
=
button_tag
class:
'btn
gl-button
btn-success btn-upload-file'
,
id:
'submit-all'
,
type:
'button'
do
=
icon
(
'spin spinner'
,
class:
'js-loading-icon hidden'
)
=
button_title
=
link_to
_
(
"Cancel"
),
'#'
,
class:
"btn btn-cancel"
,
"data-dismiss"
=>
"modal"
=
link_to
_
(
"Cancel"
),
'#'
,
class:
"btn
gl-button
btn-cancel"
,
"data-dismiss"
=>
"modal"
=
render
'shared/projects/edit_information'
app/views/projects/blob/_viewer_switcher.html.haml
View file @
fad7e376
...
...
@@ -4,9 +4,9 @@
.btn-group.js-blob-viewer-switcher.ml-2
{
role:
"group"
}
>
-
simple_label
=
"Display
#{
simple_viewer
.
switcher_title
}
"
%button
.btn.btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip
{
'aria-label'
=>
simple_label
,
title:
simple_label
,
data:
{
viewer:
'simple'
,
container:
'body'
}
}
>
%button
.btn.
gl-button.
btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip
{
'aria-label'
=>
simple_label
,
title:
simple_label
,
data:
{
viewer:
'simple'
,
container:
'body'
}
}
>
=
sprite_icon
(
simple_viewer
.
switcher_icon
)
-
rich_label
=
"Display
#{
rich_viewer
.
switcher_title
}
"
%button
.btn.btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip
{
'aria-label'
=>
rich_label
,
title:
rich_label
,
data:
{
viewer:
'rich'
,
container:
'body'
}
}
>
%button
.btn.
gl-button.
btn-default.btn-sm.js-blob-viewer-switch-btn.has-tooltip
{
'aria-label'
=>
rich_label
,
title:
rich_label
,
data:
{
viewer:
'rich'
,
container:
'body'
}
}
>
=
sprite_icon
(
rich_viewer
.
switcher_icon
)
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