Skip to content

Commit b70f345

Browse files
FindetonFindeton
authored
Merge pull request #29 from agoravoting/podemos-next
Podemos next
2 parents 92e8fb5 + 5d75814 commit b70f345

File tree

6 files changed

+255
-21
lines changed

6 files changed

+255
-21
lines changed

‎avUi/foot-directive/foot-directive.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container">
33
<div class="row">
44
<div
5-
class="col-md-2 col-md-offset-1"
5+
class="col-md-2 col-md-offset-3"
66
ng-if="!!contact.email||!!contact.sales||!!social.facebook||!!social.twitter||!!social.googleplus||!!social.youtube||!!social.github"
77
>
88
<h3 ng-i18next="avCommon.foot.contact">

‎dist/appCommon-v3.0.1.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ angular.module("jm.i18next").config([ "$i18nextProvider", "ConfigServiceProvider
10001000
$templateCache.put("avRegistration/success.html", '<div av-success><p ng-i18next="avRegistration.successRegistration"></p></div>'),
10011001
$templateCache.put("avUi/change-lang-directive/change-lang-directive.html", '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ deflang }} <span class="caret"></span></a><ul class="dropdown-menu" role="menu"><li ng-repeat="lang in langs"><a ng-click="changeLang(lang)">{{lang}}</a></li></ul>'),
10021002
$templateCache.put("avUi/documentation-directive/documentation-directive.html", '<div><h2 class="text-center text-av-secondary" ng-i18next="avDocumentation.documentation.title"></h2><p ng-i18next="avDocumentation.documentation.first_line"></p><ul><li ng-if="!!documentation.faq"><a href="{{documentation.faq}}" target="_blank" ng-i18next="avDocumentation.documentation.faq"></a></li><li ng-if="!!documentation.overview"><a href="{{documentation.overview}}" target="_blank" ng-i18next="avDocumentation.documentation.overview"></a></li><li><a href="{{auths_url}}" target="_blank" ng-i18next="avDocumentation.documentation.authorities"></a></li><li ng-if="!!documentation.technical"><a href="{{documentation.technical}}" target="_blank" ng-i18next="avDocumentation.documentation.technical"></a></li><li ng-if="!!documentation.security_contact"><a href="{{documentation.security_contact}}" target="_blank" ng-i18next="avDocumentation.documentation.security_contact"></a></li><li><a href="{{legal_url}}" target="_blank" ng-i18next="avDocumentation.legal.title"></a></li></ul><div class="documentation-html-include" ng-bind-html="documentation_html_include | addTargetBlank"></div></div>'),
1003-
$templateCache.put("avUi/foot-directive/foot-directive.html", '<div class="commonfoot"><div class="container"><div class="row"><div class="col-md-2 col-md-offset-1" ng-if="!!contact.email||!!contact.sales||!!social.facebook||!!social.twitter||!!social.googleplus||!!social.youtube||!!social.github"><h3 ng-i18next="avCommon.foot.contact"></h3><ul><li ng-if="!!contact.email"><a href="mailto:{{contact.email}}" ng-i18next="avCommon.foot.contactsupport"></a></li><li ng-if="!!contact.sales"><a href="mailto:{{contact.sales}}" ng-i18next="avCommon.foot.contactsales"></a></li></ul><!-- social links --><div class="social"><a href="{{social.facebook}}" ng-if="!!social.facebook"><i class="fa fa-fw fa-lg fa-facebook"></i></a> <a href="{{social.twitter}}" ng-if="!!social.twitter"><i class="fa fa-fw fa-lg fa-twitter"></i></a> <a href="{{social.googleplus}}" ng-if="!!social.googleplus"><i class="fa fa-fw fa-lg fa-google-plus"></i></a> <a href="{{social.youtube}}" ng-if="!!social.youtube"><i class="fa fa-fw fa-lg fa-youtube-play"></i></a> <a href="{{social.github}}" ng-if="!!social.github"><i class="fa fa-fw fa-lg fa-github"></i></a></div></div><div class="col-md-2" ng-if="!!technology.aboutus||!!technology.pricing||!!technology.overview||!!technology.solutions||!!technology.admin_manual"><h3 ng-i18next="avCommon.foot.technology"></h3><ul><li ng-if="!!technology.aboutus"><a href="{{technology.aboutus}}" ng-i18next="avCommon.foot.aboutus"></a></li><li ng-if="!!technology.pricing"><a href="{{technology.pricing}}" ng-i18next="avCommon.foot.pricing"></a></li><li ng-if="!!technology.overview"><a href="{{technology.overview}}" ng-i18next="avCommon.foot.technology"></a></li><li ng-if="!!technology.solutions"><a href="{{technology.solutions}}" ng-i18next="avCommon.foot.solutions"></a></li><li ng-if="!!technology.admin_manual"><a href="{{technology.admin_manual}}" ng-i18next="avCommon.foot.adminManual"></a></li></ul></div><div class="col-md-2" ng-if="!!legal.terms_of_service||!!legal.cookies||!!legal.privacy||!!legal.security_contact||!!legal.community_website"><h3 ng-i18next="avCommon.foot.legal"></h3><ul><li ng-if="!!legal.terms_of_service"><a href="{{legal.terms_of_service}}" ng-i18next="avCommon.foot.tos"></a></li><li ng-if="!!legal.cookies"><a href="{{legal.cookies}}" ng-i18next="avCommon.foot.cookies"></a></li><li ng-if="!!legal.privacy"><a href="{{legal.privacy}}" ng-i18next="avCommon.foot.privacy"></a></li><li ng-if="!!legal.security_contact"><a href="{{legal.security_contact}}" ng-i18next="avCommon.foot.securitycontact"></a></li><li ng-if="!!legal.community_website"><a target="_blank" href="{{legal.community_website}}" ng-i18next="avCommon.foot.communitywebsite"></a></li></ul></div></div></div></div>'),
1003+
$templateCache.put("avUi/foot-directive/foot-directive.html", '<div class="commonfoot"><div class="container"><div class="row"><div class="col-md-2 col-md-offset-3" ng-if="!!contact.email||!!contact.sales||!!social.facebook||!!social.twitter||!!social.googleplus||!!social.youtube||!!social.github"><h3 ng-i18next="avCommon.foot.contact"></h3><ul><li ng-if="!!contact.email"><a href="mailto:{{contact.email}}" ng-i18next="avCommon.foot.contactsupport"></a></li><li ng-if="!!contact.sales"><a href="mailto:{{contact.sales}}" ng-i18next="avCommon.foot.contactsales"></a></li></ul><!-- social links --><div class="social"><a href="{{social.facebook}}" ng-if="!!social.facebook"><i class="fa fa-fw fa-lg fa-facebook"></i></a> <a href="{{social.twitter}}" ng-if="!!social.twitter"><i class="fa fa-fw fa-lg fa-twitter"></i></a> <a href="{{social.googleplus}}" ng-if="!!social.googleplus"><i class="fa fa-fw fa-lg fa-google-plus"></i></a> <a href="{{social.youtube}}" ng-if="!!social.youtube"><i class="fa fa-fw fa-lg fa-youtube-play"></i></a> <a href="{{social.github}}" ng-if="!!social.github"><i class="fa fa-fw fa-lg fa-github"></i></a></div></div><div class="col-md-2" ng-if="!!technology.aboutus||!!technology.pricing||!!technology.overview||!!technology.solutions||!!technology.admin_manual"><h3 ng-i18next="avCommon.foot.technology"></h3><ul><li ng-if="!!technology.aboutus"><a href="{{technology.aboutus}}" ng-i18next="avCommon.foot.aboutus"></a></li><li ng-if="!!technology.pricing"><a href="{{technology.pricing}}" ng-i18next="avCommon.foot.pricing"></a></li><li ng-if="!!technology.overview"><a href="{{technology.overview}}" ng-i18next="avCommon.foot.technology"></a></li><li ng-if="!!technology.solutions"><a href="{{technology.solutions}}" ng-i18next="avCommon.foot.solutions"></a></li><li ng-if="!!technology.admin_manual"><a href="{{technology.admin_manual}}" ng-i18next="avCommon.foot.adminManual"></a></li></ul></div><div class="col-md-2" ng-if="!!legal.terms_of_service||!!legal.cookies||!!legal.privacy||!!legal.security_contact||!!legal.community_website"><h3 ng-i18next="avCommon.foot.legal"></h3><ul><li ng-if="!!legal.terms_of_service"><a href="{{legal.terms_of_service}}" ng-i18next="avCommon.foot.tos"></a></li><li ng-if="!!legal.cookies"><a href="{{legal.cookies}}" ng-i18next="avCommon.foot.cookies"></a></li><li ng-if="!!legal.privacy"><a href="{{legal.privacy}}" ng-i18next="avCommon.foot.privacy"></a></li><li ng-if="!!legal.security_contact"><a href="{{legal.security_contact}}" ng-i18next="avCommon.foot.securitycontact"></a></li><li ng-if="!!legal.community_website"><a target="_blank" href="{{legal.community_website}}" ng-i18next="avCommon.foot.communitywebsite"></a></li></ul></div></div></div></div>'),
10041004
$templateCache.put("avUi/simple-error-directive/simple-error-directive.html", '<div class="av-simple-error-title" ng-transclude></div>'),
10051005
$templateCache.put("test/test_booth_widget.html", '<!DOCTYPE html><html><head><title>Test frame</title><meta charset="UTF-8"></head><script>function getCastHmac(auth_data, callback) {\n callback("khmac:///sha-256;5e25a9af28a33d94b8c2c0edbc83d6d87355e45b93021c35a103821557ec7dc5/voter-1110-1dee0c135afeae29e208550e7258dab7b64fb008bc606fc326d41946ab8e773f:1415185712");\n }</script><body style="overflow-y: hidden; overflow-x: hidden; padding: 0; margin: 0"><div style="width: 100%; display: block; position: absolute; top: 0; bottom: 0; scroll: none; padding: 0; margin: 0"><a class="agoravoting-voting-booth" href="http://agora.dev/#/election/1110/vote" data-authorization-funcname="getCastHmac">Votar con Agora Voting</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://agora.dev/avWidgets.min.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","agoravoting-widgets-js");</script></div></body></html>'),
10061006
$templateCache.put("test/unit_test_e2e.html", '<div dynamic="html" id="dynamic-result"></div>');

‎dist/libCommon-v3.0.1.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8006,7 +8006,7 @@ function(window, angular, undefined) {
80068006
encode: valToString,
80078007
decode: valFromString,
80088008
is: regexpMatches,
8009-
pattern: /[^/]*/
8009+
pattern: /[^\/]*/
80108010
},
80118011
int: {
80128012
encode: valToString,
@@ -8053,7 +8053,7 @@ function(window, angular, undefined) {
80538053
decode: angular.fromJson,
80548054
is: angular.isObject,
80558055
equals: angular.equals,
8056-
pattern: /[^/]*/
8056+
pattern: /[^\/]*/
80578057
},
80588058
any: {
80598059
encode: angular.identity,

‎dist/themes/podemos/app.less

+125-8
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
/* Global Config */
2121
@av-primary: #612d62;
22-
@av-secondary: #78bbb1;
22+
@av-secondary: white;
2323
@av-primary-contrast: white;
24-
@av-secondary-contrast: white;
24+
@av-secondary-contrast: #78bbb1;
2525
@brand-primary: #612D62;
2626
@brand-success: #005c56;
2727
@brand-danger: #97c2b8;
@@ -38,6 +38,129 @@
3838

3939
// podemos custom
4040

41+
[av-ballot-locator-screen] {
42+
.btn-success {
43+
background-color: @brand-success !important;
44+
}
45+
46+
.btn-success:hover {
47+
background-color: darken(@brand-success, 12%) !important;
48+
}
49+
}
50+
51+
[avb-accordion-option] {
52+
&.selected.highlight-selected {
53+
color: @av-secondary !important;
54+
background-color: @av-primary !important;
55+
}
56+
}
57+
58+
[av-booth] {
59+
.btn-success {
60+
background-color: @brand-success !important;
61+
}
62+
63+
.btn-success:hover {
64+
background-color: darken(@brand-success, 12%) !important;
65+
}
66+
67+
.avb-top-navbar {
68+
.pull-left {
69+
a:hover {
70+
color: @av-secondary-contrast !important;
71+
}
72+
}
73+
74+
.pull-right {
75+
a:hover {
76+
color: @brand-success !important;
77+
}
78+
}
79+
}
80+
81+
a:hover {
82+
color: @brand-success;
83+
}
84+
}
85+
86+
[ave-default-election] .background, [ave-public-view] .background {
87+
background-color: @av-bg;
88+
89+
[ui-view] {
90+
.top-section {
91+
background-color: @av-secondary !important;
92+
color: black;
93+
94+
h3 {
95+
color: @av-primary;
96+
}
97+
}
98+
}
99+
}
100+
101+
[ave-default-election] .background.first, [ave-public-view] .background.first {
102+
background-color: @av-primary;
103+
}
104+
105+
[ave-default-election] .adminhead {
106+
a:hover {
107+
color: @brand-success !important;
108+
}
109+
110+
.powered-by .strong,
111+
div.row.avb-top-navbar div.pull-left span.ng-scope strong.ng-scope,
112+
div.row.avb-top-navbar div.text-center.ng-scope span strong.ng-scope {
113+
a {
114+
color: @av-secondary !important;
115+
}
116+
117+
a:hover {
118+
color: @av-secondary-contrast !important;
119+
}
120+
}
121+
}
122+
123+
[av-foot] .commonfoot > div > div > div > div > a > i:hover {
124+
color: @av-secondary-contrast !important;
125+
}
126+
127+
[av-foot] .commonfoot > div > div > div > ul > li > a:hover {
128+
color: @av-secondary-contrast !important;
129+
}
130+
131+
[ave-default-election] .background.first .top-section {
132+
color: @av-primary-contrast !important;
133+
}
134+
135+
[av-change-lang] {
136+
> a {
137+
color: @av-secondary !important;
138+
}
139+
140+
> a:hover, > a:active {
141+
color: @brand-success !important;
142+
}
143+
144+
.dropdown-menu li a {
145+
color: black !important;
146+
}
147+
148+
&:hover, &:active {
149+
a {
150+
color: black !important;
151+
}
152+
}
153+
}
154+
155+
[ave-default-election] {
156+
div.row.avb-top-navbar > div.pull-left > span > strong,
157+
.top-section > div > ul > li {
158+
&:hover > a {
159+
color: @av-secondary-contrast !important;
160+
}
161+
}
162+
}
163+
41164
[av-ballot-locator-screen] .navbar-unfixed-top h1, [av-booth] .navbar-unfixed-top h1 {
42165
margin-top: 17px;
43166
font-weight: 700;
@@ -86,9 +209,3 @@
86209
line-height: 1.1;
87210
color: inherit;
88211
}
89-
90-
@media (min-width: 1200px) {
91-
.container {
92-
width: 970px;
93-
}
94-
}

‎dist/themes/podemos/app.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎themes/podemos/app.less

+125-8
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
/* Global Config */
2121
@av-primary: #612d62;
22-
@av-secondary: #78bbb1;
22+
@av-secondary: white;
2323
@av-primary-contrast: white;
24-
@av-secondary-contrast: white;
24+
@av-secondary-contrast: #78bbb1;
2525
@brand-primary: #612D62;
2626
@brand-success: #005c56;
2727
@brand-danger: #97c2b8;
@@ -38,6 +38,129 @@
3838

3939
// podemos custom
4040

41+
[av-ballot-locator-screen] {
42+
.btn-success {
43+
background-color: @brand-success !important;
44+
}
45+
46+
.btn-success:hover {
47+
background-color: darken(@brand-success, 12%) !important;
48+
}
49+
}
50+
51+
[avb-accordion-option] {
52+
&.selected.highlight-selected {
53+
color: @av-secondary !important;
54+
background-color: @av-primary !important;
55+
}
56+
}
57+
58+
[av-booth] {
59+
.btn-success {
60+
background-color: @brand-success !important;
61+
}
62+
63+
.btn-success:hover {
64+
background-color: darken(@brand-success, 12%) !important;
65+
}
66+
67+
.avb-top-navbar {
68+
.pull-left {
69+
a:hover {
70+
color: @av-secondary-contrast !important;
71+
}
72+
}
73+
74+
.pull-right {
75+
a:hover {
76+
color: @brand-success !important;
77+
}
78+
}
79+
}
80+
81+
a:hover {
82+
color: @brand-success;
83+
}
84+
}
85+
86+
[ave-default-election] .background, [ave-public-view] .background {
87+
background-color: @av-bg;
88+
89+
[ui-view] {
90+
.top-section {
91+
background-color: @av-secondary !important;
92+
color: black;
93+
94+
h3 {
95+
color: @av-primary;
96+
}
97+
}
98+
}
99+
}
100+
101+
[ave-default-election] .background.first, [ave-public-view] .background.first {
102+
background-color: @av-primary;
103+
}
104+
105+
[ave-default-election] .adminhead {
106+
a:hover {
107+
color: @brand-success !important;
108+
}
109+
110+
.powered-by .strong,
111+
div.row.avb-top-navbar div.pull-left span.ng-scope strong.ng-scope,
112+
div.row.avb-top-navbar div.text-center.ng-scope span strong.ng-scope {
113+
a {
114+
color: @av-secondary !important;
115+
}
116+
117+
a:hover {
118+
color: @av-secondary-contrast !important;
119+
}
120+
}
121+
}
122+
123+
[av-foot] .commonfoot > div > div > div > div > a > i:hover {
124+
color: @av-secondary-contrast !important;
125+
}
126+
127+
[av-foot] .commonfoot > div > div > div > ul > li > a:hover {
128+
color: @av-secondary-contrast !important;
129+
}
130+
131+
[ave-default-election] .background.first .top-section {
132+
color: @av-primary-contrast !important;
133+
}
134+
135+
[av-change-lang] {
136+
> a {
137+
color: @av-secondary !important;
138+
}
139+
140+
> a:hover, > a:active {
141+
color: @brand-success !important;
142+
}
143+
144+
.dropdown-menu li a {
145+
color: black !important;
146+
}
147+
148+
&:hover, &:active {
149+
a {
150+
color: black !important;
151+
}
152+
}
153+
}
154+
155+
[ave-default-election] {
156+
div.row.avb-top-navbar > div.pull-left > span > strong,
157+
.top-section > div > ul > li {
158+
&:hover > a {
159+
color: @av-secondary-contrast !important;
160+
}
161+
}
162+
}
163+
41164
[av-ballot-locator-screen] .navbar-unfixed-top h1, [av-booth] .navbar-unfixed-top h1 {
42165
margin-top: 17px;
43166
font-weight: 700;
@@ -86,9 +209,3 @@
86209
line-height: 1.1;
87210
color: inherit;
88211
}
89-
90-
@media (min-width: 1200px) {
91-
.container {
92-
width: 970px;
93-
}
94-
}

0 commit comments

Comments
 (0)