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
34d9f34a
Commit
34d9f34a
authored
Jun 06, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve select2 css to match bootstrap style
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
838bbb55
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
7 deletions
+36
-7
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+15
-0
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+13
-1
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+1
-1
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-1
app/views/projects/tree/_tree.html.haml
app/views/projects/tree/_tree.html.haml
+0
-1
app/views/projects/tree/show.html.haml
app/views/projects/tree/show.html.haml
+6
-3
No files found.
app/assets/stylesheets/generic/selects.scss
View file @
34d9f34a
...
...
@@ -3,6 +3,10 @@
.select2-choice
{
background
:
#FFF
;
border-color
:
#BBB
;
padding
:
6px
12px
;
font-size
:
13px
;
line-height
:
18px
;
height
:
auto
;
.select2-arrow
{
background
:
#FFF
;
...
...
@@ -10,6 +14,17 @@
}
}
.select2-container-multi
.select2-choices
{
@include
border-radius
(
4px
)
}
.select2-container-multi
.select2-choices
.select2-search-field
input
{
padding
:
6px
12px
;
font-size
:
13px
;
line-height
:
18px
;
height
:
auto
;
}
.select2-drop-active
{
border
:
1px
solid
#BBB
!
important
;
margin-top
:
4px
;
...
...
app/assets/stylesheets/sections/tree.scss
View file @
34d9f34a
...
...
@@ -4,6 +4,10 @@
width
:
100%
;
}
.breadcrumb
{
padding
:
2px
0
;
}
.tree_progress
{
display
:
none
;
margin
:
20px
;
...
...
@@ -122,9 +126,17 @@
}
}
.tree-download-holder
.btn
{
padding
:
4px
12px
;
}
.tree-ref-holder
{
float
:
left
;
margin-top
:
8px
;
margin-right
:
6px
;
.select2-container
.select2-choice
,
.select2-container.select2-drop-above
.select2-choice
{
padding
:
4px
12px
;
}
}
.readme-holder
{
...
...
app/views/projects/issues/_form.html.haml
View file @
34d9f34a
...
...
@@ -35,7 +35,7 @@
.col-sm-10
=
project_users_select_tag
(
'issue[assignee_id]'
,
placeholder:
'Select a user'
,
class:
'custom-form-control'
,
selected:
@issue
.
assignee_id
)
=
link_to
'Assign to me'
,
'#'
,
class:
'btn
btn-small
assign-to-me-link'
=
link_to
'Assign to me'
,
'#'
,
class:
'btn assign-to-me-link'
.form-group
.issue-milestone
=
f
.
label
:milestone_id
,
class:
'control-label'
do
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
34d9f34a
...
...
@@ -37,7 +37,7 @@
.col-sm-10
=
project_users_select_tag
(
'merge_request[assignee_id]'
,
placeholder:
'Select a user'
,
class:
'custom-form-control'
,
selected:
@merge_request
.
assignee_id
)
=
link_to
'Assign to me'
,
'#'
,
class:
'btn
btn-small
assign-to-me-link'
=
link_to
'Assign to me'
,
'#'
,
class:
'btn assign-to-me-link'
.form-group
.issue-milestone
=
f
.
label
:milestone_id
,
class:
'control-label'
do
...
...
app/views/projects/tree/_tree.html.haml
View file @
34d9f34a
%ul
.breadcrumb
%li
%i
.icon-angle-right
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
@project
.
path
-
tree_breadcrumbs
(
tree
,
6
)
do
|
title
,
path
|
...
...
app/views/projects/tree/show.html.haml
View file @
34d9f34a
%div
.tree-ref-holder
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'tree'
,
path:
@path
-
if
can?
current_user
,
:download_code
,
@project
=
render
'projects/repositories/download_archive'
,
ref:
@ref
,
btn_class:
'btn-group-small pull-right'
,
split_button:
true
%div
#tree-holder
.tree-holder
.tree-download-holder
=
render
'projects/repositories/download_archive'
,
ref:
@ref
,
btn_class:
'btn-group-small pull-right hidden-xs'
,
split_button:
true
#tree-holder
.tree-holder.clearfix
=
render
"tree"
,
tree:
@tree
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