From b50bb847392ab57abc063c51c21387f785358958 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 28 Jan 2019 21:50:58 -0200 Subject: [PATCH] migra barra inferior da vigencia --- .../src/apps/compilacao/scss/compilacao.scss | 36 +++++++++---------- .../templates/compilacao/text_edit_bloco.html | 2 -- .../compilacao/text_list__embedded.html | 14 ++++---- webpack-stats.json | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sapl-frontend/src/apps/compilacao/scss/compilacao.scss b/sapl-frontend/src/apps/compilacao/scss/compilacao.scss index 00c607126..3d39795d1 100644 --- a/sapl-frontend/src/apps/compilacao/scss/compilacao.scss +++ b/sapl-frontend/src/apps/compilacao/scss/compilacao.scss @@ -507,8 +507,13 @@ a:link:after, a:visited:after { } } /* and dpt */ - .tipo-vigencias { + a { + box-shadow: 1px 1px 1px #aaa; + } + } + + .tipo-vigencias__old { list-style: none; position: fixed; bottom: 0px; @@ -522,29 +527,23 @@ a:link:after, a:visited:after { opacity: 0.9; transition: all 0.3s ease-in-out; - li { + a { + color: white; + padding: 0.3em 1em 0; display: inline-block; - border-left: 1px solid #fff; - float: left; - a { - color: white; - padding: 0.3em 1em 0; - display: inline-block; - font-size: 110%; - cursor: pointer; - &.selected { - background-color: rgba(0, 0, 0, 0.5); - } - } - &:hover { - background-color: rgba(0, 0, 0, 0.2); + font-size: 110%; + cursor: pointer; + &.selected { + background-color: rgba(0, 0, 0, 0.5); } } &:hover { - opacity: 1; + background-color: rgba(0, 0, 0, 0.2); } } - + &:hover { + opacity: 1; + } } /* end cp */ .cp.cpe { @@ -557,6 +556,7 @@ a:link:after, a:visited:after { a.nota-alteracao * { color: #02baf2 !important; + font-size: 2rem; } } diff --git a/sapl/templates/compilacao/text_edit_bloco.html b/sapl/templates/compilacao/text_edit_bloco.html index 448ecf5d0..1edcbf893 100644 --- a/sapl/templates/compilacao/text_edit_bloco.html +++ b/sapl/templates/compilacao/text_edit_bloco.html @@ -47,11 +47,9 @@ {%endif%} {% if node.na %} - {{ node.td.nota_automatica_prefixo_html|safe }} {{ node.na }} {{ node.td.nota_automatica_sufixo_html|safe }} - {% endif %} diff --git a/sapl/templates/compilacao/text_list__embedded.html b/sapl/templates/compilacao/text_list__embedded.html index d5ad78391..c2a24513d 100644 --- a/sapl/templates/compilacao/text_list__embedded.html +++ b/sapl/templates/compilacao/text_list__embedded.html @@ -66,12 +66,14 @@ {% endif %} {% endfor %} - +
+ +
{% include 'compilacao/text_list_bloco.html'%} \ No newline at end of file diff --git a/webpack-stats.json b/webpack-stats.json index 997e8ad39..b5a5fca2e 100644 --- a/webpack-stats.json +++ b/webpack-stats.json @@ -1 +1 @@ -{"status":"done","publicPath":"http://localhost:8080/","chunks":{"compilacao":[{"name":"compilacao.js","publicPath":"http://localhost:8080/compilacao.js","path":"../sapl/static/compilacao.js"}],"global":[{"name":"global.js","publicPath":"http://localhost:8080/global.js","path":"../sapl/static/global.js"}],"sapl-oficial-theme":[{"name":"sapl-oficial-theme.js","publicPath":"http://localhost:8080/sapl-oficial-theme.js","path":"../sapl/static/sapl-oficial-theme.js"}]}} \ No newline at end of file +{"status":"done","publicPath":"http://localhost:8080/","chunks":{"compilacao":[{"name":"compilacao.js","publicPath":"http://localhost:8080/compilacao.js","path":"../sapl/static/compilacao.js"},{"name":"compilacao.0b47d7090f8fe1a3238c.hot-update.js","publicPath":"http://localhost:8080/compilacao.0b47d7090f8fe1a3238c.hot-update.js","path":"../sapl/static/compilacao.0b47d7090f8fe1a3238c.hot-update.js"}],"global":[{"name":"global.js","publicPath":"http://localhost:8080/global.js","path":"../sapl/static/global.js"}],"sapl-oficial-theme":[{"name":"sapl-oficial-theme.js","publicPath":"http://localhost:8080/sapl-oficial-theme.js","path":"../sapl/static/sapl-oficial-theme.js"}]},"error":"ModuleBuildError","message":"Module build failed (from ./node_modules/sass-loader/lib/loader.js):\n\n background-color: $color_buttons;\n ^\n Undefined variable: \"$color-buttons\".\n in /home/leandro/desenvolvimento/envs/sapl/sapl-frontend/src/apps/compilacao/scss/_vigencias.scss (line 30, column 23)"} \ No newline at end of file