Skip to content

Commit

Permalink
Merge 8201828 into 9ff09a7
Browse files Browse the repository at this point in the history
  • Loading branch information
@agnogueira
agnogueira committed Jul 30, 2018
2 parents 9ff09a7 + 8201828 commit b0b4666
Show file tree
Hide file tree
Showing 15 changed files with 398 additions and 68 deletions.
12 changes: 12 additions & 0 deletions CHANGES.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ Changelog

2.0a7 (unreleased)

- Novos estilos para os tiles
[agnogueira]

- Adiciona template adicional ao diazo para variação do header
[agnogueira]

- Remove duplicidade de ID nos icones de redes sociais
[agnogueira]

- Utiliza logos do rodapé a partir da barra
[agnogueira]

- Adiciona novas variações da fonte principal.
[agnogueira]

Expand Down
224 changes: 224 additions & 0 deletions webpack/app/index-minimalista.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<!DOCTYPE html>
<html lang="pt-br">
<head>
<meta charset="utf-8">
<title>IDG 2.0</title>
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<link rel="apple-touch-icon" sizes="180x180" href="<%= htmlWebpackPlugin.options.publicPath %>favicons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="<%= htmlWebpackPlugin.options.publicPath %>favicons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="<%= htmlWebpackPlugin.options.publicPath %>favicons/favicon-16x16.png">
<link rel="manifest" href="<%= htmlWebpackPlugin.options.publicPath %>favicons/manifest.json">
<link rel="mask-icon" href="<%= htmlWebpackPlugin.options.publicPath %>favicons/safari-pinned-tab.svg" color="#00a300">
<meta name="msapplication-config" content="<%= htmlWebpackPlugin.options.publicPath %>favicons/browserconfig.xml">
<meta name="theme-color" content="#00a300">
</head>
<body>
<p class="hiddenStructure">
<a accesskey="2" href="#conteudo">Skip to content.</a> |
<a accesskey="3" href="#main-navigation">Skip to navigation</a>
</p>
<!-- User -->
<div id="user">
<ul>
<li><a href="#" title="Login">Login</a></li>
</ul>
</div>
<!-- Header -->
<header id="main-header" class="inverter">
<div class="header-wrapper">
<div class="header-icons">
<a class="ico-navegacao">Navegação</a>
<a class="ico-busca">Busca</a>
</div>
<div id="logo">
<a id="portal-logo" title="Todas as informações sobre a Presidência da República do Brasil e as atividades diárias do presidente Michel Temer." href="http://www2.planalto.gov.br">
<span id="portal-title-1">Governo do</span>
<h1 id="portal-title" class="corto">Brasil</h1>
<span id="portal-description">portal do governo brasileiro</span>
</a>
</div>

<div class="header-accessibility">
<ul>
<li><a href="#" class="link-contraste">Alto Contraste</a></li>
<li><a href="http://www.vlibras.gov.br/" class="link-vlibras">Vlibras</a></li>
</ul>
<ul id="language" class="hidden">
<li class="language-es">
<a href="#">Espa&#241;ol</a>
</li>
<li class="language-en">
<a href="#">English</a>
</li>
</ul>
</div>

</div>

<!-- Main Menu -->
<div class="navigation-wrapper">

<div class="navigation-content">

<nav id="main-navigation" class="navigation-cell">
<ul class="list-navigation">
<li><a href="#" title="Link name">Notícias</a></li>
<li><a href="#" title="Link name">FAQ</a></li>
<li><a href="#" title="Link name">Trabalhador</a></li>
<li><a href="#" title="Link name">Empregador</a></li>
<li><a href="#" title="Link name">Vídeos</a></li>
<li><a href="#" title="Link name">Leia na Íntegra</a></li>
</ul>
<div class="navigation-redes navigation-cell">
<h4>Redes Sociais</h4>
<ul></ul>

</div>
</nav>

</div>
</div>

