From 5215e1c410185bc052521af1c2ca6bbb94dea930 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@gmail.com>
Date: Mon, 7 Sep 2015 07:06:27 -0300
Subject: [PATCH] sync

---
 src/app/components/a11y-bar/a11y-bar.html                   |  6 +++---
 src/app/components/a11y-bar/a11y-bar.scss                   |  5 +++++
 src/app/components/breadcrumb/breadcrumb.scss               |  2 +-
 src/app/components/navbar/navbar.html                       |  9 +--------
 src/app/components/navbar/navbar.scss                       | 35 ++++++++++++++++++++++++++++-------
 src/app/components/proposal-carousel/proposal-carousel.html |  2 +-
 src/app/components/proposal-related/proposal-related.html   | 42 ++++++++++++++++++++++++++++++++++++++++--
 src/app/components/proposal-related/proposal-related.scss   | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 src/app/index.scss                                          |  2 +-
 src/app/pages/header/header.html                            |  2 +-
 src/app/pages/header/header.scss                            | 18 ++++--------------
 src/app/pages/inicio/inicio.html                            |  4 ++--
 src/app/pages/inicio/inicio.scss                            |  6 +++++-
 13 files changed, 139 insertions(+), 41 deletions(-)

diff --git a/src/app/components/a11y-bar/a11y-bar.html b/src/app/components/a11y-bar/a11y-bar.html
index 19bb99a..7565c9d 100644
--- a/src/app/components/a11y-bar/a11y-bar.html
+++ b/src/app/components/a11y-bar/a11y-bar.html
@@ -1,4 +1,4 @@
-<div class="a11y-bar">
+<div class="a11y-bar hidden-xs">
   <div class="container">
     <div class="row">
       <div class="col-sm-6">
@@ -21,12 +21,12 @@
               <span class="color-theme-common-bg">3</span>
             </a>
           </li>
-          <li>
+          <!-- <li>
             <a class="color-theme-common-fg" accesskey="4" href="#footer" id="skip-to-footer" ng-click="focusOn('#footer', $event)">
               Ir para o rodapé
               <span class="color-theme-common-bg">4</span>
             </a>
-          </li>
+          </li> -->
         </ul>
       </div>
 
