Merge Request #65
← To merge requests
From
create_var_lock_dir
into
spb-release/3.0
Commits (4)
-
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Gust Jaruga <darksshades@hotmail.com>
-
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
-
Changed all http to https Removed diazo drop css/screen Changed classes siteactions from header
1 participants
Showing
7 changed files
Show diff stats
colab/proxy/noosfero/diazo.xml
| @@ -10,7 +10,6 @@ | @@ -10,7 +10,6 @@ | ||
| 10 | 10 | ||
| 11 | <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" /> | 11 | <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" /> |
| 12 | <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" /> | 12 | <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" /> |
| 13 | - <drop css:theme="link[href^='/static/css/screen']" /> | ||
| 14 | <drop theme="/html/head/script" /> | 13 | <drop theme="/html/head/script" /> |
| 15 | <drop css:content="#barra-brasil" /> | 14 | <drop css:content="#barra-brasil" /> |
| 16 | <drop css:content="#user" /> | 15 | <drop css:content="#user" /> |
colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
| @@ -672,10 +672,6 @@ | @@ -672,10 +672,6 @@ | ||
| 672 | .colab-style .container:after { | 672 | .colab-style .container:after { |
| 673 | clear: both; | 673 | clear: both; |
| 674 | } | 674 | } |
| 675 | -.colab-style .row { | ||
| 676 | - margin-right: -15px; | ||
| 677 | - margin-left: -15px; | ||
| 678 | -} | ||
| 679 | .colab-style .row:before, | 675 | .colab-style .row:before, |
| 680 | .colab-style .row:after { | 676 | .colab-style .row:after { |
| 681 | display: table; | 677 | display: table; |
colab/static/css/footer.css
| 1 | /*Footer*/ | 1 | /*Footer*/ |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | -.footer-content{ | 4 | +.colab-footer-content{ |
| 5 | background: rgb(213,213,213); | 5 | background: rgb(213,213,213); |
| 6 | padding: 50px 0; | 6 | padding: 50px 0; |
| 7 | - font-family: 'open_sansregular', Arial, Helvetica, sans-serif; | 7 | + font-family: 'Open Sans Regular', Arial, Helvetica, sans-serif; |
| 8 | } | 8 | } |
| 9 | 9 | ||
| 10 | -.footer-links a{ | 10 | +.colab-footer-links a{ |
| 11 | color:#2c66ce; | 11 | color:#2c66ce; |
| 12 | font-size: 13px; | 12 | font-size: 13px; |
| 13 | line-height: 1.7em; | 13 | line-height: 1.7em; |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | -.footer-links a:hover{ | 16 | +.colab-footer-links a:hover{ |
| 17 | background: none; | 17 | background: none; |
| 18 | text-decoration: underline; | 18 | text-decoration: underline; |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | -.footer-links{ | 21 | +.colab-footer-links{ |
| 22 | color:#2c66ce; | 22 | color:#2c66ce; |
| 23 | border-left:1px dotted #2c66ce; | 23 | border-left:1px dotted #2c66ce; |
| 24 | margin-top: 10px; | 24 | margin-top: 10px; |
| 25 | margin-bottom: 10px; | 25 | margin-bottom: 10px; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | -.footer-links dt{ | 28 | +.colab-footer-links dt{ |
| 29 | font-size: 18px; | 29 | font-size: 18px; |
| 30 | font-weight: bold; | 30 | font-weight: bold; |
| 31 | line-height: 1.3em; | 31 | line-height: 1.3em; |
| 32 | margin-bottom: 8px; | 32 | margin-bottom: 8px; |
| 33 | - font-family: 'open_sansregular', Arial, Helvetica, sans-serif; | 33 | + font-family: 'Open Sans Regular', Arial, Helvetica, sans-serif; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | -.footer-links dd{ | 36 | +.colab-footer-links dd{ |
| 37 | padding-bottom: 3px | 37 | padding-bottom: 3px |
| 38 | } | 38 | } |
| 39 | 39 | ||
| @@ -65,6 +65,10 @@ | @@ -65,6 +65,10 @@ | ||
| 65 | padding-bottom: 10px; | 65 | padding-bottom: 10px; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | +.logo-sgpr img, .spb-definitions { | ||
| 69 | + display: none; | ||
| 70 | +} | ||
| 71 | + | ||
| 68 | .footer-gov .logo-brasil img{ | 72 | .footer-gov .logo-brasil img{ |
| 69 | padding-right: 0; | 73 | padding-right: 0; |
| 70 | } | 74 | } |
colab/static/css/header.css
| @@ -25,33 +25,33 @@ | @@ -25,33 +25,33 @@ | ||
| 25 | background-color: #2c66ce; | 25 | background-color: #2c66ce; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | -#portal-siteactions{ | 28 | +#colab-portal-siteactions{ |
| 29 | font-size: 10px; | 29 | font-size: 10px; |
| 30 | text-align: center; | 30 | text-align: center; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | -#portal-siteactions li{ | 33 | +#colab-portal-siteactions li{ |
| 34 | display: inline-block; | 34 | display: inline-block; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | -#portal-siteactions a { | 37 | +#colab-portal-siteactions a { |
| 38 | color:#2c66ce; | 38 | color:#2c66ce; |
| 39 | text-decoration: none; | 39 | text-decoration: none; |
| 40 | text-transform: uppercase; | 40 | text-transform: uppercase; |
| 41 | - font-family: 'open_sansregular', Arial, Helvetica, sans-serif; | 41 | + font-family: 'Open Sans Regular', Arial, Helvetica, sans-serif; |
| 42 | padding-right: 0; | 42 | padding-right: 0; |
| 43 | padding-left: 10px; | 43 | padding-left: 10px; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | -#portal-siteactions #siteaction-mapadosite a{ | 46 | +#colab-portal-siteactions #colab-siteaction-mapadosite a{ |
| 47 | padding-right: 0; | 47 | padding-right: 0; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | -#portal-siteactions a:hover { | 50 | +#colab-portal-siteactions a:hover { |
| 51 | color: #03316f; | 51 | color: #03316f; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | -#portal-siteactions span { | 54 | +#colab-portal-siteactions span { |
| 55 | border-bottom: 1px dotted #2c66ce; | 55 | border-bottom: 1px dotted #2c66ce; |
| 56 | } | 56 | } |
| 57 | 57 |
colab/templates/footer.html
| @@ -8,31 +8,31 @@ | @@ -8,31 +8,31 @@ | ||
| 8 | <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>Voltar ao topo</a> | 8 | <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>Voltar ao topo</a> |
| 9 | </div> | 9 | </div> |
| 10 | </div><!-- end go-top --> | 10 | </div><!-- end go-top --> |
| 11 | - <div class="col-lg-12 offset footer-content"> | 11 | + <div class="col-lg-12 offset colab-footer-content"> |
| 12 | <div class="container"> | 12 | <div class="container"> |
| 13 | <div class="row"> | 13 | <div class="row"> |
| 14 | - <dl class="col-md-2 col-md-offset-1 footer-links"> | 14 | + <dl class="col-md-2 col-md-offset-1 colab-footer-links"> |
| 15 | <dt>Assuntos</dt> | 15 | <dt>Assuntos</dt> |
| 16 | <dd><a href="/social/spb/publique-seu-software" title="Publique seu software">Publique seu software</a></dd> | 16 | <dd><a href="/social/spb/publique-seu-software" title="Publique seu software">Publique seu software</a></dd> |
| 17 | <dd><a href="http://www.softwarepublico.gov.br/mpv/" title="Prestadores de serviço">Prestadores de serviço</a></dd> | 17 | <dd><a href="http://www.softwarepublico.gov.br/mpv/" title="Prestadores de serviço">Prestadores de serviço</a></dd> |
| 18 | <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="Espaço dos municípios">Espaço dos municípios</a></dd> | 18 | <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="Espaço dos municípios">Espaço dos municípios</a></dd> |
| 19 | </dl> | 19 | </dl> |
| 20 | - <dl class="col-md-2 footer-links"> | 20 | + <dl class="col-md-2 colab-footer-links"> |
| 21 | <dt>Software Público</dt> | 21 | <dt>Software Público</dt> |
| 22 | - <dd class="portalspb-item"> | 22 | + <dd class="colab-portalspb-item"> |
| 23 | <a title="Entenda o que é" href="/social/spb/entenda-o-que-e">Entenda o que é</a> | 23 | <a title="Entenda o que é" href="/social/spb/entenda-o-que-e">Entenda o que é</a> |
| 24 | </dd> | 24 | </dd> |
| 25 | - <dd class="portalspb-item"> | 25 | + <dd class="colab-portalspb-item"> |
| 26 | <a title="Eventos" href="/social/profile/spb/events">Eventos</a> | 26 | <a title="Eventos" href="/social/profile/spb/events">Eventos</a> |
| 27 | </dd> | 27 | </dd> |
| 28 | - <dd class="portalspb-item"> | 28 | + <dd class="colab-portalspb-item"> |
| 29 | <a title="Prêmios" href="/social/spb/premios">Prêmios</a> | 29 | <a title="Prêmios" href="/social/spb/premios">Prêmios</a> |
| 30 | </dd> | 30 | </dd> |
| 31 | - <dd class="portalspb-item"> | 31 | + <dd class="colab-portalspb-item"> |
| 32 | <a title="Publicações" href="/social/spb/publicacoes">Publicações</a> | 32 | <a title="Publicações" href="/social/spb/publicacoes">Publicações</a> |
| 33 | </dd> | 33 | </dd> |
| 34 | </dl> | 34 | </dl> |
| 35 | - <dl class="col-md-2 footer-links"> | 35 | + <dl class="col-md-2 colab-footer-links"> |
| 36 | <dt>Serviços</dt> | 36 | <dt>Serviços</dt> |
| 37 | <dd> | 37 | <dd> |
| 38 | <a href="/social/spb/ajuda#faq" title="FAQ">FAQ</a> | 38 | <a href="/social/spb/ajuda#faq" title="FAQ">FAQ</a> |
| @@ -44,12 +44,12 @@ | @@ -44,12 +44,12 @@ | ||
| 44 | <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" title="Relatar erros">Relatar erros</a> | 44 | <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" title="Relatar erros">Relatar erros</a> |
| 45 | </dd> | 45 | </dd> |
| 46 | </dl> | 46 | </dl> |
| 47 | - <dl class="col-md-2 footer-links"> | 47 | + <dl class="col-md-2 colab-footer-links"> |
| 48 | <dt>RSS</dt> | 48 | <dt>RSS</dt> |
| 49 | <dd><a href="/social/spb/rss/o-que-e" title="O que é?">O que é</a></dd> | 49 | <dd><a href="/social/spb/rss/o-que-e" title="O que é?">O que é</a></dd> |
| 50 | <dd><a href="/rss/colab/latest" title="Assine">Assine</a></dd> | 50 | <dd><a href="/rss/colab/latest" title="Assine">Assine</a></dd> |
| 51 | </dl> | 51 | </dl> |
| 52 | - <dl class="col-md-2 footer-links"> | 52 | + <dl class="col-md-2 colab-footer-links"> |
| 53 | <dt>Navegação</dt> | 53 | <dt>Navegação</dt> |
| 54 | <dd><a href="/social/spb/acessibilidade">Acessibilidade</a></dd> | 54 | <dd><a href="/social/spb/acessibilidade">Acessibilidade</a></dd> |
| 55 | <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd> | 55 | <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd> |
colab/templates/header.html
| @@ -5,9 +5,9 @@ | @@ -5,9 +5,9 @@ | ||
| 5 | <div class="navbar navbar-static-top"> | 5 | <div class="navbar navbar-static-top"> |
| 6 | <!-- begin of barra-brasil --> | 6 | <!-- begin of barra-brasil --> |
| 7 | <div id="barra-brasil"> | 7 | <div id="barra-brasil"> |
| 8 | - <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a> | 8 | + <a href="https://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a> |
| 9 | </div> | 9 | </div> |
| 10 | -<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script> | 10 | +<script src="https://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script> |
| 11 | <!-- end of barra-brasil --> | 11 | <!-- end of barra-brasil --> |
| 12 | <div id="first-nav"> | 12 | <div id="first-nav"> |
| 13 | <div class="container"> | 13 | <div class="container"> |
| @@ -26,14 +26,14 @@ | @@ -26,14 +26,14 @@ | ||
| 26 | <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a> | 26 | <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a> |
| 27 | </li> | 27 | </li> |
| 28 | </ul> <!-- end of accesskeys --> | 28 | </ul> <!-- end of accesskeys --> |
| 29 | - <ul id="portal-siteactions" class="nav navbar-nav navbar-right"> | ||
| 30 | - <li id="siteaction-accessibility"> | 29 | + <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right"> |
| 30 | + <li id="colab-siteaction-accessibility"> | ||
| 31 | <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a> | 31 | <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a> |
| 32 | </li> | 32 | </li> |
| 33 | - <li id="siteaction-contraste"> | 33 | + <li id="colab-siteaction-contraste"> |
| 34 | <a href="#"><span>Alto Contraste</span></a> | 34 | <a href="#"><span>Alto Contraste</span></a> |
| 35 | </li> | 35 | </li> |
| 36 | - <li id="siteaction-mapadosite"> | 36 | + <li id="colab-siteaction-mapadosite"> |
| 37 | <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a> | 37 | <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a> |
| 38 | </li> | 38 | </li> |
| 39 | <!-- begin of user-menu --> | 39 | <!-- begin of user-menu --> |
setup.py
| @@ -32,7 +32,7 @@ REQUIREMENTS = [ | @@ -32,7 +32,7 @@ REQUIREMENTS = [ | ||
| 32 | 32 | ||
| 33 | # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9 | 33 | # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9 |
| 34 | 'django-browserid==0.11', | 34 | 'django-browserid==0.11', |
| 35 | - 'django-revproxy==0.9.2', | 35 | + 'django-revproxy==0.9.3', |
| 36 | 36 | ||
| 37 | # Converse.js (XMPP client) | 37 | # Converse.js (XMPP client) |
| 38 | 'django-conversejs==0.3.4', | 38 | 'django-conversejs==0.3.4', |