Skip to content

Commit 7b79f96

Browse files
FindetonFindeton
authored
Merge pull request #27 from agoravoting/neutral-theme
Neutral theme
2 parents fd35704 + 288d840 commit 7b79f96

File tree

14 files changed

+74
-28
lines changed

14 files changed

+74
-28
lines changed

‎avRegistration/login-directive/login-directive.less

+8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
display: block;
1616
min-height: 38px;
1717
}
18+
19+
.btn-success {
20+
background-color: @av-primary-contrast;
21+
}
22+
23+
.btn-success:hover {
24+
background-color: darken(@av-secondary-contrast, 25%);
25+
}
1826
}
1927

2028
.form-horizontal {

‎avUi/change-lang-directive/change-lang-directive.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
padding-left: 8px;
44

55
&:hover {
6-
background-color: #3E5771;
6+
background-color: @av-primary-contrast;
77
}
88

99
> a:hover {

‎dist/avConfig-v3.0.1.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* in this same file, which you might want to edit and tune if needed.
2121
*/
2222

23-
var AV_CONFIG_VERSION = '3.0.1';
23+
var AV_CONFIG_VERSION = '3.3.0';
2424

2525
var avConfigData = {
2626
// the base url path for ajax requests, for example for sending ballots or

‎dist/less/avUi/change-lang-directive/change-lang-directive.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
padding-left: 8px;
44

55
&:hover {
6-
background-color: #3E5771;
6+
background-color: @av-primary-contrast;
77
}
88

99
> a:hover {

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

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

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

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

‎dist/themes/default/app.less

+24-5
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
@import "../../external.less";
1919

2020
/* Global Config */
21-
@av-primary: #2C3E50;
22-
@av-secondary: #00A489;
23-
@av-primary-contrast: white;
24-
@av-secondary-contrast: white;
21+
@av-primary: #FFFFFF;
22+
@av-secondary: #444444;
23+
@av-primary-contrast: #959292;
24+
@av-secondary-contrast: #007B67;
2525
@brand-primary: @av-primary;
2626
@brand-success: @av-secondary;
2727
@link-color: @av-secondary;
28-
@text-success: @av-secondary;
28+
@text-success: @av-secondary-contrast;
2929
@state-success-text: @av-secondary;
3030

3131

@@ -43,4 +43,23 @@
4343
[ave-default-election] .background .top-section,
4444
[ave-public-view] .background .top-section {
4545
color: #333;
46+
}
47+
48+
[av-booth] {
49+
.navbar, .navbar-unfixed-top, .busy-gui, .avb-content, .start-screen {
50+
color: @av-secondary;
51+
}
52+
}
53+
54+
.modal-dialog .modal-header h4 {
55+
color: @av-primary;
56+
}
57+
58+
.btn-success {
59+
border: 0;
60+
background-color: @av-primary-contrast;
61+
}
62+
63+
.btn-success:hover {
64+
background-color: darken(@av-primary-contrast, 25%);
4665
}

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

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

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

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

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

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

‎dist/themes/test/app.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
/* Global Config */
2121
@av-primary: #ff0000;
2222
@av-secondary: #ff0000;
23-
@av-primary-contrast: #00fff;
24-
@av-secondary-contrast: #00fff;
23+
@av-primary-contrast: #00ffff;
24+
@av-secondary-contrast: #00ffff;
2525
@brand-primary: #ff0000;
2626
@brand-success: #00ff00;
2727
@brand-danger: #000000;

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

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

‎themes/default/app.less

+24-5
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
@import "../../external.less";
1919

2020
/* Global Config */
21-
@av-primary: #2C3E50;
22-
@av-secondary: #00A489;
23-
@av-primary-contrast: white;
24-
@av-secondary-contrast: white;
21+
@av-primary: #FFFFFF;
22+
@av-secondary: #444444;
23+
@av-primary-contrast: #959292;
24+
@av-secondary-contrast: #007B67;
2525
@brand-primary: @av-primary;
2626
@brand-success: @av-secondary;
2727
@link-color: @av-secondary;
28-
@text-success: @av-secondary;
28+
@text-success: @av-secondary-contrast;
2929
@state-success-text: @av-secondary;
3030

3131

@@ -43,4 +43,23 @@
4343
[ave-default-election] .background .top-section,
4444
[ave-public-view] .background .top-section {
4545
color: #333;
46+
}
47+
48+
[av-booth] {
49+
.navbar, .navbar-unfixed-top, .busy-gui, .avb-content, .start-screen {
50+
color: @av-secondary;
51+
}
52+
}
53+
54+
.modal-dialog .modal-header h4 {
55+
color: @av-primary;
56+
}
57+
58+
.btn-success {
59+
border: 0;
60+
background-color: @av-primary-contrast;
61+
}
62+
63+
.btn-success:hover {
64+
background-color: darken(@av-primary-contrast, 25%);
4665
}

‎themes/test/app.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
/* Global Config */
2121
@av-primary: #ff0000;
2222
@av-secondary: #ff0000;
23-
@av-primary-contrast: #00fff;
24-
@av-secondary-contrast: #00fff;
23+
@av-primary-contrast: #00ffff;
24+
@av-secondary-contrast: #00ffff;
2525
@brand-primary: #ff0000;
2626
@brand-success: #00ff00;
2727
@brand-danger: #000000;

0 commit comments

Comments
 (0)