Merge branch 'merlin' into staging

Leonardo Merlin
2 parents d237f551 d82ec79d
Showing 5 changed files with 41 additions and 3 deletions Show diff stats
.nvmrc
src/app/components/social-share/social-share.html
src/app/content-hack.scss
src/app/layout.scss
src/app/pages/programas/programa.html
@@ -0,0 +1 @@
+v0.12.7
@@ -3,12 +3,13 @@
 </div>
 <ul class="social-share list-inline">
   <li>
-      <!-- socialshare-via="687948707977695" -->
+      <!-- socialshare-via="687948707977695" dialoga -->
+      <!-- socialshare-via="476168325877872" MyApp / Test -->
     <a href="#" role="button"
       socialshare
       socialshare-provider="facebook"
       socialshare-type="feed"
-      socialshare-via="476168325877872"
+      socialshare-via="687948707977695"
       socialshare-url="http://dialoga.gov.br"
       socialshare-redirect-uri="https://dialoga.gov.br/"
       socialshare-media="http://dialoga.gov.br/images/logo.png"
@@ -0,0 +1,15 @@
+.pac-cidades-historicas {
+    .grid {
+        .box-content {
+            padding: 20px;
+
+            ul > li {
+                padding-left: 10px;
+            }
+        }
+
+        .col-sm-height {
+            border: 10px solid #fff;
+        }
+    }
+}
@@ -250,6 +250,7 @@ ul.list-color li:before {
  
 .destaque-bg-cinza {
   background-color: #F1F1F1;
+  color: #484848;
 }
  
 .destaque-padding {
@@ -319,6 +320,11 @@ a.link-black {
 }
  
 blockquote {
+  border-left: medium none;
+  font-size: 140%;
+  padding: 45px 0 0 45px;
+  position: relative;
+  margin: 0px;
   border-left: none;
   font-size: 24px;
   line-height: 28px;
@@ -347,6 +353,21 @@ blockquote {
   }
 }
  
+blockquote p {
+  font-size: 140%!important;
+  line-height: normal!important;
+}
+
+// .cultura blockquote::before {
+//   color: #cd999b;
+// }
+// Sobreescreve a classe do bootstrap
+.close {
+  color: white;
+  opacity: 1;
+  font-weight: normal;
+}
+
 .top-border-theme {
   @each $category,
   $color in $categories {
@@ -206,7 +206,7 @@
     </section>
  
     <section class="section-content">
-      <article class="program-content" ng-if="pagePrograma.article">
+      <article class="program-content" ng-if="pagePrograma.article" ng-class="pagePrograma.article.slug">
           <div ng-bind-html="pagePrograma.article.bodyTrusted"></div>
       </article>
     </section>
...	...	@@ -3,12 +3,13 @@
3	3	</div>
4	4	<ul class="social-share list-inline">
5	5	<li>
6		- <!-- socialshare-via="687948707977695" -->
	6	+ <!-- socialshare-via="687948707977695" dialoga -->
	7	+ <!-- socialshare-via="476168325877872" MyApp / Test -->
7	8	<a href="#" role="button"
8	9	socialshare
9	10	socialshare-provider="facebook"
10	11	socialshare-type="feed"
11		- socialshare-via="476168325877872"
	12	+ socialshare-via="687948707977695"
12	13	socialshare-url="http://dialoga.gov.br"
13	14	socialshare-redirect-uri="https://dialoga.gov.br/"
14	15	socialshare-media="http://dialoga.gov.br/images/logo.png"
...	...
...	...	@@ -0,0 +1,15 @@
	1	+.pac-cidades-historicas {
	2	+ .grid {
	3	+ .box-content {
	4	+ padding: 20px;
	5	+
	6	+ ul > li {
	7	+ padding-left: 10px;
	8	+ }
	9	+ }
	10	+
	11	+ .col-sm-height {
	12	+ border: 10px solid #fff;
	13	+ }
	14	+ }
	15	+}
...	...
...	...	@@ -250,6 +250,7 @@ ul.list-color li:before {
250	250
251	251	.destaque-bg-cinza {
252	252	background-color: #F1F1F1;
	253	+ color: #484848;
253	254	}
254	255
255	256	.destaque-padding {
...	...	@@ -319,6 +320,11 @@ a.link-black {
319	320	}
320	321
321	322	blockquote {
	323	+ border-left: medium none;
	324	+ font-size: 140%;
	325	+ padding: 45px 0 0 45px;
	326	+ position: relative;
	327	+ margin: 0px;
322	328	border-left: none;
323	329	font-size: 24px;
324	330	line-height: 28px;
...	...	@@ -347,6 +353,21 @@ blockquote {
347	353	}
348	354	}
349	355
	356	+blockquote p {
	357	+ font-size: 140%!important;
	358	+ line-height: normal!important;
	359	+}
	360	+
	361	+// .cultura blockquote::before {
	362	+// color: #cd999b;
	363	+// }
	364	+// Sobreescreve a classe do bootstrap
	365	+.close {
	366	+ color: white;
	367	+ opacity: 1;
	368	+ font-weight: normal;
	369	+}
	370	+
350	371	.top-border-theme {
351	372	@each $category,
352	373	$color in $categories {
...	...
...	...	@@ -206,7 +206,7 @@
206	206	</section>
207	207
208	208	<section class="section-content">
209		- <article class="program-content" ng-if="pagePrograma.article">
	209	+ <article class="program-content" ng-if="pagePrograma.article" ng-class="pagePrograma.article.slug">
210	210	<div ng-bind-html="pagePrograma.article.bodyTrusted"></div>
211	211	</article>
212	212	</section>
...	...