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
bd02aa19
Commit
bd02aa19
authored
Jul 20, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add hover state to todos (!5361)
parent
7dde4ed2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
14 deletions
+49
-14
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/todos.scss
app/assets/stylesheets/pages/todos.scss
+40
-7
app/views/dashboard/todos/_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+8
-7
No files found.
CHANGELOG
View file @
bd02aa19
...
@@ -41,6 +41,7 @@ v 8.11.0 (unreleased)
...
@@ -41,6 +41,7 @@ v 8.11.0 (unreleased)
- Update `timeago` plugin to use multiple string/locale settings
- Update `timeago` plugin to use multiple string/locale settings
- Remove unused images (ClemMakesApps)
- Remove unused images (ClemMakesApps)
- Get issue and merge request description templates from repositories
- Get issue and merge request description templates from repositories
- Add hover state to todos !5361 (winniehell)
- Limit git rev-list output count to one in forced push check
- Limit git rev-list output count to one in forced push check
- Show deployment status on merge requests with external URLs
- Show deployment status on merge requests with external URLs
- Clean up unused routes (Josef Strzibny)
- Clean up unused routes (Josef Strzibny)
...
...
app/assets/stylesheets/pages/todos.scss
View file @
bd02aa19
...
@@ -20,10 +20,43 @@
...
@@ -20,10 +20,43 @@
}
}
}
}
.todo
{
.todos-list
>
.todo
{
// workaround because we cannot use border-colapse
border-top
:
1px
solid
transparent
;
display
:
-
webkit-flex
;
display
:
flex
;
-webkit-flex-direction
:
row
;
flex-direction
:
row
;
&
:hover
{
&
:hover
{
background-color
:
$row-hover
;
border-color
:
$row-hover-border
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
// overwrite border style of .content-list
&
:last-child
{
border-bottom
:
1px
solid
transparent
;
&
:hover
{
border-color
:
$row-hover-border
;
}
}
.todo-actions
{
display
:
-
webkit-flex
;
display
:
flex
;
-webkit-justify-content
:
center
;
justify-content
:
center
;
-webkit-flex-direction
:
column
;
flex-direction
:
column
;
margin-left
:
10px
;
}
.todo-item
{
-webkit-flex
:
auto
;
flex
:
auto
;
}
}
}
.todo-item
{
.todo-item
{
...
@@ -43,8 +76,6 @@
...
@@ -43,8 +76,6 @@
}
}
.todo-body
{
.todo-body
{
margin-right
:
174px
;
.todo-note
{
.todo-note
{
word-wrap
:
break-word
;
word-wrap
:
break-word
;
...
@@ -90,6 +121,12 @@
...
@@ -90,6 +121,12 @@
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
.todo
{
.avatar
{
display
:
none
;
}
}
.todo-item
{
.todo-item
{
.todo-title
{
.todo-title
{
white-space
:
normal
;
white-space
:
normal
;
...
@@ -98,10 +135,6 @@
...
@@ -98,10 +135,6 @@
margin-bottom
:
10px
;
margin-bottom
:
10px
;
}
}
.avatar
{
display
:
none
;
}
.todo-body
{
.todo-body
{
margin
:
0
;
margin
:
0
;
border-left
:
2px
solid
#ddd
;
border-left
:
2px
solid
#ddd
;
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
bd02aa19
%li
{
class:
"todo todo-#{todo.done? ? 'done' : 'pending'}"
,
id:
dom_id
(
todo
),
data
:{
url:
todo_target_path
(
todo
)}
}
%li
{
class:
"todo todo-#{todo.done? ? 'done' : 'pending'}"
,
id:
dom_id
(
todo
),
data
:{
url:
todo_target_path
(
todo
)}
}
=
author_avatar
(
todo
,
size:
40
)
.todo-item.todo-block
.todo-item.todo-block
=
image_tag
avatar_icon
(
todo
.
author_email
,
40
),
class:
'avatar s40'
,
alt
:''
.todo-title.title
.todo-title.title
-
unless
todo
.
build_failed?
-
unless
todo
.
build_failed?
=
todo_target_state_pill
(
todo
)
=
todo_target_state_pill
(
todo
)
...
@@ -19,13 +20,13 @@
...
@@ -19,13 +20,13 @@
·
#{
time_ago_with_tooltip
(
todo
.
created_at
)
}
·
#{
time_ago_with_tooltip
(
todo
.
created_at
)
}
-
if
todo
.
pending?
.todo-actions.pull-right
=
link_to
[
:dashboard
,
todo
],
method: :delete
,
class:
'btn btn-loading done-todo'
do
Done
=
icon
(
'spinner spin'
)
.todo-body
.todo-body
.todo-note
.todo-note
.md
.md
=
event_note
(
todo
.
body
,
project:
todo
.
project
)
=
event_note
(
todo
.
body
,
project:
todo
.
project
)
-
if
todo
.
pending?
.todo-actions
=
link_to
[
:dashboard
,
todo
],
method: :delete
,
class:
'btn btn-loading done-todo'
do
Done
=
icon
(
'spinner spin'
)
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