diff --git a/src/app/components/a11y-bar/a11y-bar.scss b/src/app/components/a11y-bar/a11y-bar.scss
index b596e5b..41dd526 100644
--- a/src/app/components/a11y-bar/a11y-bar.scss
+++ b/src/app/components/a11y-bar/a11y-bar.scss
@@ -1,6 +1,11 @@
 .a11y-bar {
     font-size: 12px;
     padding: 5px 0;
+
+    @media (max-width: $screen-md) {
+        font-size: 11px;
+    }
+
     span {
         color: #fff;
         padding: 0 5px;
diff --git a/src/app/components/breadcrumb/breadcrumb.scss b/src/app/components/breadcrumb/breadcrumb.scss
index e9eacb3..9b6a39e 100644
--- a/src/app/components/breadcrumb/breadcrumb.scss
+++ b/src/app/components/breadcrumb/breadcrumb.scss
@@ -3,7 +3,7 @@
     .breadcrumb {
         background: none;
         padding: 0;
-        margin: 0;
+        margin: 10px 0;
     }
 
     .glyphicon {
diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html
index e505ae7..e95fd8b 100644
--- a/src/app/components/navbar/navbar.html
+++ b/src/app/components/navbar/navbar.html
@@ -20,8 +20,7 @@
         <li ui-sref-active="active"><a ui-sref="propostas">Propostas</a></li>
         <li ui-sref-active="active"><a ui-sref="ranking">Ranking</a></li>
         <li ui-sref-active="active"><a ui-sref="duvidas">Dúvidas</a></li>
-        <!-- <li ui-sref-active="active"><a ui-sref="respostas">Respostas</a></li> -->
-        <li role="separator" class="divider"><span>|</span></li>
+        <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span class="icon icon-social-share-small"></span></a>
           <ul class="dropdown-menu">
@@ -43,12 +42,6 @@
                 <span class="sr-only">Compartilhar no Google Plus</span>
               </a>
             </li>
-            <!-- <li>
-              <a href="whatsapp://send?text=http%3A%2F%2Fdialoga.gov.br" target="_blank" title="Compartilhar no WhatsApp">
-                <span class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
-                <span class="sr-only">Compartilhar no WhatsApp</span>
-              </a>
-            </li> -->
             <li>
               <a href="mailto:contato@dialoga.gov.br?subject=Conheça o Dialoga Brasil" title="Enviar por email">
                 <span class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss
index 7bb6beb..1581a6d 100644
--- a/src/app/components/navbar/navbar.scss
+++ b/src/app/components/navbar/navbar.scss
@@ -1,7 +1,6 @@
 .app-navbar {
 
     border-bottom: 2px solid #f1f1f1;
-    margin-bottom: 20px;
 
     .navbar {
         margin-bottom: 0;
@@ -12,13 +11,26 @@
         height: auto;
         padding-bottom: 0;
         padding-left: 0;
+
+        @media screen and (max-width: $screen-md) {
+            padding: 20px 0;
+            margin: 20px 0;
+        }
     }
 
     .navbar-toggle {
+        padding: 12px 10px;
         margin-top: 20px;
+        border-radius: 100%;
+        background-color: #5e749d;
 
         .icon-bar {
             height: 3px;
+            background-color: #fff;
+        }
+
+        @media screen and (max-width: $screen-md) {
+            margin-top: 45px;
         }
     }
 
@@ -27,7 +39,7 @@
         margin: 53px 10px 0 10px;
         display: block;
 
-        @media screen and (max-width: 768px) {
+        @media screen and (max-width: $screen-md) {
             display: none;
         }
     }
@@ -49,12 +61,16 @@
             .contraste & {
                 color: #fff;
             }
+
+            @media screen and (max-width: $screen-md) {
+                margin-top: 5px;
+            }
         }
 
         &.active > a {
             border-bottom: 3px solid #77BB34;
 
-            @media screen and (max-width: 768px) {
+            @media screen and (max-width: $screen-md) {
                 border: none;
                 background-color: #eee;
                 padding: 10px 0 10px 0px;
@@ -63,12 +79,21 @@
 
         .dropdown-toggle {
             margin-top: 50px;
+
+            @media screen and (max-width: $screen-md) {
+                margin-top: 0px;
+            }
         }
 
         .dropdown-menu {
             min-width: 200px;
             background-color: #eee;
             padding: 5px;
+            height: 47px;
+
+            &:after {
+                clear: both;
+            }
 
             li {
                 float: left;
@@ -95,10 +120,6 @@
         }
     }
 
-    .navbar-toggle .icon-bar {
-        background-color: #333;
-    }
-
     .contraste & {
         .nav > li > a:hover,
         .nav > li > a:focus {
diff --git a/src/app/components/proposal-carousel/proposal-carousel.html b/src/app/components/proposal-carousel/proposal-carousel.html
index 80bd5bc..bea3e81 100644
--- a/src/app/components/proposal-carousel/proposal-carousel.html
+++ b/src/app/components/proposal-carousel/proposal-carousel.html
@@ -1,6 +1,6 @@
 <div class="proposal-carousel">
   <div ng-if="vm.proposals">
-    <div class="proposal-carousel-top color-theme-bg">
+    <div class="proposal-carousel-top color-theme-bg-darker">
       <div class="proposal-carousel-position" ng-repeat="proposal in vm.proposals">
         <span ng-show="vm.activeIndex === $index">{{::($index+1)}}º</span>
         <span ng-show="vm.activeIndex === $index">Lugar</span>
diff --git a/src/app/components/proposal-related/proposal-related.html b/src/app/components/proposal-related/proposal-related.html
index f04764e..9a21e10 100644
--- a/src/app/components/proposal-related/proposal-related.html
+++ b/src/app/components/proposal-related/proposal-related.html
@@ -1,3 +1,41 @@
-<div class="proposal-related">
-  Proposta
+<div class="proposal-related" ng-class="{'focus':vm.isFocused}">
+  <div class="proposal-related--top">
+  	<div class="proposal-related--theme color-theme-bg-darker">[Nome do Tema]</div>
+  	<div class="proposal-related--program color-theme-bg">[Nome do Programa]</div>
+  </div>
+  <div class="proposal-related--middle">
+  	<div class="proposal-related--content">[Conteúdo ad proposta enviada]</div>
+  	<div class="proposal-related--actions">
+  		<div class="row">
+  			<div class="col-sm-4">
+  				<div class="action vote_for" title="Apoiar">
+  					<div class="icon-circle">
+  						<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
+  					</div>
+  					<div class="sr-only">Apoiar proposta</div>
+  				</div>
+  			</div>
+  			<div class="col-sm-4">
+  				<div class="action next" title="Pular proposta">
+  					<div class="icon-circle">
+  						<span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
+  					</div>
+  					<div class="sr-only">Pular proposta</div>
+  				</div>
+  			</div>
+  			<div class="col-sm-4">
+  				<div class="action vote_against" title="Não apoiar">
+  					<div class="icon-circle">
+  						<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+  					</div>
+  					<div class="sr-only">Não apoiar</div>
+  				</div>
+  			</div>
+  		</div>
+  	</div>
+  </div>
+  <div class="proposal-related--bottom">
+  	<div class="proposal-related--share">[SHARE]</div>
+  	<div class="proposal-related--ranking">[RANKING]</div>
+  </div>
 </div>
diff --git a/src/app/components/proposal-related/proposal-related.scss b/src/app/components/proposal-related/proposal-related.scss
index e69de29..38ab282 100644
--- a/src/app/components/proposal-related/proposal-related.scss
+++ b/src/app/components/proposal-related/proposal-related.scss
@@ -0,0 +1,47 @@
+.proposal-related {
+	background-color: #f1f1f1;
+	border-radius: 5px;
+	overflow: hidden;
+	
+	&.focus {
+		border: 7px solid #000;
+		border-radius: 12px;
+		border-color: #5E769C;
+	}
+
+	&--top {
+		color: #fff;
+		font-weight: bold;
+
+		border-top-left-radius: 5px;
+		border-top-right-radius: 5px;
+		overflow: hidden;
+	}
+
+	// &--middle {}
+	
+	&--bottom {
+		border-bottom-left-radius: 5px;
+		border-bottom-right-radius: 5px;
+		overflow: hidden;
+	}
+
+	&--theme {
+        padding: 10px 15px 5px 15px;
+	}
+
+	&--program {
+        padding: 20px 15px;
+	}
+
+	.glyphicon {
+		color: #fff;
+	}
+	.icon-circle {
+		cursor: pointer;
+
+		-webkit-box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.3);
+		box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.3);
+	}
+}
\ No newline at end of file
diff --git a/src/app/index.scss b/src/app/index.scss
index eef5d76..17cf114 100644
--- a/src/app/index.scss
+++ b/src/app/index.scss
@@ -178,7 +178,7 @@ body {
 .icon-circle-social-facebook {background-color: #537ab5; }
 .icon-circle-social-twitter {background-color: #77cbef; }
 .icon-circle-social-googleplus {background-color: #d23b00; }
-.icon-circle-social-whatsapp {background-color: #77cbef; }
+.icon-circle-social-whatsapp {background-color: #10ad08; }
 .icon-circle-social-youtube {background-color: #c63635; }
 .icon-circle-social-flickr {background-color: #eaeaea; }
 .icon-circle-mail {background-color: #ecb24e; }
diff --git a/src/app/pages/header/header.html b/src/app/pages/header/header.html
index f9c1dde..a8d8122 100644
--- a/src/app/pages/header/header.html
+++ b/src/app/pages/header/header.html
@@ -1,6 +1,6 @@
 <header id="header" class="container">
 
-  <div class="row">
+  <div class="row hidden-xs">
     <div class="col-sm-12">
       <auth-user></auth-user>
     </div>
diff --git a/src/app/pages/header/header.scss b/src/app/pages/header/header.scss
index e8d5424..ec552a0 100644
--- a/src/app/pages/header/header.scss
+++ b/src/app/pages/header/header.scss
@@ -1,16 +1,6 @@
-.accessibility-wrapper {
-    .icon-user {
-        display: inline-block;
-        vertical-align: middle;
-        width: 26px;
-        height: 26px;
-        border: 1px solid #ccc;
-        border-radius: 100%;
-        background-position: 1px 0px;
+#header {
 
-        .contraste & {
-            // XXX: chage for dinamic handler
-            background-position: -0px -24px;
-        }
+    @media (max-width: $screen-md) {
+        
     }
-}
+}
\ No newline at end of file
diff --git a/src/app/pages/inicio/inicio.html b/src/app/pages/inicio/inicio.html
index 096d145..5ab19a4 100644
--- a/src/app/pages/inicio/inicio.html
+++ b/src/app/pages/inicio/inicio.html
@@ -90,8 +90,8 @@
           </div>
           <div class="row">
             <div class="col-xs-6 col-sm-7 col-md-9">
-              <label for="articleQueryFilter" class="control-label sr-only">Filtrar programas:</label>
-              <input id="articleQueryFilter" type="search" class="form-control" ng-model="pageInicio.query" placeholder="Filtrar programas" aria-label="Filtrar programas" >
+              <label for="articleQueryFilter" class="control-label sr-only">Buscar programas:</label>
+              <input id="articleQueryFilter" type="search" class="form-control" ng-model="pageInicio.query" placeholder="Buscar programas" aria-label="Buscar programas" >
             </div>
           </div>
 
diff --git a/src/app/pages/inicio/inicio.scss b/src/app/pages/inicio/inicio.scss
index f88d2ed..d2baf04 100644
--- a/src/app/pages/inicio/inicio.scss
+++ b/src/app/pages/inicio/inicio.scss
@@ -1,5 +1,9 @@
 .page--inicio {
-    margin-top: 20px;
+    
+    .section-video {
+      padding: 20px 0;
+      // background-color: #919191;
+    }
 
     .section--articles {
 
--
libgit2 0.21.2