Merge branch 'fix-header'

Leonardo Merlin
2 parents 9607936d 78e385e0
Showing 2 changed files with 7 additions and 2 deletions Show diff stats
src/app/components/app-navbar/app-navbar.scss
src/app/pages/programas/programa.controller.js
@@ -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
           }
...	...	@@ -43,6 +43,11 @@
43	43
44	44	.dropdown-menu {
45	45	padding: 0;
	46	+
	47	+ }
	48	+ .dropdown-toggle:active,
	49	+ .dropdown-toggle:focus {
	50	+ outline: 1px solid $defaultblue;
46	51	}
47	52
48	53	.navbar-nav {
...	...	@@ -157,7 +162,7 @@
157	162	li.dropdown {
158	163	position: absolute;
159	164	right: 0;
160		- bottom: 0;
	165	+ bottom: 37px;
161	166
162	167	.dropdown-toggle {
163	168	position: relative;
...	...
...	...	@@ -115,7 +115,7 @@
115	115	}
116	116
117	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	120	// TODO: load and show proposal response
121	121	}
...	...