Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-17 11:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'alexgleason-streamfield-hover-jitter'

Browse source
This commit is contained in:
Matt Westcott 2015-10-23 12:31:16 +01:00
commit 8c6ffa6f48
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -38,6 +38,7 @@ Changelog
* Fix: Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
* Fix: Searching a specific page model while filtering it by either ID or tree position no longer raises an error (Ashia Zawaduk)
* Fix: Scrolling an over-long explorer menu no longer causes white background to show through (Alex Gleason)
* Fix: Removed jitter when hovering over StreamField blocks (Alex Gleason)
1.1 (15.09.2015)
~~~~~~~~~~~~~~~~

1
docs/releases/1.2.rst
View file

@ -92,6 +92,7 @@ Bug fixes
* Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
* Searching a specific page model while filtering it by either ID or tree position no longer raises an error (Ashia Zawaduk)
* Scrolling an over-long explorer menu no longer causes white background to show through (Alex Gleason)
* Removed jitter when hovering over StreamField blocks (Alex Gleason)
Upgrade considerations
======================

24
wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/streamfield.scss
View file

@ -5,11 +5,13 @@ ul.sequence{
li.sequence-member{
@include clearfix;
position:relative;
border-style: solid;
border-color: transparent;
border-width: 1px 0;
&:hover{
background-color:$color-input-focus;
border:1px solid darken($color-input-focus, 10%);
border-width:1px 0;
border-color: darken($color-input-focus, 10%);
.sequence-member-inner{
> .struct-block > label,
@ -24,7 +26,7 @@ li.sequence-member{
opacity:1;
}
.struct-block .fields{
@include column(10);
padding-left:0;
@ -47,8 +49,8 @@ li.sequence-member{
position:relative;
padding:1.5em 50px;
.sequence-member:hover{
border:0;
.sequence-member {
border: 0;
}
/* sequences within sequences, such as a ListBlock within StructBlock*/
@ -120,7 +122,7 @@ should be borderless and full-width
.block_field > .field-content > .input > .sequence-container > .sequence-container-inner > .sequence > .sequence-member > .sequence-member-inner{
> .widget-text_input input,
> .widget-rich_text_area .richtext,
> .widget-textarea textarea{
> .widget-textarea textarea{
border:0;
padding:0;
background-color:transparent;
@ -180,10 +182,10 @@ should be borderless and full-width
&:hover label{
opacity:1;
}
.disabled{
display:none;
}
}
}
/* list controls are slightly different as they require closer proximity to their associated fields */
@ -270,7 +272,7 @@ should be borderless and full-width
clear:left;
}
}
button{
@include transition(all 0.2s ease);
@ -328,7 +330,7 @@ should be borderless and full-width
&:focus{
color:$color-teal;
}
}
}
&:hover{
border-top-color:$color-teal;
@ -336,7 +338,7 @@ should be borderless and full-width
.toggle{
color:$color-teal;
}
}
}
}
@media screen and (min-width: $breakpoint-mobile){