Browse Source

migra barra inferior da vigencia

pull/2485/head
Leandro Roberto 7 years ago
parent
commit
b50bb84739
  1. 36
      sapl-frontend/src/apps/compilacao/scss/compilacao.scss
  2. 2
      sapl/templates/compilacao/text_edit_bloco.html
  3. 14
      sapl/templates/compilacao/text_list__embedded.html
  4. 2
      webpack-stats.json

36
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;
}
}

2
sapl/templates/compilacao/text_edit_bloco.html

@ -47,11 +47,9 @@
{%endif%}
{% if node.na %}
<a class="dpt-link nota-alteracao" href="{% url 'sapl.compilacao:ta_text_edit' node.da.dpt.ta_id %}#{{node.da.dpt.pk}}" title="{% trans 'Abrir Edição do Dispositivo Alterador'%}">
<small>
{{ node.td.nota_automatica_prefixo_html|safe }}
{{ node.na }}
{{ node.td.nota_automatica_sufixo_html|safe }}
</small>
</a>
{% endif %}
</div>

14
sapl/templates/compilacao/text_list__embedded.html

@ -66,12 +66,14 @@
{% endif %}
{% endfor %}
<ul class="tipo-vigencias">
<li><a class="selected" onclick="textoMultiVigente(this, false);" title="{% trans 'Texto Multivigente Sequencial'%}">{% trans 'TMS'%}</a></li>
<li><a onclick="textoMultiVigente(this, true);" title="{% trans 'Texto Multivigente Integrado com Realce de Alterações'%}">{% trans 'TMI'%}</a></li>
<li><a onclick="textoMultiVigente(this, false); textoVigente(this, true);" title="{% trans 'Texto Vigente COM Links para Textos Alteradores'%}">{% trans 'TVL'%}</a></li>
<li><a onclick="textoVigente(this, false);" title="{% trans 'Texto Vigente'%}">{% trans 'TVT'%}</a></li>
</ul>
<div class="tipo-vigencias d-flex fixed-bottom justify-content-center mb-1">
<div class="btn-group">
<a class="btn btn-primary active" onclick="textoMultiVigente(this, false);" title="{% trans 'Texto Multivigente Sequencial'%}">{% trans 'TMS'%}</a>
<a class="btn btn-primary" onclick="textoMultiVigente(this, true);" title="{% trans 'Texto Multivigente Integrado com Realce de Alterações'%}">{% trans 'TMI'%}</a>
<a class="btn btn-primary" onclick="textoMultiVigente(this, false); textoVigente(this, true);" title="{% trans 'Texto Vigente COM Links para Textos Alteradores'%}">{% trans 'TVL'%}</a>
<a class="btn btn-primary" onclick="textoVigente(this, false);" title="{% trans 'Texto Vigente'%}">{% trans 'TVT'%}</a>
</div>
</div>
{% include 'compilacao/text_list_bloco.html'%}
</div>

2
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"}]}}
{"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)"}
Loading…
Cancel
Save