Merge 16a801e into 8403dc5

plonegovbr · Dec 20, 2018 · dbf9ab8 · dbf9ab8
2 parents 8403dc5 + 16a801e
commit dbf9ab8
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 18 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,23 @@ Changelog
 2.0.2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Nothing changed yet.
+- Corrige resultado de busca no responsivo.
+  [agnogueira]
+
+- Corrige topo expansível no responsivo.
+  [agnogueira]
+
+- Corrige posts do liveblog no responsivo.
+  [agnogueira]
+
+- Ajustes de fontes no header e tiles.
+  [agnogueira]
+
+- Alterar margens das linhas da capa.
+  [agnogueira]
+
+- Corrige posicionamento do Em Alta (header expansível).
+  [agnogueira]
 
 
 2.0.1 (2018-12-07)

diff --git a/webpack/app/scss/_content.scss b/webpack/app/scss/_content.scss
@@ -133,7 +133,7 @@ p.nitfSubtitle {
   font-family: $main-font !important;
   border-bottom: 1px solid rgba(0, 0, 0, 0.1);
   border-top: 1px solid rgba(0, 0, 0, 0.1);
-  text-align: center;
+  text-align: left;
 }
 #content div.documentByLine {
   font-size: 0.75rem;

diff --git a/webpack/app/scss/_grid.scss b/webpack/app/scss/_grid.scss
@@ -124,7 +124,7 @@
   }
   div.row {
     width: 1176px !important; /* todo: utilizar variavel */
-    margin: 20px auto;
+    margin: $grid-gutter auto;
   }
   #content {
     margin: 0;

diff --git a/webpack/app/scss/_header.scss b/webpack/app/scss/_header.scss
@@ -468,12 +468,10 @@ header#main-header.busca-ativa {
   }
 }
 
-
-
 /********** Em Alta *************/
 .top-subjects {
   min-width: 860px;
-  margin: 100px auto 0;
+  margin: 135px auto 0;
   display: inline-block;
 
   h3 {

diff --git a/webpack/app/scss/_responsive.scss b/webpack/app/scss/_responsive.scss
@@ -38,7 +38,11 @@
     width: 100%;
   }
   .expandable-header-template #logo {
-    width: 70%;
+    width: 62%;
+    margin: 0;
+  }
+  .expandable-header-template #logo #portal-title, .expandable-header-template #logo h1 {
+    font-size: 1rem;
   }
   .expandable-header-template.section-pagina-inicial header #portal-searchbox {
     left: 0;
@@ -48,7 +52,7 @@
       max-width: 90%;
   }
   header#main-header {
-    padding: 0 20px;
+    padding: 0 12px;
   }
   .portaltype-document header.inverter,
   .portaltype-collective-nitf-content header.inverter {
@@ -288,6 +292,54 @@
     padding: 0 20px;
     box-sizing: border-box;
   }
+  /* busca */
+  #search-results-wrapper {
+    margin-left: 0 !important;
+  }
+  #search-results-bar {
+    width: 93%;
+    padding: 0;
+  }
+  .template-busca #content-core input[type=text] {
+    width: 80%;
+  }
+  .template-busca form .actionMenuHeader {
+    display: none;
+  }
+  #search-filter {
+    margin-left: 15px;
+  }
+  dl.searchResults {
+    padding: 10px;
+  }
+  /*liveblog */
+  .portaltype-liveblog #micro-updates article {
+    padding: 0;
+    margin-left: 0;
+    border-left: none;
+  }
+  .portaltype-liveblog .microupdate-byline p, .portaltype-liveblog .microupdate-text, 
+  .portaltype-liveblog .microupdate-title {
+    margin-left: 20px;
+  }
+  .portaltype-liveblog .microupdate-byline time {
+    position: relative;
+    top: 0;
+    width: auto;
+    left: 0;
+    display: inline;
+    background: transparent;
+  }
+  .portaltype-liveblog .microupdate-byline:after {
+    display: none;
+  }
+  .microupdate-byline p, .microupdate-date, .microupdate-time {
+    display: inline;
+    font-size: 0.8rem !important;
+  }
+  .portaltype-liveblog #micro-updates article:after {
+    margin: 30px 0 30px 20px;
+  }
 }
 
 /* Landscape phones and down */

diff --git a/webpack/app/scss/_tiles.scss b/webpack/app/scss/_tiles.scss
@@ -6,6 +6,7 @@
 .tile {
 	width: 100%;
     position: relative;
+    display: flex;
 
 	.tile-section {
 	  color: $main-color;
@@ -83,12 +84,6 @@ p.tile-description {
 	color: #fff !important;
 }
 
-.tile {
-    display: flex;
-    width: 100%;
-    margin-bottom: 12px;
-}
-
 /*inverte a cor dos icones sociais para o tile padrao */
 #content .tile-default .share,
 #content .tile-default .share {
@@ -99,7 +94,6 @@ p.tile-description {
     filter: none;
 }
 
-
 /* header com fio separador */
 .tile.fio-separador {
     margin-bottom: 2.4em;
@@ -108,8 +102,13 @@ p.tile-description {
     }
 }
 /* Texto rico */
-.cover-richtext-tile {
-
+#content .cover-richtext-tile {
+    h2 {
+        font-size: 1.5rem;
+    }
+    p {
+        font-size: 1rem;
+    }
 }
 
 /* tile NITF basico sem estilo */
@@ -477,7 +476,6 @@ p.tile-description {
     }
 }
 
-
 /*linha destacada */
 .portaltype-collective-cover-content #content div.row.linha-destacada {
     width: 100%!important;
@@ -636,6 +634,9 @@ p.tile-description {
             color: #fff !important;
         }
     }
+    p {
+        font-size: 0.875rem;
+    }
     p.tile-description {
         font-size: 1.375rem !important;
     }
@@ -687,6 +688,10 @@ header.inverter .search-wrapper {
   border-bottom: 1px solid hsla(0,0%,100%,.2);
 }
 
+.brasil-groupcarousel-tile h2 {
+    font-size: 1.5rem !important;
+}
+
 /* linha de fundo do header */
 .portaltype-collective-cover-content.template-view div.row.fundo-topo-escuro, 
 .portaltype-collective-cover-content.template-view div.row.fundo-topo-claro {