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
acc21d30
Commit
acc21d30
authored
Aug 08, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase input padding. Minor ui fixes
parent
f79b2100
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
42 additions
and
32 deletions
+42
-32
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+4
-0
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
+15
-0
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+0
-12
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+1
-1
app/views/profiles/account.html.haml
app/views/profiles/account.html.haml
+1
-1
app/views/profiles/keys/_form.html.haml
app/views/profiles/keys/_form.html.haml
+2
-2
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/deploy_keys/_form.html.haml
+3
-3
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+8
-7
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+6
-4
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @
acc21d30
...
@@ -34,6 +34,10 @@
...
@@ -34,6 +34,10 @@
&
.ui-box-show
{
&
.ui-box-show
{
margin
:
20px
0
;
margin
:
20px
0
;
background
:
#FFF
;
background
:
#FFF
;
.control-group
{
margin-bottom
:
0
;
}
}
}
&
.ui-box-danger
{
&
.ui-box-danger
{
...
...
app/assets/stylesheets/gitlab_bootstrap/forms.scss
View file @
acc21d30
...
@@ -12,3 +12,18 @@ input {
...
@@ -12,3 +12,18 @@ input {
}
}
}
}
.control-group
{
.control-label
{
padding-top
:
6px
;
}
.controls
{
input
,
textarea
{
padding
:
6px
10px
;
}
input
[
type
=
"radio"
],
input
[
type
=
"checkbox"
]
{
margin-top
:
6px
;
}
}
}
app/assets/stylesheets/sections/projects.scss
View file @
acc21d30
.new_project
,
.new_project
,
.edit_project
{
.edit_project
{
.project_name_holder
{
input
,
label
{
font-size
:
16px
;
line-height
:
20px
;
padding
:
8px
;
}
}
.adv_settings
{
h6
{
margin-left
:
40px
;
}
}
fieldset
.features
{
fieldset
.features
{
.control-label
{
.control-label
{
font-weight
:
bold
;
font-weight
:
bold
;
...
...
app/views/admin/hooks/index.html.haml
View file @
acc21d30
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.control-group
.control-group
=
f
.
label
:url
,
"URL:"
=
f
.
label
:url
,
"URL:"
.controls
.controls
=
f
.
text_field
:url
,
class:
"text_field xxlarge input-xpadding"
=
f
.
text_field
:url
,
class:
"text_field
input-
xxlarge input-xpadding"
=
f
.
submit
"Add System Hook"
,
class:
"btn btn-create"
=
f
.
submit
"Add System Hook"
,
class:
"btn btn-create"
%hr
%hr
...
...
app/views/profiles/account.html.haml
View file @
acc21d30
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
It can be used for atom feed or API
It can be used for atom feed or API
%p
.cgray
%p
.cgray
-
if
current_user
.
private_token
-
if
current_user
.
private_token
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"input-xxlarge large_text"
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"input-xxlarge large_text
input-xpadding
"
=
f
.
submit
'Reset'
,
confirm:
"Are you sure?"
,
class:
"btn btn-primary btn-build-token"
=
f
.
submit
'Reset'
,
confirm:
"Are you sure?"
,
class:
"btn btn-primary btn-build-token"
-
else
-
else
%span
You don`t have one yet. Click generate to fix it.
%span
You don`t have one yet. Click generate to fix it.
...
...
app/views/profiles/keys/_form.html.haml
View file @
acc21d30
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
.control-group
.control-group
=
f
.
label
:title
=
f
.
label
:title
.controls
=
f
.
text_field
:title
.controls
=
f
.
text_field
:title
,
class:
"input-xlarge"
.control-group
.control-group
=
f
.
label
:key
=
f
.
label
:key
.controls
.controls
%p
.light
%p
.light
Paste your public key here. Read more about how generate it
#{
link_to
"here"
,
help_ssh_path
}
Paste your public key here. Read more about how generate it
#{
link_to
"here"
,
help_ssh_path
}
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
=
f
.
text_area
:key
,
class:
"input-xxlarge thin_area"
.form-actions
.form-actions
...
...
app/views/projects/deploy_keys/_form.html.haml
View file @
acc21d30
...
@@ -8,14 +8,14 @@
...
@@ -8,14 +8,14 @@
.control-group
.control-group
=
f
.
label
:title
=
f
.
label
:title
.controls
=
f
.
text_field
:title
.controls
=
f
.
text_field
:title
,
class:
'input-xlarge'
.control-group
.control-group
=
f
.
label
:key
=
f
.
label
:key
.controls
.controls
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
%p
.light
%p
.hint
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
=
f
.
text_area
:key
,
class:
"input-xxlarge thin_area"
.form-actions
.form-actions
=
f
.
submit
'Create'
,
class:
"btn-create btn"
=
f
.
submit
'Create'
,
class:
"btn-create btn"
...
...
app/views/projects/hooks/index.html.haml
View file @
acc21d30
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
.control-group
.control-group
=
f
.
label
:url
,
"URL:"
=
f
.
label
:url
,
"URL:"
.controls
.controls
=
f
.
text_field
:url
,
class:
"text_field xxlarge input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
text_field
:url
,
class:
"text_field
input-
xxlarge input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
%hr
%hr
...
...
app/views/projects/new.html.haml
View file @
acc21d30
.project-edit-container
%p
.slead
New projects are private by default. You choose who can see the project and commit to repository.
%hr
.project-edit-container.prepend-top-10
.project-edit-errors
.project-edit-errors
=
render
'projects/errors'
=
render
'projects/errors'
.project-edit-content
.project-edit-content
=
form_for
@project
,
remote:
true
do
|
f
|
=
form_for
@project
,
remote:
true
do
|
f
|
.control-group.project_name_holder
.control-group.project_name_holder
=
f
.
label
:name
do
=
f
.
label
:name
do
Project name is
%strong
Project name is
.controls
.controls
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"input-x
x
large"
,
tabindex:
1
,
autofocus:
true
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"input-xlarge"
,
tabindex:
1
,
autofocus:
true
-
if
current_user
.
can_select_namespace?
-
if
current_user
.
can_select_namespace?
.control-group
.control-group
...
@@ -25,7 +28,7 @@
...
@@ -25,7 +28,7 @@
=
f
.
label
:import_url
do
=
f
.
label
:import_url
do
%span
Import existing repo
%span
Import existing repo
.controls
.controls
=
f
.
text_field
:import_url
,
class:
'xlarge'
,
placeholder:
'https://github.com/randx/six.git'
=
f
.
text_field
:import_url
,
class:
'
input-
xlarge'
,
placeholder:
'https://github.com/randx/six.git'
.light
.light
URL must be cloneable
URL must be cloneable
.control-group
.control-group
...
@@ -33,10 +36,8 @@
...
@@ -33,10 +36,8 @@
Description
Description
%span
.light
(optional)
%span
.light
(optional)
.controls
.controls
=
f
.
text_area
:description
,
placeholder:
"awesome project"
,
class:
"
span5
"
,
rows:
3
,
maxlength:
250
,
tabindex:
3
=
f
.
text_area
:description
,
placeholder:
"awesome project"
,
class:
"
input-xlarge
"
,
rows:
3
,
maxlength:
250
,
tabindex:
3
%p
.padded
New projects are private by default. You choose who can see the project and commit to repository.
.form-actions
.form-actions
=
f
.
submit
'Create project'
,
class:
"btn btn-create project-submit"
,
tabindex:
4
=
f
.
submit
'Create project'
,
class:
"btn btn-create project-submit"
,
tabindex:
4
...
...
app/views/projects/wikis/_form.html.haml
View file @
acc21d30
...
@@ -23,11 +23,13 @@
...
@@ -23,11 +23,13 @@
\.
\.
.ui-box-bottom
.ui-box-bottom
=
f
.
label
:content
.control-group
.controls
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
=
f
.
label
:content
.controls
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
.ui-box-bottom
.ui-box-bottom
=
f
.
label
:commit_message
.control-group
.controls
=
f
.
text_field
:message
,
class:
'span8'
=
f
.
label
:commit_message
.controls
=
f
.
text_field
:message
,
class:
'span8'
.form-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"
...
...
app/views/projects/wikis/_new.html.haml
View file @
acc21d30
%div
#modal-new-wiki
.modal.hide
%div
#modal-new-wiki
.modal.hide
.modal-header
.modal-header
%a
.close
{
href:
"#"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
New Wiki Page
%h3
.page-title
New Wiki Page
.modal-body
.modal-body
=
label_tag
:new_wiki_path
do
=
label_tag
:new_wiki_path
do
...
...
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