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
Boxiang Sun
gitlab-ce
Commits
cf3f7601
Commit
cf3f7601
authored
May 30, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove form-horizontal class where applicable
parent
02f8f900
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
30 deletions
+28
-30
app/assets/javascripts/ide/components/commit_sidebar/form.vue
...assets/javascripts/ide/components/commit_sidebar/form.vue
+0
-1
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
...pts/pages/projects/wikis/components/delete_wiki_modal.vue
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+18
-20
app/views/admin/application_settings/_repository_mirrors_form.html.haml
...n/application_settings/_repository_mirrors_form.html.haml
+4
-4
app/views/admin/application_settings/_terms.html.haml
app/views/admin/application_settings/_terms.html.haml
+3
-3
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+1
-1
No files found.
app/assets/javascripts/ide/components/commit_sidebar/form.vue
View file @
cf3f7601
...
@@ -126,7 +126,6 @@ export default {
...
@@ -126,7 +126,6 @@ export default {
</div>
</div>
<form
<form
v-if=
"!isCompact"
v-if=
"!isCompact"
class=
"form-horizontal"
@
submit.prevent.stop=
"commitChanges"
@
submit.prevent.stop=
"commitChanges"
ref=
"formEl"
ref=
"formEl"
>
>
...
...
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
View file @
cf3f7601
...
@@ -59,7 +59,7 @@ export default {
...
@@ -59,7 +59,7 @@ export default {
ref=
"form"
ref=
"form"
:action=
"deleteWikiUrl"
:action=
"deleteWikiUrl"
method=
"post"
method=
"post"
class=
"
form-horizontal
js-requires-input"
class=
"js-requires-input"
>
>
<input
<input
ref=
"method"
ref=
"method"
...
...
app/assets/stylesheets/framework/variables.scss
View file @
cf3f7601
...
@@ -373,6 +373,7 @@ $dropdown-chevron-size: 10px;
...
@@ -373,6 +373,7 @@ $dropdown-chevron-size: 10px;
$dropdown-toggle-active-border-color
:
darken
(
$border-color
,
14%
);
$dropdown-toggle-active-border-color
:
darken
(
$border-color
,
14%
);
$dropdown-item-hover-bg
:
$gray-darker
;
$dropdown-item-hover-bg
:
$gray-darker
;
$dropdown-fade-mask-height
:
32px
;
$dropdown-fade-mask-height
:
32px
;
$dropdown-member-form-control-width
:
163px
;
/*
/*
* Filtered Search
* Filtered Search
...
...
app/assets/stylesheets/pages/members.scss
View file @
cf3f7601
...
@@ -36,13 +36,12 @@
...
@@ -36,13 +36,12 @@
}
}
}
}
.form-
horizontal
{
.form-
group
{
margin-
top
:
20px
;
margin-
bottom
:
0
;
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-down
(
sm
)
{
display
:
-
webkit-flex
;
display
:
block
;
display
:
flex
;
margin-left
:
5px
;
margin-top
:
3px
;
}
}
}
}
...
@@ -62,10 +61,15 @@
...
@@ -62,10 +61,15 @@
}
}
.member-form-control
{
.member-form-control
{
@include
media-breakpoint-down
(
xs
)
{
@include
media-breakpoint-down
(
sm
)
{
padding-bottom
:
5px
;
width
:
$dropdown-member-form-control-width
;
margin-left
:
0
;
margin-left
:
0
;
padding-bottom
:
5px
;
}
@include
media-breakpoint-down
(
xs
)
{
margin-right
:
0
;
margin-right
:
0
;
width
:
auto
;
}
}
}
}
...
@@ -207,10 +211,6 @@
...
@@ -207,10 +211,6 @@
align-self
:
flex-start
;
align-self
:
flex-start
;
}
}
.form-horizontal
~
.btn
{
margin-right
:
0
;
}
@include
media-breakpoint-down
(
xs
)
{
@include
media-breakpoint-down
(
xs
)
{
display
:
block
;
display
:
block
;
...
@@ -220,6 +220,12 @@
...
@@ -220,6 +220,12 @@
display
:
block
;
display
:
block
;
}
}
.controls
>
.btn
:last-child
{
margin-left
:
5px
;
margin-right
:
5px
;
width
:
auto
;
}
.form-control
{
.form-control
{
width
:
100%
;
width
:
100%
;
}
}
...
@@ -232,10 +238,6 @@
...
@@ -232,10 +238,6 @@
.member-controls
{
.member-controls
{
margin-top
:
5px
;
margin-top
:
5px
;
}
}
.form-horizontal
{
margin-top
:
10px
;
}
}
}
}
}
...
@@ -259,10 +261,6 @@
...
@@ -259,10 +261,6 @@
margin-top
:
0
;
margin-top
:
0
;
}
}
.form-horizontal
{
display
:
block
;
}
.member-form-control
{
.member-form-control
{
margin
:
5px
0
;
margin
:
5px
0
;
}
}
...
...
app/views/admin/application_settings/_repository_mirrors_form.html.haml
View file @
cf3f7601
=
form_for
@application_setting
,
url:
admin_application_settings_path
,
html:
{
class:
'form-horizontal fieldset-form'
}
do
|
f
|
=
form_for
@application_setting
,
url:
admin_application_settings_path
do
|
f
|
=
form_errors
(
@application_setting
)
=
form_errors
(
@application_setting
)
%fieldset
%fieldset
.form-group
.form-group
.row
=
f
.
label
:mirror_available
,
'Enable mirror configuration'
,
class:
'control-label col-sm-
2
'
=
f
.
label
:mirror_available
,
'Enable mirror configuration'
,
class:
'control-label col-sm-
4
'
.col-sm-
10
.col-sm-
8
.form-check
.form-check
=
f
.
label
:mirror_available
do
=
f
.
label
:mirror_available
do
=
f
.
check_box
:mirror_available
=
f
.
check_box
:mirror_available
...
...
app/views/admin/application_settings/_terms.html.haml
View file @
cf3f7601
=
form_for
@application_setting
,
url:
admin_application_settings_path
,
html:
{
class:
'form-horizontal fieldset-form'
}
do
|
f
|
=
form_for
@application_setting
,
url:
admin_application_settings_path
do
|
f
|
=
form_errors
(
@application_setting
)
=
form_errors
(
@application_setting
)
%fieldset
%fieldset
.form-group
.form-group
.row
.col-sm-12
.col-sm-12
.form-check
.form-check
=
f
.
label
:enforce_terms
do
=
f
.
label
:enforce_terms
do
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
=
_
(
"Require all users to accept Terms of Service when they access GitLab."
)
=
_
(
"Require all users to accept Terms of Service when they access GitLab."
)
.form-text.text-muted
.form-text.text-muted
=
_
(
"When enabled, users cannot use GitLab until the terms have been accepted."
)
=
_
(
"When enabled, users cannot use GitLab until the terms have been accepted."
)
.form-group
.form-group
.row
.col-sm-12
.col-sm-12
=
f
.
label
:terms
do
=
f
.
label
:terms
do
=
_
(
"Terms of Service Agreement"
)
=
_
(
"Terms of Service Agreement"
)
...
...
app/views/shared/members/_member.html.haml
View file @
cf3f7601
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
title:
'Resend invite'
title:
'Resend invite'
-
if
user
!=
current_user
&&
member
.
can_update?
-
if
user
!=
current_user
&&
member
.
can_update?
=
form_for
member
,
remote:
true
,
html:
{
class:
'js-edit-member-form form-
horizontal
'
}
do
|
f
|
=
form_for
member
,
remote:
true
,
html:
{
class:
'js-edit-member-form form-
group row append-right-5
'
}
do
|
f
|
=
f
.
hidden_field
:access_level
=
f
.
hidden_field
:access_level
.member-form-control.dropdown.append-right-5
.member-form-control.dropdown.append-right-5
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
...
...
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