Merge 'master' into 706-refatorar-model-autor-tipoautor

sapl/static/styles/app.scss

@@ -50,7 +50,6 @@ nav {
     font-size: 24px;
     img.img-responsive {
       height: 95px;
-      width: 95px;
       margin-right: $navbar-padding-horizontal;
     }
     small {
@@ -415,35 +414,31 @@ p {
 /* FIM TEMPLATE AJUDA */
 
 @media (max-width: 1199px) {
-  /*.nav > li > a {
-      padding: $grid-gutter-width $grid-gutter-width / 3;
-  }*/
-
   .masthead {
-    .vcenter {
-      padding: 10px;
-    }
-    .nav {
-      margin-top: 65px;
-    }
     .navbar-brand {
-      color: $headings-color;
-      font-size: 20px;
+      font-size: 22px;
       img.img-responsive {
         height: 60px;
         width: 60px;
         margin-right: $navbar-padding-horizontal / 2;
       }
-      small {
-        color: #93A4AA;
-        font-size: 75%;
-        line-height: 25px;
-      }
     }
   }
+  .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;

sapl/templates/base.html

@@ -277,9 +277,6 @@
       <!-- Placed at the end of the document so the pages load faster -->
       <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 '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 'jquery-ui/jquery-ui.min.js' %}"></script>
       <script type="text/javascript" src="{% static 'jquery-ui/ui/i18n/datepicker-pt-BR.js' %}"></script>
@@ -287,7 +284,6 @@
       <script type="text/javascript" src="{% static 'js/jquery.runner.js' %}"></script>
       <script type="text/javascript" src="{% static 'jquery-mask-plugin/dist/jquery.mask.js' %}"></script>
 
-
       <script src="{% static 'tinymce/tinymce.min.js' %}"></script>
       <script type="text/javascript" src="{% static 'jsdiff/diff.min.js' %}"></script>