Colocando o primeiro link para ir para conteúdo

plonegovbr · May 13, 2015 · 8033373 · 8033373
1 parent a6e1de3
commit 8033373
Show file tree

Hide file tree

Showing 16 changed files with 155 additions and 96 deletions.
diff --git a/src/brasil/gov/temas/themes/amarelo/css/main.css b/src/brasil/gov/temas/themes/amarelo/css/main.css
@@ -309,8 +309,6 @@ div.position-10 { margin-left: -30.042%; }
     line-height: 1.1em;
 }
 
-#portal-title-1 { top: 30px; }
-
 #portal-description {
     bottom: 24px;
     text-transform: uppercase;

diff --git a/src/brasil/gov/temas/themes/amarelo/css/style.css b/src/brasil/gov/temas/themes/amarelo/css/style.css
@@ -25,7 +25,7 @@
    ========================================================================== */
 
 #header {
-    padding: 14px 0 0 0;
+    padding: 32px 0 0 0;
     background-color: #fbda43;
     /* Old browsers */
     background-color: #f8c60b;
@@ -45,9 +45,25 @@
     filter:progid: DXImageTransform.Microsoft.gradient( startColorstr="#fbda43", endColorstr="#f8c60b",GradientType=1);
 }
 
+/* Menu da Barra
+   ========================================================================== */
+
+div#wrapper-barra-brasil {
+    clear: both;
+    top: -18px;
+}
+
 /* Menu de Acessibilidade
    ========================================================================== */
 
+#accessibility-wrapper {
+    position: relative;
+    margin: 0 auto;
+    max-width: 960px;
+    font-size: 1.2em;
+    top: 47px;
+}
+
 #accessibility a {
     color: #03316f;
 }
@@ -63,6 +79,7 @@
 
 #portal-logo,
 #portal-title { color: #03316f !important; }
+#portal-title-1 { top: 12px; }
 
 /* Menu site actions - Acessibilidade, Alto Contraste, Mapa do site
    ========================================================================== */

diff --git a/src/brasil/gov/temas/themes/amarelo/index.html b/src/brasil/gov/temas/themes/amarelo/index.html
@@ -16,24 +16,8 @@
 </head>
 
 <body>
-
-    <div id="user">
-        <ul>
-            <li>
-                <a href="#" title="Login">Login</a>
-            </li>
-        </ul>
-    </div>
-
-    <div id="wrapper">
-
-        <!-- HEADER -->
-
-        <div id="header" role="banner">
-
-            <div>
-
-                <ul id="accessibility">
+<div id="accessibility-wrapper">
+            <ul id="accessibility">
                     <li>
                         <a accesskey="1" href="#acontent" id="link-conteudo">
                             Ir para o conte&uacute;do
@@ -80,6 +64,22 @@
                     <a href="#">Mapa do Site</a>
                 </li>
             </ul>
+</div>
+    <div id="user">
+        <ul>
+            <li>
+                <a href="#" title="Login">Login</a>
+            </li>
+        </ul>
+    </div>
+
+    <div id="wrapper">
+
+        <!-- HEADER -->
+
+        <div id="header" role="banner">
+
+            <div>
 
             <div id="logo">
                 <a href="#" title="#">

diff --git a/src/brasil/gov/temas/themes/amarelo/rules.xml b/src/brasil/gov/temas/themes/amarelo/rules.xml
@@ -15,11 +15,11 @@
     <xsl:output method="html"/>
 
     <rules css:if-content="#visual-portal-wrapper">
-        <prepend css:content="div#barra-identidade" css:theme="body" />
         <!--Plone.app.toolbar-->
         <append theme="/html/body" content="//div[@data-iframe='toolbar']" />
 
         <!--Head-->
+        <after css:theme="#accessibility-wrapper" css:content="div#barra-identidade" />
         <copy css:content="html" css:theme="html" attributes="lang dir" />
         <prepend css:content-children="head" css:theme="head" />
         <drop css:content="head link[rel='shortcut icon']" />
@@ -60,7 +60,6 @@
         <after css:content="#portal-languageselector" css:theme="#logo" />
         <replace css:theme="#voltar-topo" css:content="#voltar-topo" />
         <replace css:theme="#extra-footer" css:content="#extra-footer" />
-        <replace css:theme="#accessibility" css:content="#accessibility" />
         <drop css:content="#viewlet-below-content-body" />
 
         <!-- UL DE LíNGUAS

