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
Tatuya Kamada
gitlab-ce
Commits
846e5950
Commit
846e5950
authored
Aug 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace .actions with .form-actions
parent
e3f9bd23
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
18 deletions
+11
-18
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
+4
-11
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+1
-1
app/views/profiles/keys/_form.html.haml
app/views/profiles/keys/_form.html.haml
+1
-1
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/deploy_keys/_form.html.haml
+1
-1
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+1
-1
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/_form.html.haml
+1
-1
app/views/projects/team_members/import.html.haml
app/views/projects/team_members/import.html.haml
+1
-1
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @
846e5950
form
{
form
{
@extend
.form-horizontal
;
@extend
.form-horizontal
;
.actions
{
label
{
@extend
.form-actions
;
@extend
.control-label
;
}
.clearfix
{
@extend
.control-group
;
}
}
.
input
{
.
actions
{
@extend
.
control
s
;
@extend
.
form-action
s
;
}
}
label
{
@extend
.control-label
;
}
.xlarge
{
.xlarge
{
@extend
.input-xlarge
;
@extend
.input-xlarge
;
}
}
...
...
app/views/admin/users/_form.html.haml
View file @
846e5950
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
=
f
.
label
:twitter
=
f
.
label
:twitter
.controls
=
f
.
text_field
:twitter
.controls
=
f
.
text_field
:twitter
.actions
.
form-
actions
-
if
@user
.
new_record?
-
if
@user
.
new_record?
=
f
.
submit
'Create user'
,
class:
"btn btn-create"
=
f
.
submit
'Create user'
,
class:
"btn btn-create"
=
link_to
'Cancel'
,
admin_users_path
,
class:
"btn btn-cancel"
=
link_to
'Cancel'
,
admin_users_path
,
class:
"btn btn-cancel"
...
...
app/views/profiles/keys/_form.html.haml
View file @
846e5950
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
.actions
.
form-
actions
=
f
.
submit
'Add key'
,
class:
"btn btn-create"
=
f
.
submit
'Add key'
,
class:
"btn btn-create"
=
link_to
"Cancel"
,
profile_keys_path
,
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
profile_keys_path
,
class:
"btn btn-cancel"
app/views/projects/deploy_keys/_form.html.haml
View file @
846e5950
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
Paste a machine public key here. Read more about how generate it
Paste a machine public key here. Read more about how generate it
=
link_to
"here"
,
help_ssh_path
=
link_to
"here"
,
help_ssh_path
.actions
.
form-
actions
=
f
.
submit
'Create'
,
class:
"btn-create btn"
=
f
.
submit
'Create'
,
class:
"btn-create btn"
=
link_to
"Cancel"
,
project_deploy_keys_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
project_deploy_keys_path
(
@project
),
class:
"btn btn-cancel"
app/views/projects/issues/_form.html.haml
View file @
846e5950
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
%p
.hint
Issues are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
%p
.hint
Issues are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
.actions
.
form-
actions
-
if
@issue
.
new_record?
-
if
@issue
.
new_record?
=
f
.
submit
'Submit new issue'
,
class:
"btn btn-create"
=
f
.
submit
'Submit new issue'
,
class:
"btn btn-create"
-
else
-
else
...
...
app/views/projects/team_members/_form.html.haml
View file @
846e5950
...
@@ -19,6 +19,6 @@
...
@@ -19,6 +19,6 @@
=
f
.
label
:project_access
,
"Project Access"
=
f
.
label
:project_access
,
"Project Access"
.controls
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.controls
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.actions
.
form-
actions
=
f
.
submit
'Add users'
,
class:
"btn btn-create"
=
f
.
submit
'Add users'
,
class:
"btn btn-create"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
app/views/projects/team_members/import.html.haml
View file @
846e5950
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
label_tag
:source_project_id
,
"Project"
=
label_tag
:source_project_id
,
"Project"
.controls
=
select_tag
(
:source_project_id
,
options_from_collection_for_select
(
current_user
.
authorized_projects
,
:id
,
:name_with_namespace
),
prompt:
"Select project"
,
class:
"chosen xxlarge"
,
required:
true
)
.controls
=
select_tag
(
:source_project_id
,
options_from_collection_for_select
(
current_user
.
authorized_projects
,
:id
,
:name_with_namespace
),
prompt:
"Select project"
,
class:
"chosen xxlarge"
,
required:
true
)
.actions
.
form-
actions
=
submit_tag
'Import project members'
,
class:
"btn btn-create"
=
submit_tag
'Import project members'
,
class:
"btn btn-create"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
app/views/projects/wikis/_form.html.haml
View file @
846e5950
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
.ui-box-bottom
.ui-box-bottom
=
f
.
label
:commit_message
=
f
.
label
:commit_message
.controls
=
f
.
text_field
:message
,
class:
'span8'
.controls
=
f
.
text_field
:message
,
class:
'span8'
.actions
.
form-
actions
-
if
@wiki
&&
@wiki
.
persisted?
-
if
@wiki
&&
@wiki
.
persisted?
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
=
link_to
"Cancel"
,
project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-cancel"
...
...
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