tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Updated list-group styles to work with file history and campaigns

Browse Source
This commit is contained in:
Paul Clarke 2016-11-22 15:38:43 +13:00 committed by Christopher Joe
parent 9b7e242f56
commit af853861ec
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
admin/client/dist/styles/bundle.css vendored
View File

@ -5897,18 +5897,18 @@ a.label:focus,a.label:hover{
padding:.75rem 1.25rem; padding:.75rem 1.25rem;
margin-bottom:-1px; margin-bottom:-1px;
background-color:#fff; background-color:#fff;
border:1px solid #ddd; border:1px solid #e5e8eb;
} }
.list-group-item:first-child{ .list-group-item:first-child{
border-top-right-radius:.25rem; border-top-right-radius:0;
border-top-left-radius:.25rem; border-top-left-radius:0;
} }
.list-group-item:last-child{ .list-group-item:last-child{
margin-bottom:0; margin-bottom:0;
border-bottom-right-radius:.25rem; border-bottom-right-radius:0;
border-bottom-left-radius:.25rem; border-bottom-left-radius:0;
} }
.list-group-flush .list-group-item{ .list-group-flush .list-group-item{
@ -14839,24 +14839,26 @@ div.TreeDropdownField a.jstree-loading .jstree-pageicon{
.list-group{ .list-group{
margin-left:-1.5385rem; margin-left:-1.5385rem;
margin-right:-1.5385rem; margin-right:-1.5385rem;
margin-bottom:1.5385rem;
}
.list-group-flush:first-child{
border-top:0;
}
.list-group-flush:last-child{
border-bottom:1px solid #e5e8eb; border-bottom:1px solid #e5e8eb;
margin-bottom:.9231rem;
} }
.list-group-item{ .list-group-item{
padding:.76925rem 1.5385rem; padding:.76925rem 1.5385rem;
min-height:65px; min-height:65px;
cursor:pointer; cursor:pointer;
text-decoration:none;
-webkit-transition:opacity .2s ease-in-out; -webkit-transition:opacity .2s ease-in-out;
transition:opacity .2s ease-in-out; transition:opacity .2s ease-in-out;
} }
.list-group-item:first-child{ .list-group-item,.list-group-item:hover{
border-top:0;
}
.list-group-item:hover{
text-decoration:none; text-decoration:none;
} }
@ -14869,6 +14871,10 @@ div.TreeDropdownField a.jstree-loading .jstree-pageicon{
opacity:1; opacity:1;
} }
.list-group-item-text{
line-height:1.539;
}
.list-group-item-heading{ .list-group-item-heading{
font-weight:400; font-weight:400;
font-size:14px; font-size:14px;
@ -16143,7 +16149,7 @@ body,html{
.campaign-admin__campaign .list-group-item.active:hover{ .campaign-admin__campaign .list-group-item.active:hover{
background-color:#f5f5f5; background-color:#f5f5f5;
color:#4f5861; color:#4f5861;
border-color:#ddd; border-color:#e5e8eb;
} }
} }

21
admin/client/src/components/ListGroup/ListGroup.scss
View File

@ -3,8 +3,17 @@
.list-group { .list-group {
margin-left: -$grid-gutter-width / 2; margin-left: -$grid-gutter-width / 2;
margin-right: -$grid-gutter-width / 2; margin-right: -$grid-gutter-width / 2;
border-bottom: 1px solid $border-color-light; margin-bottom: $panel-padding-y;
margin-bottom: $spacer-y * .75; }
.list-group-flush {
&:first-child {
border-top: 0;
}
&:last-child {
border-bottom: $list-group-border-width solid $list-group-border-color;
}
} }
.list-group-item { .list-group-item {
@ -17,10 +26,6 @@
text-decoration: none; text-decoration: none;
transition: opacity .2s ease-in-out; transition: opacity .2s ease-in-out;
&:first-child {
border-top: 0;
}
&:hover { &:hover {
text-decoration: none; text-decoration: none;
} }
@ -37,6 +42,10 @@
} }
} }
.list-group-item-text {
line-height: $line-height;
}
.list-group-item-heading { .list-group-item-heading {
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;