diff --git a/src/brasil/gov/temas/themes/azul/css/main.css b/src/brasil/gov/temas/themes/azul/css/main.css
@@ -309,8 +309,6 @@ div.position-10 { margin-left: -30.042%; }
     line-height: 1.1em;
 }
 
-#portal-title-1 { top: 30px; }
-
 #portal-description {
     bottom: 24px;
     text-transform: uppercase;

diff --git a/src/brasil/gov/temas/themes/azul/css/style.css b/src/brasil/gov/temas/themes/azul/css/style.css
@@ -25,11 +25,31 @@
    ========================================================================== */
 
 #header {
-    padding: 14px 0 0 0;
+    padding: 32px 0 0 0;
     background-color: #1659bf;
     color: #fff;
 }
 
+/* Menu da Barra
+   ========================================================================== */
+
+div#wrapper-barra-brasil {
+    clear: both;
+    top: -18px;
+}
+
+/* Menu de Acessibilidade
+   ========================================================================== */
+
+#accessibility-wrapper {
+    position: relative;
+    margin: 0 auto;
+    max-width: 960px;
+    font-size: 1.2em;
+    top: 47px;
+}
+
+
 /* Menu de Acessibilidade
    ========================================================================== */
 
@@ -47,6 +67,7 @@
 
 #portal-logo,
 #portal-title { color: #fff !important; }
+#portal-title-1 { top: 12px; }
 
 /* Menu site actions - Acessibilidade, Alto Contraste, Mapa do site
    ========================================================================== */

diff --git a/src/brasil/gov/temas/themes/azul/index.html b/src/brasil/gov/temas/themes/azul/index.html
@@ -16,24 +16,8 @@
 </head>
 
 <body>
-
-    <div id="user">
-        <ul>
-            <li>
-                <a href="#" title="Login">Login</a>
-            </li>
-        </ul>
-    </div>
-
-    <div id="wrapper">
-
-        <!-- HEADER -->
-
-        <div id="header" role="banner">
-
-            <div>
-
-                <ul id="accessibility">
+<div id="accessibility-wrapper">
+            <ul id="accessibility">
                     <li>
                         <a accesskey="1" href="#acontent" id="link-conteudo">
                             Ir para o conte&uacute;do
@@ -80,6 +64,25 @@
                     <a href="#">Mapa do Site</a>
                 </li>
             </ul>
+</div>
+
+    <div id="user">
+        <ul>
+            <li>
+                <a href="#" title="Login">Login</a>
+            </li>
+        </ul>
+    </div>
+
+    <div id="wrapper">
+
+        <!-- HEADER -->
+
+        <div id="header" role="banner">
+
+            <div>
+
+
 
             <div id="logo">
                 <a href="#" title="#">
@@ -434,9 +437,6 @@ <h3>Content subheading H3</h3>
             <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso">
                 <img src="img/acesso-a-infornacao.png" alt="Acesso a Informa&ccedil;&atilde;o" />
             </a>
-            <a href="http://www.brasil.gov.br/" class="logo-brasil">
-                <img src="img/brasil.png" alt="Brasil - Governo Federal" />
-            </a>
         </div>
     </div>
 </div>

diff --git a/src/brasil/gov/temas/themes/azul/rules.xml b/src/brasil/gov/temas/themes/azul/rules.xml
@@ -15,11 +15,11 @@
     <xsl:output method="html"/>
 
     <rules css:if-content="#visual-portal-wrapper">
-        <prepend css:content="div#barra-identidade" css:theme="body" />
         <!--Plone.app.toolbar-->
         <append theme="/html/body" content="//div[@data-iframe='toolbar']" />
 
         <!--Head-->
+        <after css:theme="#accessibility-wrapper" css:content="div#barra-identidade" />
         <copy css:content="html" css:theme="html" attributes="lang dir" />
         <prepend css:content-children="head" css:theme="head" />
         <drop css:content="head link[rel='shortcut icon']" />
@@ -60,7 +60,7 @@
         <after css:content="#portal-languageselector" css:theme="#logo" />
         <replace css:theme="#voltar-topo" css:content="#voltar-topo" />
         <replace css:theme="#extra-footer" css:content="#extra-footer" />
-        <replace css:theme="#accessibility" css:content="#accessibility" />
+	
         <drop css:content="#viewlet-below-content-body" />
 
         <!-- UL DE LíNGUAS

