Skip to content

Commit

Permalink
Fixed checkbox vertical positioning
Browse files Browse the repository at this point in the history
fixes #2825
  • Loading branch information
brandonkelly committed Apr 30, 2018
1 parent 11709ce commit 3c919cb
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- Fixed a SQL error that could occur when upgrading from Craft 2 to Craft 3 with an active user session.
- Fixed various SQL errors that could occur when upgrading from Craft 2 to Craft 3, if there were any lingering Craft 3 database tables from a previous upgrade attempt.
- Fixed a bug where the Clear Caches tool was deleting the `.gitignore` file inside `web/cpresources/`. ([#2823](https://github.com/craftcms/cms/issues/2823))
- Fixed the vertical positioning of checkboxes in the Control Panel. ([#2825](https://github.com/craftcms/cms/issues/2825))

## 3.0.4 - 2018-04-24

Expand Down
18 changes: 16 additions & 2 deletions src/web/assets/cp/dist/css/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,10 @@ ul.icons li a:hover {
&:active {
outline: none;
}

div.checkbox {
margin-top: 4px;
}
}

.disabled {
Expand Down Expand Up @@ -1747,6 +1751,13 @@ $checkboxPadding: 20px;
&.checkbox-cell {
@include padding-right(7px);
width: 12px !important;
position: relative;

input.checkbox + label,
div.checkbox {
position: absolute;
top: calc(50% - 6px);
}

& + td,
& + th {
Expand Down Expand Up @@ -3389,7 +3400,7 @@ input.checkbox {

input.checkbox + label,
div.checkbox {
display: inline;
display: inline-block;
clear: none;
position: relative;
@include padding-left(20px);
Expand Down Expand Up @@ -3417,7 +3428,6 @@ input.checkbox + label:before,
div.checkbox:before {
display: block;
position: absolute;
top: 2px;
@include left(0);
width: 12px !important;
height: 12px;
Expand All @@ -3428,6 +3438,10 @@ div.checkbox:before {
box-shadow: 0 0 0 1px $mediumHairlineColorAlpha;
}

input.checkbox + label:before {
top: 3px;
}

input.checkbox:disabled + label,
div.checkbox.disabled:before,
div.checkbox.disabled + label {
Expand Down
10 changes: 7 additions & 3 deletions src/web/assets/cp/dist/css/craft.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/craft.css.map

Large diffs are not rendered by default.

0 comments on commit 3c919cb

Please sign in to comment.