Browse Source

Altera origem do drunken-parrot-ui-flat

pull/739/head
LeandroRoberto 8 years ago
parent
commit
ba5c159074
  1. 2
      sapl/settings.py
  2. 17
      sapl/static/styles/app.scss
  3. 3
      sapl/templates/base.html
  4. 2
      sapl/templates/crud/detail.html
  5. 2
      sapl/templates/crud/detail_detail.html

2
sapl/settings.py

@ -185,7 +185,7 @@ BOWER_INSTALLED_APPS = (
'jquery-ui#1.12.1',
'jQuery-Mask-Plugin#1.14.0',
'jsdiff#2.2.2',
'https://github.com/hoarrd/drunken-parrot-flat-ui.git',
'https://github.com/interlegis/drunken-parrot-flat-ui.git',
)
# Additional search paths for SASS files when using the @import statement

17
sapl/static/styles/app.scss

@ -77,6 +77,17 @@ h6, .h6 {
}
}
.btn-default {
&.btn-excluir {
color: $btn-danger-bg;
&:hover {
color: $btn-danger-color;
border-color: lighten($btn-danger-bg, 5%);
background-color: lighten($btn-danger-bg, 5%);
}
}
}
// #### CRUD DETAIL ########################################
p.control-label {
font-weight: bold;
@ -133,12 +144,6 @@ body {
padding-top: 25px;
}
// #### conserta radios e checkboxes escondidas pelo drunken parrot ############
// FIXME ajustar após solução definitiva
.checkbox input, .radio input {
display: initial;
}
.modal {
.alert {
margin-bottom: 0;

3
sapl/templates/base.html

@ -284,6 +284,9 @@
<script type="text/javascript" src="{% static 'js/jquery.runner.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-mask-plugin/dist/jquery.mask.js' %}"></script>
<script type="text/javascript" src="{% static 'drunken-parrot-flat-ui/js/checkbox.js' %}"></script>
<script type="text/javascript" src="{% static 'drunken-parrot-flat-ui/js/radio.js' %}"></script>
<script src="{% static 'tinymce/tinymce.min.js' %}"></script>
<script type="text/javascript" src="{% static 'jsdiff/diff.min.js' %}"></script>

2
sapl/templates/crud/detail.html

@ -24,7 +24,7 @@
<a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a>
{% endif %}
{% if view.delete_url %}
<a href="{{ view.delete_url }}" class="btn btn-danger">{% trans 'Excluir' %}</a>
<a href="{{ view.delete_url }}" class="btn btn-default btn-excluir">{% trans 'Excluir' %}</a>
{% endif %}
</div>
{% endif %}

2
sapl/templates/crud/detail_detail.html

@ -24,7 +24,7 @@
<a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a>
{% endif %}
{% if view.delete_url %}
<a href="{{ view.delete_url }}" class="btn btn-danger btn-excluir">{% trans 'Excluir' %}</a>
<a href="{{ view.delete_url }}" class="btn btn-default btn-excluir">{% trans 'Excluir' %}</a>
{% endif %}
</div>
{% endif %}

Loading…
Cancel
Save