classes on fields now prefixed to avoid pollution

This commit is contained in:
Dave Cranwell 2015-02-06 17:34:43 +00:00
parent 7fd561554a
commit 4b22ede9d5
3 changed files with 30 additions and 15 deletions

View file

@ -304,9 +304,16 @@ class FieldBlock(Block):
#else:
# error_html = ''
if self.meta.classname:
classes = self.meta.classname.split(' ')
else:
classes = None
return render_to_string('wagtailadmin/block_forms/field.html', {
'label': self.label,
'classname': self.meta.classname,
'classes': classes,
'widget': widget_html,
'label_tag': label_html,
'field': self.field,

View file

@ -244,6 +244,10 @@
}
}
&:hover{
background-color:$color-input-focus;
}
&:hover .sequence-member-inner{
> .struct-block > label,
> .char_field > label{
@ -305,10 +309,11 @@
position:relative;
background-color:$color-grey-1;
border-top:1px solid transparent;
opacity:0;
opacity:1;
z-index:5;
.stream-menu-inner{
@include transition(max-height 0.2s ease);
max-width:50em;
max-height:9999em;
margin: auto;
@ -351,7 +356,7 @@
&:before{
display:block;
font-family:wagtail;
font-size:3em;
font-size:2em;
width:100%;
height:2em;
line-height:2em;
@ -385,8 +390,7 @@
&.stream-menu-closed{
@include box-shadow(none);
height:1px;
background-color:transparent;
height:0px;
border-top:1px solid lighten($color-grey-4, 3%);
.stream-menu-inner{
@ -401,18 +405,22 @@
@include transform(rotate(0deg));
color:$color-grey-3;
background-color:white;
}
}
&.stream-menu-closed:hover{
border-top-color:$color-teal;
}
&:before{
color:$color-teal;
}
&:hover{
border-top-color:$color-teal;
&:before{
color:$color-teal;
}
}
}
}
.sequence-member .stream-menu{
margin:auto auto 1em auto;
margin:auto auto 0em auto;
}
.sequence-member .stream-menu-closed{
opacity:0;
}
.sequence-member:hover{
.stream-controls{

View file

@ -1,5 +1,5 @@
{% load wagtailadmin_tags %}
<div class="field {{ field|fieldtype }} {{ classname }} {{ label }}">
<div class="field {{ field|fieldtype }} {% for class in classes %} blockclass-{{ class }}{% endfor %} label-{{ label }}">
{{ label_tag }}
<div class="field-content">
<div class="input">