mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 09:33:54 +01:00
Code Issues Releases Wiki Activity

tweaks to streamfield controls

Browse Source
This commit is contained in:
Dave Cranwell 2015-03-06 16:19:31 +00:00 committed by Matt Westcott
parent 478682051c
commit 6f03795e0f
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss
View File

@ -228,8 +228,16 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
&:before{
line-height:1.7em;
}
}
}
&.button-neutral{
color:$color-grey-2;
&:hover{
color:$color-teal;
}
}
&:hover{
background-color: $color-button-hover;
color:white;
@ -250,6 +258,10 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
border-color:transparent;
background-color: $color-button-yes-hover;
}
&.button-nobg:hover{
color:$color-button-yes;
background-color:transparent;
}
}
&.no, &.serious{
background-color: $color-button-no;
@ -265,8 +277,18 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
border-color:transparent;
background-color: $color-button-no-hover;
}
&.button-nobg:hover{
color:$color-button-no;
background-color:transparent;
}
}
&.button-nobg{
border:0;
background-color:transparent;
}
&.bicolor{
border:0;
padding-left:3.5em;

12
wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss
View File

@ -334,9 +334,9 @@
position:absolute;
top:-1.5em; right:1em;
z-index:1;
overflow:hidden;
overflow:visible;
background-color:$color-input-focus;
padding:0.5rem 1em;
padding:0.2rem 1em;
h3{
margin:0;
@ -347,7 +347,6 @@
}
.buttons{
@include transition(opacity 0.2s ease);
display:inline-block;
opacity:0.4;
}
@ -357,11 +356,12 @@
button.icon.text-replace{
@include border-radius(50%);
width:1.5rem;
height:1.5rem;
width:1.4rem;
height:1.4rem;
&:before{
line-height:1.4em;
line-height:1.3em;
font-size:0.9rem;
}
}

6
wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_member.html
View File

@ -9,9 +9,9 @@
<div class="stream-controls">
<h3>{{ block_type_name }}</h3>{# TODO: this should be the label, not the name, the latter being a machine-name #}
<div class="buttons">
<button type="button" id="{{ prefix }}-moveup" title="{% trans 'Move up' %}" class="icon text-replace icon-order-up">{% trans 'Move up' %}</button>
<button type="button" id="{{ prefix }}-movedown" title="{% trans 'Move down' %}" class="icon text-replace icon-order-down">{% trans 'Move down' %}</button>
<button type="button" id="{{ prefix }}-delete" title="{% trans 'Delete' %}" class="stream-control icon text-replace no icon-bin">{% trans 'Delete' %}</button>
<button type="button" id="{{ prefix }}-moveup" title="{% trans 'Move up' %}" class="icon button-nobg button-neutral text-replace icon-order-up">{% trans 'Move up' %}</button>
<button type="button" id="{{ prefix }}-movedown" title="{% trans 'Move down' %}" class="icon button-nobg button-neutral text-replace icon-order-down">{% trans 'Move down' %}</button>
<button type="button" id="{{ prefix }}-delete" title="{% trans 'Delete' %}" class="icon button-nobg button-neutral text-replace no icon-bin">{% trans 'Delete' %}</button>
</div>
</div>
{% endblock %}