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
d89c6adf
Commit
d89c6adf
authored
Nov 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve select UI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
bd2ca33d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
17 deletions
+38
-17
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+5
-0
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+22
-2
app/assets/stylesheets/selects.scss
app/assets/stylesheets/selects.scss
+8
-10
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+0
-2
No files found.
app/assets/stylesheets/common.scss
View file @
d89c6adf
...
@@ -358,3 +358,8 @@ table {
...
@@ -358,3 +358,8 @@ table {
background
:
#555
;
background
:
#555
;
color
:
#BBB
;
color
:
#BBB
;
}
}
.project-refs-form
.chosen-container
.chosen-single
span
{
font-weight
:
bold
;
color
:
#555
;
}
app/assets/stylesheets/sections/merge_requests.scss
View file @
d89c6adf
...
@@ -110,9 +110,29 @@
...
@@ -110,9 +110,29 @@
.merge-request-angle
{
.merge-request-angle
{
text-align
:
center
;
text-align
:
center
;
margin
:
0
;
margin
:
0
auto
;
background
:
#eee
;
border-radius
:
100px
;
width
:
60px
;
line-height
:
60px
;
color
:
#777
;
text-shadow
:
0
1px
2px
#FFF
;
}
}
.merge-request-form-info
{
.merge-request-form-info
{
padding
:
15px
0
;
padding-top
:
15px
;
}
.merge-request-branches
{
.commit-row-message
{
font-weight
:
normal
!
important
;
}
.chosen-container
.chosen-single
{
padding
:
2px
0
2px
10px
;
span
{
font-weight
:
bold
;
color
:
#555
;
}
}
}
}
app/assets/stylesheets/selects.scss
View file @
d89c6adf
...
@@ -71,8 +71,9 @@
...
@@ -71,8 +71,9 @@
.chosen-drop
{
.chosen-drop
{
margin
:
7px
0
;
margin
:
7px
0
;
min-width
:
200px
;
min-width
:
200px
;
border
:
1px
solid
#
bbb
;
border
:
1px
solid
#
CCC
;
@include
border-radius
(
0
);
@include
border-radius
(
0
);
box-shadow
:
inset
0
1px
0
#fff
,
0
1px
5px
#f1f1f1
;
.chosen-results
{
.chosen-results
{
margin-top
:
5px
;
margin-top
:
5px
;
...
@@ -80,9 +81,10 @@
...
@@ -80,9 +81,10 @@
.group-result
{
.group-result
{
color
:
$style_color
;
color
:
$style_color
;
border-bottom
:
1px
solid
#EEE
;
font-size
:
14px
;
padding
:
8px
;
line-height
:
1
.5
;
}
}
.active-result
{
.active-result
{
@include
border-radius
(
0
);
@include
border-radius
(
0
);
...
@@ -91,8 +93,8 @@
...
@@ -91,8 +93,8 @@
color
:
$style_color
;
color
:
$style_color
;
}
}
&
.result-selected
{
&
.result-selected
{
font-weight
:
bolder
;
background
:
#EEE
;
background
:
#EEE
;
border-left
:
4px
solid
#CCC
;
}
}
}
}
}
}
...
@@ -118,17 +120,13 @@
...
@@ -118,17 +120,13 @@
span
{
span
{
font-weight
:
normal
;
font-weight
:
normal
;
text-shadow
:
0
1px
2px
#FFF
;
}
}
}
}
/** Select2 styling **/
/** Select2 styling **/
.select2-container
.select2-choice
{
.select2-container
.select2-choice
{
background
:
#f1f1f1
;
@include
bg-light-gray-gradient
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
whitesmoke
)
,
to
(
#e1e1e1
));
background-image
:
-webkit-linear-gradient
(
whitesmoke
6
.6%
,
#e1e1e1
);
background-image
:
-moz-linear-gradient
(
whitesmoke
6
.6%
,
#e1e1e1
);
background-image
:
-ms-linear-gradient
(
whitesmoke
6
.6%
,
#e1e1e1
);
background-image
:
-o-linear-gradient
(
whitesmoke
6
.6%
,
#e1e1e1
);
}
}
.select2-container
.select2-choice
div
{
.select2-container
.select2-choice
div
{
...
...
app/helpers/application_helper.rb
View file @
d89c6adf
...
@@ -84,8 +84,8 @@ module ApplicationHelper
...
@@ -84,8 +84,8 @@ module ApplicationHelper
repository
=
@project
.
repository
repository
=
@project
.
repository
options
=
[
options
=
[
[
"Branch
"
,
repository
.
branch_names
],
[
"Branch
es"
,
repository
.
branch_names
],
[
"Tag"
,
repository
.
tag_names
]
[
"Tags"
,
repository
.
tag_names
]
]
]
# If reference is commit id -
# If reference is commit id -
...
...
app/views/projects/edit.html.haml
View file @
d89c6adf
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
%span
Namespace
%span
Namespace
.controls
.controls
.control-group
.control-group
=
f
.
select
:namespace_id
,
namespaces_options
(
@project
.
namespace_id
),
{
prompt:
'Choose a project namespace'
},
{
class:
'chosen'
}
=
f
.
select
:namespace_id
,
namespaces_options
(
@project
.
namespace_id
),
{
prompt:
'Choose a project namespace'
},
{
class:
'chosen'
}
%ul
%ul
%li
Be careful. Changing the project's namespace can have unintended side effects.
%li
Be careful. Changing the project's namespace can have unintended side effects.
%li
You can only transfer the project to namespaces you manage.
%li
You can only transfer the project to namespaces you manage.
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
d89c6adf
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
=
f
.
select
(
:source_project_id
,[[
@merge_request
.
source_project
.
path_with_namespace
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span3'
})
=
f
.
select
(
:source_project_id
,[[
@merge_request
.
source_project
.
path_with_namespace
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span3'
})
.pull-left
.pull-left
%i
.icon-code-fork
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span2'
})
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span2'
})
.mr_source_commit.prepend-top-10
.mr_source_commit.prepend-top-10
.span2
.span2
...
@@ -26,7 +25,6 @@
...
@@ -26,7 +25,6 @@
=
f
.
select
(
:target_project_id
,
projects
.
map
{
|
proj
|
[
proj
.
path_with_namespace
,
proj
.
id
]
},
{
include_blank:
"Select Target Project"
},
{
class:
'target_project chosen span3'
})
=
f
.
select
(
:target_project_id
,
projects
.
map
{
|
proj
|
[
proj
.
path_with_namespace
,
proj
.
id
]
},
{
include_blank:
"Select Target Project"
},
{
class:
'target_project chosen span3'
})
.pull-left
.pull-left
%i
.icon-code-fork
=
f
.
select
(
:target_branch
,
@target_branches
,
{
include_blank:
"Select branch"
},
{
class:
'target_branch chosen span2'
})
=
f
.
select
(
:target_branch
,
@target_branches
,
{
include_blank:
"Select branch"
},
{
class:
'target_branch chosen span2'
})
.mr_target_commit.prepend-top-10
.mr_target_commit.prepend-top-10
...
...
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