Browse Source

Ajuste css e html do topo

pull/739/head^2
LeandroRoberto 8 years ago
parent
commit
c9d3bb1a96
  1. 65
      sapl/static/styles/app.scss
  2. 8
      sapl/templates/base.html

65
sapl/static/styles/app.scss

@ -6,25 +6,50 @@
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
float: none; float: none;
padding: 10px;
} }
nav { nav {
&.navbar { &.navbar {
padding: 5px;
border-radius: 0; border-radius: 0;
font-size: 15px; 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 { .masthead {
padding: 10px; padding: 10px;
.nav { .nav {
margin-top: 65px; clear:both;
} }
.navbar-brand { .navbar-brand {
color: $headings-color; color: $headings-color;
font-size: 24px; font-size: 24px;
img { img.img-responsive {
height: 95px;
margin-right: $navbar-padding-horizontal; margin-right: $navbar-padding-horizontal;
} }
small { small {
@ -88,6 +113,7 @@ h6, .h6 {
} }
} }
// #### CRUD DETAIL ######################################## // #### CRUD DETAIL ########################################
p.control-label { p.control-label {
font-weight: bold; font-weight: bold;
@ -386,3 +412,34 @@ p {
font-size: 100%; font-size: 100%;
} }
/* FIM TEMPLATE AJUDA */ /* 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;
}
}

8
sapl/templates/base.html

@ -42,7 +42,7 @@
</div> </div>
<div id="navbar" class="navbar-collapse collapse"> <div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="/" role="button" aria-haspopup="true" aria-expanded="false">Inicio<span class="caret"></span></a></li> <li><a href="/" role="button" aria-haspopup="true" aria-expanded="false">Inicio</a></li>
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Institucional <span class="caret"></span></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Institucional <span class="caret"></span></a>
@ -156,8 +156,8 @@
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="/">
<img height="95" width="95" src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% static 'img/logo.png' %}{% endif %}" <img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% static 'img/logo.png' %}{% endif %}"
alt="Logo" class="img-responsive visible-lg-inline-block vcenter" > alt="Logo" class="img-responsive visible-md-inline-block visible-lg-inline-block" >
<span class="vcenter"> <span class="vcenter">
{# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #}
{% if nome %} {% if nome %}
@ -278,6 +278,7 @@
<script type="text/javascript" src="{% static 'jquery/dist/jquery.min.js' %}"></script> <script type="text/javascript" src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'bootstrap-sass/assets/javascripts/bootstrap.min.js' %}"></script> <script type="text/javascript" src="{% static 'bootstrap-sass/assets/javascripts/bootstrap.min.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script> <script type="text/javascript" src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-ui/ui/i18n/datepicker-pt-BR.js' %}"></script> <script type="text/javascript" src="{% static 'jquery-ui/ui/i18n/datepicker-pt-BR.js' %}"></script>
@ -287,7 +288,6 @@
<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/checkbox.js' %}"></script>
<script type="text/javascript" src="{% static 'drunken-parrot-flat-ui/js/radio.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 src="{% static 'tinymce/tinymce.min.js' %}"></script>
<script type="text/javascript" src="{% static 'jsdiff/diff.min.js' %}"></script> <script type="text/javascript" src="{% static 'jsdiff/diff.min.js' %}"></script>

Loading…
Cancel
Save