ILB
/
sigi
mirror of https://github.com/interlegis/sigi.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

mudanças css e base

pull/6/head
Eduardo Edson Batista Cordeiro Alves 9 years ago
committed by Luciano Almeida
parent
7617d1de74
commit
b260176457
8 changed files with 49 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      sigi/settings/base.py
  2. BIN
      sigiStatic/img/img_atendimento/favicon.ico
  3. BIN
      sigiStatic/img/img_atendimento/glyphicons-halflings-white.png
  4. BIN
      sigiStatic/img/img_atendimento/glyphicons-halflings.png
  5. BIN
      sigiStatic/img/img_atendimento/logo.png
  6. BIN
      sigiStatic/img/img_atendimento/logo_cc.jpg
  7. BIN
      sigiStatic/img/img_atendimento/logo_interlegis.jpg
  8. 32
      templates/base.html

17
sigi/settings/base.py
View File

@ -129,12 +129,6 @@ STATIC_URL = '/static/'
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'sigiStatic'), os.path.join(BASE_DIR, 'sigiStatic'),
) )
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'djangobower.finders.BowerFinder',
'sass_processor.finders.CssFinder',
)
SERVER_EMAIL = 'sigi@interlegis.leg.br' SERVER_EMAIL = 'sigi@interlegis.leg.br'
DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br'
@ -200,6 +194,17 @@ LOGGING = {
}, },
} }
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, "collected_static")
STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),)
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'djangobower.finders.BowerFinder',
'sass_processor.finders.CssFinder',
)
CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_TEMPLATE_PACK = 'bootstrap3'
CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3'
CRISPY_FAIL_SILENTLY = False CRISPY_FAIL_SILENTLY = False

BIN
sigiStatic/img/img_atendimento/favicon.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 975 B

BIN
sigiStatic/img/img_atendimento/glyphicons-halflings-white.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
sigiStatic/img/img_atendimento/glyphicons-halflings.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
sigiStatic/img/img_atendimento/logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
sigiStatic/img/img_atendimento/logo_cc.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
sigiStatic/img/img_atendimento/logo_interlegis.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

32
templates/base.html
View File

@ -6,12 +6,12 @@
<meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0"> <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0">
<title>Sistema de Atendimento</title> <title>Sistema de Atendimento</title>
{% block head_content %} {% block head_content %}
<link rel="icon" href="{% static 'img/favicon.ico' %}" type="image/png" > <link rel="icon" href="{% static 'img/img_atendimento/favicon.ico' %}" type="image/png" >
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="{% static 'css/bootstrap-fluid-adj.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap-fluid-adj.css' %}" rel="stylesheet">
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet" media="screen"> <link href="{% static 'bootstrap/css/bootstrap.min.css' %}" rel="stylesheet" media="screen">
<link href="{% static 'css/bootstrap-responsive.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap-responsive.css' %}" rel="stylesheet">
<link href="{% sass_src 'bootstrap-sass/assets/stylesheets/_bootstrap.scss' %}" rel="stylesheet"> <link href="{% static 'bootstrap-sass/assets/stylesheets/_bootstrap.css' %}" rel="stylesheet">
{% endblock head_content %} {% endblock head_content %}
</head> </head>
@ -19,14 +19,8 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <div class="nav-collapse">
<span class="icon-bar"></span> <ul class="nav navbar-nav pull-right">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="nav-collapse collapse">
<ul class="nav pull-right">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li class="dropdown"> <li class="dropdown">
<a href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ user.username }}<span class="caret"></span></a> <a href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ user.username }}<span class="caret"></span></a>
@ -41,13 +35,12 @@
<li><a href="{% url 'usuarios:login' %}">Login</a></li> <li><a href="{% url 'usuarios:login' %}">Login</a></li>
{% endif %} {% endif %}
</ul> </ul>
<ul class="nav"> <ul class="nav navbar-nav">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li><a href="{% url 'solicitacoes:solicitacao_list' %}">Solicitação</a></li> <li><a href="{% url 'servicos:solicitacao_list' %}">Solicitação</a></li>
<li><a href="{% url 'solicitacoes:sistema_list' %}">Sistema</a></li> <li><a href="{% url 'servicos:sistema_list' %}">Sistema</a></li>
<li><a href="{% url 'usuarios:usuario_list' %}">Habilitar</a></li> <li><a href="{% url 'usuarios:usuario_list' %}">Habilitar</a></li>
{% endif %} {% endif %}
<li><a href="">Contato</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -55,6 +48,7 @@
</div> </div>
{% endblock navigation %} {% endblock navigation %}
<body> <body>
{% block body_block %} {% block body_block %}
{# Header #} {# Header #}
@ -64,7 +58,7 @@
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<a href="/"> <a href="/">
<img align="left" height="120" width="120" src="{% static 'img/logo.png' %}" alt="Logo" class="img-responsive visible-lg-inline-block vcenter" > <img align="left" height="120" width="120" src="{% static 'img/img_atendimento/logo.png' %}" alt="Logo" class="img-responsive visible-lg-inline-block vcenter" >
<span class="vcenter" style="display:inline-block; color:black;" align="right"> <span class="vcenter" style="display:inline-block; color:black;" align="right">
<h2>Interlegis</h4><small><p>Sistema de Solicitação de Serviços</p></small> <h2>Interlegis</h4><small><p>Sistema de Solicitação de Serviços</p></small>
</span> </span>
@ -117,7 +111,7 @@
<script src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script> <script src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
<script src="{% static 'jquery-mask-plugin/dist/jquery.mask.js' %}"></script> <script src="{% static 'jquery-mask-plugin/dist/jquery.mask.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script> <script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/app.js' %}"></script> <script src="{% static 'js/app.js' %}"></script>
{% block extra_js %}{% endblock extra_js %} {% block extra_js %}{% endblock extra_js %}
{% endblock foot_js %} {% endblock foot_js %}
@ -130,7 +124,7 @@
<div class="row"> <div class="row">
<div style="float:left"> <div style="float:left">
<a class="footer__logo" href="#"> <a class="footer__logo" href="#">
<img src="{% static 'img/logo_interlegis.jpg' %}" alt="{% trans 'Logo do Interlegis' %} "> <img src="{% static 'img/img_atendimento/logo_interlegis.jpg' %}" alt="{% trans 'Logo do Interlegis' %} ">
</a> </a>
<p> <p>
<small> <small>
@ -140,7 +134,7 @@
</div> </div>
<div style="float:right"> <div style="float:right">
<a class="footer__logo" href=""> <a class="footer__logo" href="">
<img src="{% static 'img/logo_cc.jpg' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}"> <img src="{% static 'img/img_atendimento/logo_cc.jpg' %}" alt="{% trans 'Logo do Creative Commons BY SA' %}">
</a> </a>
<p> <p>
<small> <small>

Write Preview
Loading…
Cancel
Save