From 353769f7dd5405043ffbf5bcee42765414c50f1a Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Mon, 17 Oct 2016 18:44:18 -0200 Subject: [PATCH 1/2] =?UTF-8?q?Adequa=20inser=C3=A7=C3=A3o=20dinamica=20de?= =?UTF-8?q?=20radio=20ao=20crispy-forms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/base/autor_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/templates/base/autor_form.html b/sapl/templates/base/autor_form.html index 12eaf104b..7df595493 100644 --- a/sapl/templates/base/autor_form.html +++ b/sapl/templates/base/autor_form.html @@ -40,7 +40,7 @@ $(document).ready(function(){ if (atualizar) { var radios = $("#div_id_autor_related .controls").html(''); data.models.forEach(function (val, index) { - var html_radio = ''; + var html_radio = '
'; radios.append(html_radio); }); From c9d3bb1a96389ee17724fe5cabb10f55b627e7cc Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Tue, 18 Oct 2016 09:10:13 -0200 Subject: [PATCH 2/2] Ajuste css e html do topo --- sapl/static/styles/app.scss | 65 ++++++++++++++++++++++++++++++++++--- sapl/templates/base.html | 8 ++--- 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/sapl/static/styles/app.scss b/sapl/static/styles/app.scss index fabccf055..4a3cb81cf 100644 --- a/sapl/static/styles/app.scss +++ b/sapl/static/styles/app.scss @@ -6,25 +6,50 @@ display: inline-block; vertical-align: middle; float: none; + padding: 10px; } nav { &.navbar { - padding: 5px; border-radius: 0; font-size: 15px; } -} + .navbar-nav { + & > li { + & > a { + padding-top: 0px; + padding-bottom: 0px; + line-height: $grid-gutter-width * 2.5; + &:hover { + background-color: $link-hover-color; + } + } + &:nth-child(2) { + & > .dropdown-menu { + right: auto; + } + } + } + &:last-child { + & > li:last-child { + a { + padding-right: 0px; + } + } + } + } +} .masthead { padding: 10px; .nav { - margin-top: 65px; + clear:both; } .navbar-brand { color: $headings-color; font-size: 24px; - img { + img.img-responsive { + height: 95px; margin-right: $navbar-padding-horizontal; } small { @@ -88,6 +113,7 @@ h6, .h6 { } } + // #### CRUD DETAIL ######################################## p.control-label { font-weight: bold; @@ -386,3 +412,34 @@ p { font-size: 100%; } /* FIM TEMPLATE AJUDA */ + +@media (max-width: 1199px) { + .masthead { + .navbar-brand { + font-size: 22px; + img.img-responsive { + height: 60px; + width: 60px; + margin-right: $navbar-padding-horizontal / 2; + } + } + } + .navbar-nav > li > a { + padding-left: $grid-gutter-width / 2.8; + padding-right: $grid-gutter-width / 2.8; + } +} + +@media (max-width: 1091px) { + .navbar-nav > li > a { + padding-left: $grid-gutter-width / 4; + padding-right: $grid-gutter-width / 4; + } +} + + +@media (min-width: 1092px) and (max-width: 1199px) { + .container { + width: 1070px; + } +} diff --git a/sapl/templates/base.html b/sapl/templates/base.html index 5aee60a89..7e651469f 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -42,7 +42,7 @@