Merge branch 'master' into staging

Matheus Machado Monteiro - SUPDE/DEDES/DEDS1
2 parents ee53bebd 2bfeaf43
Showing 3 changed files with 22 additions and 4 deletions Show diff stats
src/app/pages/inicio/inicio.html
src/app/pages/inicio/inicio.scss
src/assets/images/banner_home_2.png
@@ -61,7 +61,10 @@
                     </div>
                 </div>
                 <div class="col-md-4" ng-show="pageInicio.bannerRespostas">
-                    <div class="banner-respostas banner-respostas--background-pink">
+                    <div class="banner-respostas">
+                        <img class="banner-respostas--logo banner-respostas--logo-small img-responsive banner-responsive" src="/assets/images/banner_home_2.png" alt="O governo federal segue  dialogando com a sociedade. Você fez sua parte mandando participando com propostas para melhorar o país e o governo respondeu. Confira aqui o resultado!">
+                    </div>
+                    <!-- <div class="banner-respostas banner-respostas--background-pink">
                         <a ui-sref="respostas" class="banner-respostas--link-top">
                             <span class="img-banner">
                                 <img class="banner-respostas--logo banner-respostas--logo-small" src="/assets/images/marca_banner2.png" alt="Logo Dialoga Brasil"/>
@@ -74,7 +77,7 @@
                         <div class="teste vertical-align">
                             <a ui-sref="respostas" class="banner-respostas--banner2--link-bottom">CONFIRA AQUI O RESULTADO!</a>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>
@@ -132,7 +132,7 @@
     width: 100%;
     $bannerHeight: 338px;
     $bannerBottomHeight: 40px;
-   
+
     .img-banner {
         display: block;
         text-align: center;
@@ -145,7 +145,22 @@
     .text-bold {
         font-weight: bold;
     }
-    
+
+    .banner-responsive {
+
+        width: inherit;
+        height: inherit;
+
+        @media(max-width:991px) {
+            width: 50%;
+            margin: 0 auto;
+        }
+
+        @media(max-width:768px) {
+            width: inherit;
+        }
+    }
+
     .teste {
         display: block;
         height: 35px;
	@@ -132,7 +132,7 @@		@@ -132,7 +132,7 @@
132	width: 100%;	132	width: 100%;
133	$bannerHeight: 338px;	133	$bannerHeight: 338px;
134	$bannerBottomHeight: 40px;	134	$bannerBottomHeight: 40px;
135	-	135	+
136	.img-banner {	136	.img-banner {
137	display: block;	137	display: block;
138	text-align: center;	138	text-align: center;
	@@ -145,7 +145,22 @@		@@ -145,7 +145,22 @@
145	.text-bold {	145	.text-bold {
146	font-weight: bold;	146	font-weight: bold;
147	}	147	}
148	-	148	+
		149	+ .banner-responsive {
		150	+
		151	+ width: inherit;
		152	+ height: inherit;
		153	+
		154	+ @media(max-width:991px) {
		155	+ width: 50%;
		156	+ margin: 0 auto;
		157	+ }
		158	+
		159	+ @media(max-width:768px) {
		160	+ width: inherit;
		161	+ }
		162	+ }
		163	+
149	.teste {	164	.teste {
150	display: block;	165	display: block;
151	height: 35px;	166	height: 35px;