Merge branch 'master' of https://github.com/ciudadanointeligente/vota…

…inteligente-portal-electoral into candideitorg-integration Conflicts: elections/static/css/main.css elections/templates/base.html elections/templates/elections/election_base.html
ciudadanointeligente · Sep 11, 2013 · afa9d16 · afa9d16
2 parents 01bafea + 9719eaf
commit afa9d16
Show file tree

Hide file tree

Showing 6 changed files with 524 additions and 38 deletions.
diff --git a/elections/static/css/main.css b/elections/static/css/main.css
@@ -9,91 +9,137 @@ html, body {
 	color: #323a45;
 	height: 100%;
 	-webkit-font-smoothing: antialiased;
+	font-family: 'Lato', sans-serif;
+}
+
+h1 {
+	font-family: 'Lato', sans-serif;
+	font-weight: 300;
+}
+
+a {
+	color: #14b9d5;
+}
+
+a:hover {
+	color: #0e778a;
+	text-decoration: none;
 }
 
 /*Menu*/
 
-.list-inline>li {
+.navbar-inverse .navbar-nav>li>a {
+	color: #FFF;
+}
+
+.navbar-inverse .navbar-nav>li>a:hover {
+	color: #14b9d5;
+}
+
+/*Menu Interno*/
+
+.nav-candidator .list-inline>li {
 	padding: 0px;
 	margin-left: -4px;
+	height: 39px;
 }
 
-.list-inline>li a {
+.nav-candidator .list-inline>li a {
 	background: #FFF;
 	border-right: 3px solid #eaedf2;
 	padding: 10px;
+	color: #9fa7b4;
+	text-decoration: none;
 }
 
-.list-inline>li:first-child a {
+.nav-candidator .list-inline>li:first-child a {
 	border-left: 3px solid #eaedf2;
 }
 
-.list-inline>li.active a, .list-inline>li:hover a {
+.nav-candidator .list-inline>li.active a, .nav-candidator .list-inline>li:hover a {
 	background: #5e6d82;
 	color: #FFF;
+	position: relative;
 }
 
-.list-inline>li.active a {
-	color: #FFF;
+.nav-candidator .list-inline>li.active a:after {
+	top: 100%;
+	border: solid transparent;
+	content: " ";
+	height: 0;
+	width: 0;
+	position: absolute;
+	pointer-events: none;
 }
 
-.list-inline>li a {
-	color: #9fa7b4;
-	text-decoration: none;
+.nav-candidator .list-inline>li.active a:after {
+	border-color: rgba(94, 109, 130, 0);
+	border-top-color: #5e6d82;
+	border-width: 8px;
+	left: 50%;
+	margin-left: -8px;
 }
 
-ul.list-inline {
+.nav-candidator ul.list-inline {
 	margin-bottom: 0px;
-	padding: 8px;
+	padding: 9px;
+	background: #fff;
+	height: 37px;
 }
 
 .nav-candidator {
-	background-color: #FFF;
 	text-align: center;
-	margin-bottom: 15px;
+	margin-bottom: 17px;
 }
 
 .navbar-inverse {
 	color: #FFF;
 	background-color: #323a45;
 }
 
-.list-inline i.icon-group, .list-inline i.icon-edit {
+.nav-candidator .list-inline i.icon-group, .nav-candidator .list-inline i.icon-edit {
 	color: #14b9d5;
 }
 
-.list-inline i.icon-heart {
+.nav-candidator .list-inline i.icon-heart {
 	color: #fe635f;
 }
 
-.list-inline i.icon-list {
+.nav-candidator .list-inline i.icon-list, .nav-candidator .list-inline i.icon-info {
 	color: #3ee0cb;
 }
 
-.list-inline i.icon-bolt, .list-inline i.icon-trophy {
+.nav-candidator .list-inline i.icon-bolt, .nav-candidator .list-inline i.icon-trophy {
 	color: #ffd200;
 }
 
 /*
 profile
 */
+
 .profile-candidate {
-	padding: 10px;
 	background-color: #5e6d82;
 	color: #FFF;
-	max-height: 250px;
 	overflow: hidden;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
+	min-height: 210px;
 }
+
 .img-profile {
 	padding-bottom: 5px;
 }
+
 .social-link-candidate {
 	color: #FFF;
 }
 
+.container-candidates p {
+	background: #fff;
+	padding: 5px;
+}
+
 .questionary .panel-heading {
 	background-color: #323a45;
 	color: #FFF;
@@ -110,17 +156,6 @@ profile
 .question {
 	font-weight: bold;
 }
-/*
-eof profile
-*/
-/*
-#wrapper {
-	min-height: 100%;
-	height: auto !important;
-	height: 100%;
-	margin: 0 auto -60px;
-}
-*/
 
 /*face-to-face*/
 .progress-bar .fondo {
@@ -144,6 +179,35 @@ eof profile
 	background-color: #323a45;
 }
 
+
+/*Perfil candidato*/
+
+.container-profile {
+	background: #5e6d82;
+	border-radius: 6px;
+	color: #fff;
+	padding: 20px 20px 0 20px;
+	margin: auto;
+}
+
+.container-profile h3 {
+	margin-top: 0;
+}
+
+.read-more a, .read-less a {
+	display: block;
+	background: #323a45;
+	text-align: center;
+	font-size: 14px;
+	border-radius: 0px 0px 6px 6px;
+	margin: 0px -20px;
+}
+
+.antecedentes p {
+	margin: 0;
+}
+
+
 @media (max-width: 480px) {
 	/* menu */
 	.list-inline>li {