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
Boxiang Sun
gitlab-ce
Commits
4363cc38
Commit
4363cc38
authored
Jul 23, 2019
by
Michel Engelen
Committed by
Phil Hughes
Jul 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hoverable area on collapsed sidebar icons
parent
9eb46764
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
20 deletions
+37
-20
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
...cripts/sidebar/components/subscriptions/subscriptions.vue
+16
-16
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+16
-4
changelogs/unreleased/61207-adjusted-hoverable-area-in-sidebar.yml
...s/unreleased/61207-adjusted-hoverable-area-in-sidebar.yml
+5
-0
No files found.
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
View file @
4363cc38
...
...
@@ -73,22 +73,22 @@ export default {
<
template
>
<div>
<
div
class=
"sidebar-collapsed-icon"
@
click=
"onClickCollapsedIcon"
>
<span
v-tooltip
:title=
"notificationTooltip"
data-container=
"body"
data-placement=
"left"
data-boundary=
"viewport"
>
<icon
:name=
"notificationIcon"
:size=
"16
"
aria-hidden=
"true
"
class=
"sidebar-item-icon is-activ
e"
/>
</span
>
</
div
>
<
span
v-tooltip
class=
"sidebar-collapsed-icon"
:title=
"notificationTooltip"
data-container=
"body"
data-placement=
"left"
data-boundary=
"viewport"
@
click=
"onClickCollapsedIcon"
>
<icon
:name=
"notificationIcon
"
:size=
"16
"
aria-hidden=
"tru
e"
class=
"sidebar-item-icon is-active"
/
>
</
span
>
<span
class=
"issuable-header-text hide-collapsed float-left"
>
{{
__
(
'
Notifications
'
)
}}
</span>
<toggle-button
ref=
"toggleButton"
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
4363cc38
...
...
@@ -390,7 +390,7 @@
.block
{
width
:
$gutter-collapsed-width
-
2px
;
padding
:
15px
0
0
;
padding
:
0
;
border-bottom
:
0
;
overflow
:
hidden
;
...
...
@@ -427,10 +427,13 @@
}
.sidebar-collapsed-icon
{
display
:
block
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
align-items
:
center
;
width
:
100%
;
height
:
$sidebar-toggle-height
;
text-align
:
center
;
margin-bottom
:
10px
;
color
:
$gl-text-color-secondary
;
svg
{
...
...
@@ -470,6 +473,16 @@
}
.btn-clipboard
{
/*
This change should be temporary, because the DOM currently gets
generated from a ruby definition in `app/helpers/button_helper.rb`.
As soon as the `copy to clipboard` button will be transfered to
Vue this should be adjusted as well.
*/
flex
:
1
;
align-self
:
stretch
;
padding
:
0
;
border
:
0
;
background
:
transparent
;
color
:
$gl-text-color-secondary
;
...
...
@@ -493,7 +506,6 @@
.sidebar-collapsed-user
{
padding-bottom
:
0
;
margin-bottom
:
10px
;
.author-link
{
padding-left
:
0
;
...
...
changelogs/unreleased/61207-adjusted-hoverable-area-in-sidebar.yml
0 → 100644
View file @
4363cc38
---
title
:
"
Adjusted
the
clickable
area
of
collapsed
sidebar
elements"
merge_request
:
30974
author
:
Michel Engelen
type
:
changed
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