<!-- Search -->
<div class="busca-expandida">
<div id="search" role="search">
<h2>O que você está procurando?</h2>
<form>
<div class="LSBox">
<input name="SearchableText" type="text" size="18" title="Buscar no Site" placeholder="Buscar no Site" accesskey="4" class="searchField" id="searchGadget" autocomplete="off"><input class="searchButton" type="submit" value="Buscar">
<div class="LSResult" id="LSResult" style="display: none;">
<div class="LSShadow" id="LSShadow"></div>
</div>
</div>
</form>
</div>
</div>

</header>

<div id="portal-breadcrumbs" class="inverter">

<span id="breadcrumbs-you-are-here">Você está aqui:</span>
<span id="breadcrumbs-home">
<a href="http://45.32.162.149">Página Inicial</a>
<span class="breadcrumbSeparator">
/
</span>
</span>
<span id="breadcrumbs-1" dir="ltr">
<a href="http://45.32.162.149/faq">Pagina 1</a>
<span class="breadcrumbSeparator">
/
</span>
</span>
<span id="breadcrumbs-2" dir="ltr">
<a href="http://45.32.162.149/faq/trabalhador">Pagina 2</a>
<span class="breadcrumbSeparator">
/
</span>
</span>
<span id="breadcrumbs-3" dir="ltr">
<span id="breadcrumbs-current">Página 3</span>
</span>
</div>


<div class="video"></div>

<div id="wrapper">


<!-- Columns -->


<div id="main">
<aside id="column-one">
<div class="visualPadding">
<div class="portlet">Coluna 1</div>
</div>
</aside>

<main id="main-content" role="main">
<div>
<p class="section">Nome da seção</p>
<h1>Tema básico para a nova versão do Portal Padrão IDG 2.0</h1>
<div property="rnews:description" class="documentDescription">Novo tema para a versão 2.0 da Identidade Digital do Governo Federal. O novo tema é muito mais simples e fácil de customizar</div>
<div class="documentByLine" id="plone-document-byline">

<span class="documentAuthor">
por Governo do Brasil
—
</span>

<span class="documentModified">
<span>última modificação</span>
<span property="rnews:dateModified">20/11/2017 15h29</span>
</span>

<span class="contentHistory" id="content-history">
—
<a href="http://45.32.162.149/noticias/as-vantagens-da-modernizacao-regulamentacao-direitos-preservados-e-mais-seguranca-para-todos/@@historyview" rel="#pb_4" class="link-overlay" style="cursor: pointer;">Histórico</a>
</span>

</div>
<p>Este é um tema muito simples e enxuto para o <a href="#">Plone</a> para ser utilizado nas instalações padrão da Identidade Digital do Governo Federal. </p>
<h2>HTML</h2>
<p>Ao invez de utilizar diversos divs o tema utiliza várias tags padrão do HTML 5</p>
<h2>Styles</h2>
<p>Todos os estilos são definidos em um arquivo SCSS único, comum para todos os temas existentes. Cada tema possui apenas um simples arquivo de configuração de váriaveis, que altera toda a aparencia do portal.</p>
<h3>Grid</h3>
<p>Este tema utiliza FLEX para a criação de grids extremamente simples em lugares como cabeçalho, footer e nas colunas principais.</p>
<p>Alem disso este tema implementa os estilos grid básico do Bootstrap 3.0, permitindo a utilização do portal com 12 colunas ao invez do tradicional grid de 16 colunas do Plone </p>

<h3>Responsivo?</h3>
<p>Sim</p>
<h2>Estilos básicos para formatação</h2>
<h1>h1. Heading 1</h1>
<h2>h2. Heading 2</h2>
<h3>h3. Heading 3</h3>
<h4>h4. Heading 4</h4>
<h5>h5. Heading 5</h5>
<h6>h6. Heading 6</h6>
</div>
</main>
<aside id="column-two">
<div class="visualPadding">
<div class="portlet">Coluna 2</div>
</div>
</aside>
</div>
<div class="conteudo-relacionado"></div>

<footer id="portal-footer">
<div class="footer-wrapper">