diff --git a/src/brasil/gov/temas/themes/branco/css/main.css b/src/brasil/gov/temas/themes/branco/css/main.css
@@ -309,8 +309,6 @@ div.position-10 { margin-left: -30.042%; }
     line-height: 1.1em;
 }
 
-#portal-title-1 { top: 30px; }
-
 #portal-description {
     bottom: 24px;
     text-transform: uppercase;

diff --git a/src/brasil/gov/temas/themes/branco/css/style.css b/src/brasil/gov/temas/themes/branco/css/style.css
@@ -25,14 +25,30 @@
    ========================================================================== */
 
 #header {
-    padding: 14px 0 0 0;
+    padding: 32px 0 0 0;
     background-color: #ebedf1;
     color: #2c66ce;
 }
 
+/* Menu da Barra
+   ========================================================================== */
+
+div#wrapper-barra-brasil {
+    clear: both;
+    top: -18px;
+}
+
 /* Menu de Acessibilidade
    ========================================================================== */
 
+#accessibility-wrapper {
+    position: relative;
+    margin: 0 auto;
+    max-width: 960px;
+    font-size: 1.2em;
+    top: 47px;
+}
+
 #accessibility a {
     color: #2c66ce;
 }
@@ -48,6 +64,7 @@
 
 #portal-logo,
 #portal-title { color: #2c66ce !important; }
+#portal-title-1 { top: 12px; }
 
 /* Menu site actions - Acessibilidade, Alto Contraste, Mapa do site
    ========================================================================== */

diff --git a/src/brasil/gov/temas/themes/branco/index.html b/src/brasil/gov/temas/themes/branco/index.html
@@ -16,24 +16,8 @@
 </head>
 
 <body>
-
-    <div id="user">
-        <ul>
-            <li>
-                <a href="#" title="Login">Login</a>
-            </li>
-        </ul>
-    </div>
-
-    <div id="wrapper">
-
-        <!-- HEADER -->
-
-        <div id="header" role="banner">
-
-            <div>
-
-                <ul id="accessibility">
+<div id="accessibility-wrapper">
+            <ul id="accessibility">
                     <li>
                         <a accesskey="1" href="#acontent" id="link-conteudo">
                             Ir para o conte&uacute;do
@@ -80,7 +64,22 @@
                     <a href="#">Mapa do Site</a>
                 </li>
             </ul>
+</div>
+    <div id="user">
+        <ul>
+            <li>
+                <a href="#" title="Login">Login</a>
+            </li>
+        </ul>
+    </div>
+
+    <div id="wrapper">
+
+        <!-- HEADER -->
+
+        <div id="header" role="banner">
 
+            <div>
             <div id="logo">
                 <a href="#" title="#">
                     <span id="portal-title">Portal Title</span>

diff --git a/src/brasil/gov/temas/themes/branco/rules.xml b/src/brasil/gov/temas/themes/branco/rules.xml
@@ -15,11 +15,11 @@
     <xsl:output method="html"/>
 
     <rules css:if-content="#visual-portal-wrapper">
-        <prepend css:content="div#barra-identidade" css:theme="body" />
         <!--Plone.app.toolbar-->
         <append theme="/html/body" content="//div[@data-iframe='toolbar']" />
 
         <!--Head-->
+        <after css:theme="#accessibility-wrapper" css:content="div#barra-identidade" />
         <copy css:content="html" css:theme="html" attributes="lang dir" />
         <prepend css:content-children="head" css:theme="head" />
         <drop css:content="head link[rel='shortcut icon']" />
@@ -60,7 +60,6 @@
         <after css:content="#portal-languageselector" css:theme="#logo" />
         <replace css:theme="#voltar-topo" css:content="#voltar-topo" />
         <replace css:theme="#extra-footer" css:content="#extra-footer" />
-        <replace css:theme="#accessibility" css:content="#accessibility" />
         <drop css:content="#viewlet-below-content-body" />
 
         <!-- UL DE LíNGUAS

diff --git a/src/brasil/gov/temas/themes/verde/css/main.css b/src/brasil/gov/temas/themes/verde/css/main.css
@@ -309,8 +309,6 @@ div.position-10 { margin-left: -30.042%; }
     line-height: 1.1em;
 }
 
-#portal-title-1 { top: 30px; }
-
 #portal-description {
     bottom: 24px;
     text-transform: uppercase;