Merge branch 'master' into staging

Leonardo Merlin
2 parents 4e2a2c43 58eee6bc
Showing 4 changed files with 41 additions and 25 deletions Show diff stats
src/app/components/app-navbar/app-navbar.scss
src/app/pages/programas/programa.controller.js
src/app/pages/programas/programa.html
src/app/pages/programas/programas.scss
@@ -43,6 +43,11 @@
     .dropdown-menu {
         padding: 0;
+
+    }
+    .dropdown-toggle:active,
+    .dropdown-toggle:focus {
+        outline: 1px solid $defaultblue;
     }
     .navbar-nav {
@@ -157,7 +162,7 @@
             li.dropdown {
                 position: absolute;
                 right: 0;
-                bottom: 0;
+                bottom: 37px;
                 .dropdown-toggle {
                     position: relative;
@@ -115,7 +115,7 @@
             }
             // set focus at proposal, ASYNC
-            vm.$rootScope.findElAsyncAndFocus('.sub-section-' + proposal.id);
+            vm.$rootScope.findElAsyncAndFocus('.sub-section-' + proposal_id);
             // TODO: load and show proposal response
           }
@@ -230,7 +230,7 @@
             </div>
             <div ng-if="pagePrograma.proposalsTopRated">
                 <div ng-repeat="proposal in pagePrograma.proposalsTopRated">
-                    <div class="sub-section sub-section-{{::proposal.id}}">
+                    <div class="sub-section sub-section-{{::proposal.id}}" ng-class="{'sub-section-even': ( ($index+1) % 2 === 0), 'sub-section-odd': ( ($index+1) % 2 === 1)}">
                         <div class="container">
                             <div class="row">
                                 <div class="col-sm-4 col-md-3">
@@ -11,12 +11,34 @@
     .program-preview {
-        .program-preview--box {
+        &--box {
             position: relative;
             background-color: #f1f1f1;
         }
-        .program-preview--banner {
+        &--box--content-wrapper {
+            padding: 48px;
+            position: relative;
+            
+        }
+        &--archived {
+            .program-preview--box--content-wrapper {
+                text-align: right;
+                padding: 10px;
+
+                @media screen and (max-width: $screen-xs) {
+                    text-align: center;
+                    padding-top: 50px;
+                }
+            }
+
+            .program-preview--share {
+                margin-bottom: 0;
+            }
+        }
+
+
+        &--banner {
             width: 100%;
             height: 400px;
@@ -35,7 +57,7 @@
             }
         }
-        .program-preview--icon {
+        &--icon {
             $icon-size: 80px;
             $icon-scale: 0.7;
             position: absolute;
@@ -57,19 +79,14 @@
             }
         }
-        .program-preview--box--content-wrapper {
-            padding: 48px;
-            position: relative;
-        }
-
-        .program-preview--abstract {
+        &--abstract {
             h2 {
                 margin-top: 22px; // parent.margin + this.margin = 48 + 22 = 72px;
                 margin-bottom: 32px;
             }
         }
-        .program-preview--abstract-details {
+        &--abstract-details {
             p {
                 color: #484848;
                 font-size: 14px;
@@ -78,7 +95,7 @@
             }
         }
-        .program-preview--share {
+        &--share {
             margin-bottom: 20px;
             position: relative;
@@ -110,8 +127,8 @@
             }
         }
-        .program-preview--share-label,
-        .program-preview--share-directive {
+        &--share-label,
+        &--share-directive {
             display: inline-block;
             vertical-align: middle;
         }
@@ -262,15 +279,9 @@
         h3 {
             font-weight: bold;
         }
-        .sub-section{
-            &:nth-child(odd) {
-                background-color: #f1f1f1;
-            }
-            
-            &:nth-child(even) {
-                background-color: #ffffff;
-            }
-        }
+
+        .sub-section-odd {background-color: #f1f1f1; }
+        .sub-section-even {background-color: #ffffff; }
         .gov-response {
             background-color: #e1e1e1;
	@@ -115,7 +115,7 @@		@@ -115,7 +115,7 @@
115	}	115	}
116		116
117	// set focus at proposal, ASYNC	117	// set focus at proposal, ASYNC
118	- vm.$rootScope.findElAsyncAndFocus('.sub-section-' + proposal.id);	118	+ vm.$rootScope.findElAsyncAndFocus('.sub-section-' + proposal_id);
119		119
120	// TODO: load and show proposal response	120	// TODO: load and show proposal response
121	}	121	}
	@@ -230,7 +230,7 @@		@@ -230,7 +230,7 @@
230	</div>	230	</div>
231	<div ng-if="pagePrograma.proposalsTopRated">	231	<div ng-if="pagePrograma.proposalsTopRated">
232	<div ng-repeat="proposal in pagePrograma.proposalsTopRated">	232	<div ng-repeat="proposal in pagePrograma.proposalsTopRated">
233	- <div class="sub-section sub-section-{{::proposal.id}}">	233	+ <div class="sub-section sub-section-{{::proposal.id}}" ng-class="{'sub-section-even': ( ($index+1) % 2 === 0), 'sub-section-odd': ( ($index+1) % 2 === 1)}">
234	<div class="container">	234	<div class="container">
235	<div class="row">	235	<div class="row">
236	<div class="col-sm-4 col-md-3">	236	<div class="col-sm-4 col-md-3">