BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5b1416aa
Commit
5b1416aa
authored
May 30, 2018
by
Annabel Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bootstrap-pull-float' into 'master'
Convert remaining pull-* to float-* Closes #46934 See merge request gitlab-org/gitlab-ce!19225
parents
8357e4cf
4d6f6f93
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
15 deletions
+15
-15
changed_file_icon.vue
app/assets/javascripts/ide/components/changed_file_icon.vue
+1
-1
form.vue
...assets/javascripts/ide/components/commit_sidebar/form.vue
+3
-3
repo_file.vue
app/assets/javascripts/ide/components/repo_file.vue
+1
-1
_runner.html.haml
app/views/groups/runners/_runner.html.haml
+2
-2
_active_session.html.haml
app/views/profiles/active_sessions/_active_session.html.haml
+3
-3
_push.html.haml
app/views/projects/mirrors/_push.html.haml
+2
-2
new.html.haml
app/views/projects/pipelines/new.html.haml
+1
-1
index.html.haml
app/views/users/terms/index.html.haml
+2
-2
No files found.
app/assets/javascripts/ide/components/changed_file_icon.vue
View file @
5b1416aa
...
...
@@ -43,7 +43,7 @@ export default {
return
`
${
this
.
changedIcon
}
-solid`
;
},
changedIconClass
()
{
return
`multi-
${
this
.
changedIcon
}
pull
-left`
;
return
`multi-
${
this
.
changedIcon
}
float
-left`
;
},
tooltipTitle
()
{
if
(
!
this
.
showTooltip
)
return
undefined
;
...
...
app/assets/javascripts/ide/components/commit_sidebar/form.vue
View file @
5b1416aa
...
...
@@ -144,14 +144,14 @@ export default {
<loading-button
:loading=
"submitCommitLoading"
:disabled=
"commitButtonDisabled"
container-class=
"btn btn-success btn-sm
pull
-left"
container-class=
"btn btn-success btn-sm
float
-left"
:label=
"__('Commit')"
@
click=
"commitChanges"
/>
<button
v-if=
"!discardDraftButtonDisabled"
type=
"button"
class=
"btn btn-default btn-sm
pull
-right"
class=
"btn btn-default btn-sm
float
-right"
@
click=
"discardDraft"
>
{{
__
(
'Discard draft'
)
}}
...
...
@@ -159,7 +159,7 @@ export default {
<button
v-else
type=
"button"
class=
"btn btn-default btn-sm
pull
-right"
class=
"btn btn-default btn-sm
float
-right"
@
click=
"toggleIsSmall"
>
{{
__
(
'Collapse'
)
}}
...
...
app/assets/javascripts/ide/components/repo_file.vue
View file @
5b1416aa
...
...
@@ -169,7 +169,7 @@ export default {
:show-tooltip=
"true"
:show-staged-icon=
"true"
:force-modified-icon=
"true"
class=
"
pull
-right"
class=
"
float
-right"
/>
</span>
<new-dropdown
...
...
app/views/groups/runners/_runner.html.haml
View file @
5b1416aa
...
...
@@ -8,13 +8,13 @@
=
link_to
edit_group_runner_path
(
@group
,
runner
)
do
=
icon
(
'edit'
)
.
pull
-right
.
float
-right
-
if
runner
.
active?
=
link_to
_
(
'Pause'
),
pause_group_runner_path
(
@group
,
runner
),
method: :post
,
class:
'btn btn-sm btn-danger'
,
data:
{
confirm:
_
(
"Are you sure?"
)
}
-
else
=
link_to
_
(
'Resume'
),
resume_group_runner_path
(
@group
,
runner
),
method: :post
,
class:
'btn btn-success btn-sm'
=
link_to
_
(
'Remove Runner'
),
group_runner_path
(
@group
,
runner
),
data:
{
confirm:
_
(
"Are you sure?"
)
},
method: :delete
,
class:
'btn btn-danger btn-sm'
.
pull
-right
.
float
-right
%small
.light
\##{runner.id}
-
if
runner
.
description
.
present?
...
...
app/views/profiles/active_sessions/_active_session.html.haml
View file @
5b1416aa
-
is_current_session
=
active_session
.
current?
(
session
)
%li
.list-group-item
.
pull
-left.append-right-10
{
data:
{
toggle:
'tooltip'
},
title:
active_session
.
human_device_type
}
.
float
-left.append-right-10
{
data:
{
toggle:
'tooltip'
},
title:
active_session
.
human_device_type
}
=
active_session_device_type_icon
(
active_session
)
.description.
pull
-left
.description.
float
-left
%div
%strong
=
active_session
.
ip_address
-
if
is_current_session
...
...
@@ -25,7 +25,7 @@
=
l
(
active_session
.
created_at
,
format: :short
)
-
unless
is_current_session
.
pull
-right
.
float
-right
=
link_to
profile_active_session_path
(
active_session
.
session_id
),
data:
{
confirm:
'Are you sure? The device will be signed out of GitLab.'
},
method: :delete
,
class:
"btn btn-danger prepend-left-10"
do
%span
.sr-only
Revoke
Revoke
app/views/projects/mirrors/_push.html.haml
View file @
5b1416aa
...
...
@@ -30,7 +30,7 @@
#{
h
(
@remote_mirror
.
last_error
.
strip
)
}
=
f
.
fields_for
:remote_mirrors
,
@remote_mirror
do
|
rm_form
|
.form-group
=
rm_form
.
check_box
:enabled
,
class:
"
pull
-left"
=
rm_form
.
check_box
:enabled
,
class:
"
float
-left"
.prepend-left-20
=
rm_form
.
label
:enabled
,
"Remote mirror repository"
,
class:
"label-light append-bottom-0"
%p
.light.append-bottom-0
...
...
@@ -42,7 +42,7 @@
=
render
"projects/mirrors/instructions"
.form-group
=
rm_form
.
check_box
:only_protected_branches
,
class:
'
pull
-left'
=
rm_form
.
check_box
:only_protected_branches
,
class:
'
float
-left'
.prepend-left-20
=
rm_form
.
label
:only_protected_branches
,
class:
'label-light'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/protected_branches'
)
...
...
app/views/projects/pipelines/new.html.haml
View file @
5b1416aa
...
...
@@ -29,7 +29,7 @@
.form-actions
=
f
.
submit
s_
(
'Pipeline|Create pipeline'
),
class:
'btn btn-success js-variables-save-button'
,
tabindex:
3
=
link_to
'Cancel'
,
project_pipelines_path
(
@project
),
class:
'btn btn-default
pull
-right'
=
link_to
'Cancel'
,
project_pipelines_path
(
@project
),
class:
'btn btn-default
float
-right'
-# haml-lint:disable InlineJavaScript
%script
#availableRefs
{
type:
"application/json"
}=
@project
.
repository
.
ref_names
.
to_json
.
html_safe
app/views/users/terms/index.html.haml
View file @
5b1416aa
...
...
@@ -4,10 +4,10 @@
=
markdown_field
(
@term
,
:terms
)
.row-content-block.footer-block.clearfix
-
if
can?
(
current_user
,
:accept_terms
,
@term
)
.
pull
-right
.
float
-right
=
button_to
accept_term_path
(
@term
,
redirect_params
),
class:
'btn btn-success prepend-left-8'
do
=
_
(
'Accept terms'
)
-
if
can?
(
current_user
,
:decline_terms
,
@term
)
.
pull
-right
.
float
-right
=
button_to
decline_term_path
(
@term
,
redirect_params
),
class:
'btn btn-default prepend-left-8'
do
=
_
(
'Decline and sign out'
)
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