Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
d8e8e473ae8c
Commit
e23c1d88
authored
Aug 23, 2016
by
Clement Ho
Browse files
Replace bootstrap caret with fontawesome caret
parent
b6bce0c5d93d
Changes
31
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
d8e8e473
...
...
@@ -44,6 +44,7 @@ v 8.13.0 (unreleased)
- Add broadcast messages and alerts below sub-nav
- Better empty state for Groups view
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
- Replace bootstrap caret with fontawesome caret (ClemMakesApps)
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
- Add organization field to user profile
- Fix resolved discussion display in side-by-side diff view !6575
...
...
app/assets/javascripts/pipeline.js.es6
View file @
d8e8e473
...
...
@@ -3,12 +3,21 @@
const $pipelineBtn = $(this).closest('.toggle-pipeline-btn');
const $pipelineGraph = $(this).closest('.row-content-block').next('.pipeline-graph');
const $btnText = $(this).find('.toggle-btn-text');
const $icon = $(this).find('.fa');
$($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
const graphCollapsed = $pipelineGraph.hasClass('graph-collapsed');
const expandIcon = 'fa-caret-down';
const hideIcon = 'fa-caret-up';
graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
if(graphCollapsed) {
$btnText.text('Expand');
$icon.removeClass(hideIcon).addClass(expandIcon);
} else {
$btnText.text('Hide');
$icon.removeClass(expandIcon).addClass(hideIcon);
}
}
$(document).on('click', '.toggle-pipeline-btn', toggleGraph);
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
d8e8e473
...
...
@@ -194,10 +194,17 @@
pointer-events
:
none
!
important
;
}
.caret
{
.fa-caret-down
,
.fa-caret-up
{
margin-left
:
5px
;
}
&
.dropdown-toggle
{
.fa-caret-down
{
margin-left
:
3px
;
}
}
svg
{
height
:
15px
;
width
:
15px
;
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
d8e8e473
.caret
{
display
:
inline-block
;
width
:
0
;
height
:
0
;
margin-left
:
2px
;
vertical-align
:
middle
;
border-top
:
$caret-width-base
dashed
;
border-right
:
$caret-width-base
solid
transparent
;
border-left
:
$caret-width-base
solid
transparent
;
}
.btn-group
{
.caret
{
margin-left
:
0
;
}
}
.dropdown
{
position
:
relative
;
...
...
app/assets/stylesheets/framework/forms.scss
View file @
d8e8e473
...
...
@@ -81,10 +81,10 @@ label {
.select-wrapper
{
position
:
relative
;
.caret
{
.
fa-
caret
-down
{
position
:
absolute
;
right
:
10px
;
top
:
$gl-padding
;
top
:
10px
;
color
:
$gray-darkest
;
pointer-events
:
none
;
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
d8e8e473
...
...
@@ -57,6 +57,10 @@ header {
&
:hover
,
&
:focus
,
&
:active
{
background-color
:
$background-color
;
}
.fa-caret-down
{
font-size
:
15px
;
}
}
.navbar-toggle
{
...
...
app/assets/stylesheets/framework/selects.scss
View file @
d8e8e473
...
...
@@ -21,7 +21,14 @@
padding-right
:
10px
;
b
{
@extend
.caret
;
display
:
inline-block
;
width
:
0
;
height
:
0
;
margin-left
:
2px
;
vertical-align
:
middle
;
border-top
:
$caret-width-base
dashed
;
border-right
:
$caret-width-base
solid
transparent
;
border-left
:
$caret-width-base
solid
transparent
;
color
:
$gray-darkest
;
}
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
d8e8e473
...
...
@@ -229,9 +229,12 @@
.fa
{
color
:
$table-text-gray
;
margin-right
:
6px
;
font-size
:
14px
;
}
svg
,
.fa
{
margin-right
:
0
;
}
}
.btn-remove
{
...
...
@@ -272,18 +275,8 @@
.toggle-pipeline-btn
{
background-color
:
$gray-dark
;
.caret
{
border-top
:
none
;
border-bottom
:
4px
solid
;
}
&
.graph-collapsed
{
background-color
:
$white-light
;
.caret
{
border-bottom
:
none
;
border-top
:
4px
solid
;
}
}
}
...
...
app/views/dashboard/todos/index.html.haml
View file @
d8e8e473
...
...
@@ -55,7 +55,7 @@
=
sort_options_hash
[
@sort
]
-
else
=
sort_title_recently_created
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right.dropdown-menu-sort
%li
=
link_to
todos_filter_path
(
sort:
sort_value_priority
)
do
...
...
app/views/explore/groups/index.html.haml
View file @
d8e8e473
...
...
@@ -23,7 +23,7 @@
=
sort_options_hash
[
@sort
]
-
else
=
sort_title_recently_created
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
=
link_to
explore_groups_path
(
sort:
sort_value_recently_created
)
do
...
...
app/views/explore/projects/_filter.html.haml
View file @
d8e8e473
...
...
@@ -7,7 +7,7 @@
=
visibility_level_label
(
params
[
:visibility_level
].
to_i
)
-
else
Any
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
=
link_to
filter_projects_path
(
visibility_level:
nil
)
do
...
...
@@ -27,7 +27,7 @@
=
params
[
:tag
]
-
else
Any
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
=
link_to
filter_projects_path
(
tag:
nil
)
do
...
...
app/views/layouts/header/_default.html.haml
View file @
d8e8e473
...
...
@@ -41,7 +41,7 @@
%li
.header-user.dropdown
=
link_to
current_user
,
class:
"header-user-dropdown-toggle"
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon
(
current_user
,
26
),
width:
26
,
height:
26
,
class:
"header-user-avatar"
%span
.caret
=
icon
(
'caret-down'
)
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%li
...
...
app/views/projects/branches/index.html.haml
View file @
d8e8e473
...
...
@@ -15,7 +15,7 @@
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
=
projects_sort_options_hash
[
@sort
]
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
=
link_to
filter_branches_path
(
sort:
sort_value_name
)
do
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
d8e8e473
...
...
@@ -67,7 +67,7 @@
.btn-group
%a
.dropdown-toggle.btn.btn-default
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
custom_icon
(
'icon_play'
)
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
-
actions
.
each
do
|
build
|
%li
...
...
@@ -78,7 +78,7 @@
.btn-group
%a
.dropdown-toggle.btn.btn-default.build-artifacts
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
"download"
)
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
-
artifacts
.
each
do
|
build
|
%li
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
d8e8e473
...
...
@@ -14,7 +14,7 @@
.dropdown.inline
%a
.btn.btn-default.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
%span
.hidden-xs
Options
%span
.caret
.commit-options-dropdown-caret
=
icon
(
'caret-down'
,
class:
"
.commit-options-dropdown-caret
"
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
.visible-xs-block.visible-sm-block
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
)
do
...
...
app/views/projects/commit/_pipeline.html.haml
View file @
d8e8e473
...
...
@@ -3,7 +3,7 @@
.btn.btn-grouped.btn-white.toggle-pipeline-btn
%span
.toggle-btn-text
Hide
%span
pipeline graph
%span
.caret
=
icon
(
'caret-up'
)
-
if
can?
(
current_user
,
:update_pipeline
,
pipeline
.
project
)
-
if
pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
=
link_to
"Retry failed"
,
retry_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
'btn btn-grouped btn-primary'
,
method: :post
...
...
app/views/projects/deployments/_actions.haml
View file @
d8e8e473
...
...
@@ -6,7 +6,7 @@
.dropdown
%a
.dropdown-new.btn.btn-default
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
custom_icon
(
'icon_play'
)
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
-
actions
.
each
do
|
action
|
%li
...
...
app/views/projects/forks/index.html.haml
View file @
d8e8e473
...
...
@@ -15,7 +15,7 @@
=
sort_options_hash
[
@sort
]
-
else
=
sort_title_recently_created
%b
.caret
=
icon
(
'caret-down'
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
-
excluded_filters
=
[
:state
,
:scope
,
:label_name
,
:milestone_id
,
:assignee_id
,
:author_id
]
...
...
app/views/projects/group_links/index.html.haml
View file @
d8e8e473
...
...
@@ -16,7 +16,7 @@
=
label_tag
:link_group_access
,
"Max access level"
,
class:
"label-light"
.select-wrapper
=
select_tag
:link_group_access
,
options_for_select
(
ProjectGroupLink
.
access_options
,
ProjectGroupLink
.
default_access
),
class:
"form-control select-control"
%span
.caret
=
icon
(
'caret-down'
)
.form-group
=
label_tag
:expires_at
,
'Access expiration date'
,
class:
'label-light'
.clearable-input
...
...
app/views/projects/issues/show.html.haml
View file @
d8e8e473
...
...
@@ -23,7 +23,7 @@
.issuable-actions
.clearfix.issue-btn-group.dropdown
%button
.btn.btn-default.pull-left.hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%span
.caret
=
icon
(
'caret-down'
)
Options
.dropdown-menu.dropdown-menu-align-right.hidden-lg
%ul
...
...
Prev
1
2
Next
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