<div class="colunas-rodape">
<div class="coluna-redes">
<h3>Redes sociais</h3>
<ul>
<li><a class="ico-facebook" href="https://www.facebook.com/governodobrasil/">Facebook</a></li>
<li><a class="ico-twitter" href="https://twitter.com/governodobrasil">Twitter</a></li>
<li><a class="ico-instagram" href="http://instagram.com/governodobrasil">Instagram</a></li>
</ul>
</div>
<div class="coluna-menu">
<ul class="rodape-navigation">
<li>icone1</li>
<li>icone2</li>
<li>icone3</li>
<li>icone4</li>
<li>icone5</li>
<li>icone6</li>
</ul>
</div>
</div>

<div class="clear"></div>
</div>
<div id="footer-brasil"></div>
</footer>

</div>
<div id="barra_brasil_js"></div>
</body>
</html>
16 changes: 3 additions & 13 deletions webpack/app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ul>
</div>
<!-- Header -->
<header id="main-header" role="banner" class="inverter">
<header id="main-header" class="inverter">
<div class="header-wrapper">
<div id="logo">
<a id="portal-logo" title="Todas as informações sobre a Presidência da República do Brasil e as atividades diárias do presidente Michel Temer." href="http://www2.planalto.gov.br">
Expand Down Expand Up @@ -83,7 +83,7 @@ <h2>O que você está procurando?</h2>

<div class="navigation-content">

<nav id="main-navigation" role="navigation" class="navigation-cell">
<nav id="main-navigation" class="navigation-cell">
<ul class="list-navigation">
<li><a href="#" title="Link name">Notícias</a></li>
<li><a href="#" title="Link name">FAQ</a></li>
Expand Down Expand Up @@ -219,21 +219,11 @@ <h3>Redes sociais</h3>
<li>icone6</li>
</ul>
</div>
<div class="coluna-governo">
<ul>
<li class="logo-governo">
<a href="#">Governo Federal</a>
</li>
<li class="logo-acesso">
<a href="#">Acesso à Informação</a>
</li>
</ul>
</div>
</div>


<div class="clear"></div>
</div>
<div id="footer-brasil"></div>
</footer>

</div>
Expand Down
1 change: 1 addition & 0 deletions webpack/app/padrao/brasilgovtemas.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $main-font: 'Raleway', sans-serif;
$main-fontsize: 1rem;
$main-width: 100%;
$main-color: #2969bd;
$secondary-color: #06acff;
$coluna-1: 300px;
$coluna-2: 300px;
$grid-gutter: 10px;
Expand Down
Binary file removed webpack/app/padrao/sprite/ai.png
View file
Binary file not shown.
Binary file removed webpack/app/padrao/sprite/gg.png
View file
Binary file not shown.
Binary file added webpack/app/padrao/sprite/multimidia.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added webpack/app/padrao/sprite/vinculada.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions webpack/app/rules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
xmlns:str="http://exslt.org/strings"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

<theme href="index-minimalista.html" css:if-content=".minimalista" />
<theme href="index.html" css:if-content="#visual-portal-wrapper" />
<notheme if-path="source_editor.htm" />
<notheme if-path="@@manage-viewlets" />
Expand All @@ -31,7 +32,7 @@
<drop css:content=".searchSection" />
<replace css:content="#portal-searchbox" css:theme="#search" />
<drop css:content="#portaltab-index_html" />
<copy css:content="#portal-redes" css:theme=".navigation-redes ul" />
<replace css:content=".portal-redes" css:theme=".navigation-redes ul" />
<replace css:content="#portal-services" css:theme=".links-destaque ul" />


Expand Down Expand Up @@ -103,7 +104,7 @@
<!-- UL DE LíNGUAS -->

<!--Footer -->
<copy css:content="#portal-redes" css:theme=".coluna-redes ul" />
<replace css:content=".portal-redes" css:theme=".coluna-redes ul" />
<append css:theme="body" css:content="#plone-analytics" />

<!-- Columns -->
Expand Down

0 comments on commit b0b4666

Please sign in to comment.