From ba5c159074157ee74e2b8a5dc296a7210457a9b3 Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Mon, 17 Oct 2016 16:19:41 -0200 Subject: [PATCH] Altera origem do drunken-parrot-ui-flat --- sapl/settings.py | 2 +- sapl/static/styles/app.scss | 17 +++++++++++------ sapl/templates/base.html | 3 +++ sapl/templates/crud/detail.html | 2 +- sapl/templates/crud/detail_detail.html | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sapl/settings.py b/sapl/settings.py index 0bf9e231c..1cb071eb5 100644 --- a/sapl/settings.py +++ b/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 diff --git a/sapl/static/styles/app.scss b/sapl/static/styles/app.scss index beb9f8bf5..fabccf055 100644 --- a/sapl/static/styles/app.scss +++ b/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; diff --git a/sapl/templates/base.html b/sapl/templates/base.html index f5fa836f4..5aee60a89 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -284,6 +284,9 @@ + + + diff --git a/sapl/templates/crud/detail.html b/sapl/templates/crud/detail.html index af0c8c05a..ae8108cb2 100644 --- a/sapl/templates/crud/detail.html +++ b/sapl/templates/crud/detail.html @@ -24,7 +24,7 @@ {% trans 'Editar' %} {% endif %} {% if view.delete_url %} - {% trans 'Excluir' %} + {% trans 'Excluir' %} {% endif %} {% endif %} diff --git a/sapl/templates/crud/detail_detail.html b/sapl/templates/crud/detail_detail.html index 9f5472e97..dde6abbd6 100644 --- a/sapl/templates/crud/detail_detail.html +++ b/sapl/templates/crud/detail_detail.html @@ -24,7 +24,7 @@ {% trans 'Editar' %} {% endif %} {% if view.delete_url %} - {% trans 'Excluir' %} + {% trans 'Excluir' %} {% endif %} {% endif %}