Skip to content

Commit

Permalink
Merge 60e24f9 into 8403dc5
Browse files Browse the repository at this point in the history
  • Loading branch information
agnogueira committed Dec 18, 2018
2 parents 8403dc5 + 60e24f9 commit cc1239a
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 13 deletions.
2 changes: 1 addition & 1 deletion webpack/app/scss/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion webpack/app/scss/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
}
div.row {
width: 1176px !important; /* todo: utilizar variavel */
margin: 20px auto;
margin: $grid-gutter auto;
}
#content {
margin: 0;
Expand Down
56 changes: 54 additions & 2 deletions webpack/app/scss/_responsive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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 */
Expand Down
24 changes: 15 additions & 9 deletions webpack/app/scss/_tiles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.tile {
width: 100%;
position: relative;
display: flex;

.tile-section {
color: $main-color;
Expand Down Expand Up @@ -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 {
Expand All @@ -108,8 +103,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 */
Expand Down Expand Up @@ -477,7 +477,6 @@ p.tile-description {
}
}


/*linha destacada */
.portaltype-collective-cover-content #content div.row.linha-destacada {
width: 100%!important;
Expand Down Expand Up @@ -636,6 +635,9 @@ p.tile-description {
color: #fff !important;
}
}
p {
font-size: 0.875rem;
}
p.tile-description {
font-size: 1.375rem !important;
}
Expand Down Expand Up @@ -687,6 +689,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 {
Expand Down

0 comments on commit cc1239a

Please sign in to comment.