Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
218f2020d5d3
Commit
e7a64ec3
authored
Feb 22, 2017
by
Annabel Dunstone Gray
Browse files
Merge branch '22466-task-list-alignment' into 'master'
Align Task List Checkboxes Closes #22466 See merge request !6487
parents
587ca5c1aa77
8f77d8f1e8dd
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/framework/lists.scss
View file @
218f2020
...
...
@@ -96,16 +96,6 @@ ul.unstyled-list > li {
border-bottom
:
none
;
}
ul
.task-list
{
li
.task-list-item
{
list-style-type
:
none
;
}
ul
:not
(
.task-list
)
{
padding-left
:
1
.3em
;
}
}
// Generic content list
ul
.content-list
{
@include
basic-list
;
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
218f2020
...
...
@@ -76,6 +76,13 @@
#{
$property
}
:
$
value
;
}
/* http://phrappe.com/css/conditional-css-for-webkit-based-browsers/ */
@mixin
on-webkit-only
{
@media
screen
and
(
-
webkit-min-device-pixel-ratio
:
0
)
{
@content
;
}
}
@mixin
keyframes
(
$animation-name
)
{
@-webkit-keyframes
#{
$animation-name
}
{
@content
;
...
...
app/assets/stylesheets/framework/typography.scss
View file @
218f2020
...
...
@@ -134,7 +134,7 @@
ul
,
ol
{
padding
:
0
;
margin
:
3px
0
3px
28px
!
important
;
margin
:
3px
0
!
important
;
}
ul
:dir
(
rtl
),
...
...
@@ -144,6 +144,29 @@
li
{
line-height
:
1
.6em
;
margin-left
:
25px
;
padding-left
:
3px
;
/* Normalize the bullet position on webkit. */
@include
on-webkit-only
{
margin-left
:
28px
;
padding-left
:
0
;
}
}
ul
.task-list
{
li
.task-list-item
{
list-style-type
:
none
;
position
:
relative
;
padding-left
:
28px
;
margin-left
:
0
!
important
;
input
.task-list-item-checkbox
{
position
:
absolute
;
left
:
8px
;
top
:
5px
;
}
}
}
a
[
href
*=
"/uploads/"
],
...
...
changelogs/unreleased/22466-task-list-alignment.yml
0 → 100644
View file @
218f2020
---
title
:
Align task list checkboxes
merge_request
:
6487
author
:
Jared Deckard <jared.deckard@gmail.com>
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