Skip to content

Commit c4029cd

Browse files
FindetonFindeton
authored
Booth redesign (#282)
Parent issue: https://github.com/sequentech/voting-booth/issues/304
1 parent f9719db commit c4029cd

File tree

90 files changed

+2824
-1671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2824
-1671
lines changed

‎Gruntfile.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,8 @@ module.exports = function (grunt) {
276276
dest: 'dist/themes/fonts/'
277277
},
278278
{
279-
expand: true,
280-
cwd: 'node_modules/bootstrap/fonts/',
281-
src: ['**'],
282-
dest: 'dist/themes/fonts/'
279+
src: ['fonts/Manrope-VariableFont_wght.ttf'],
280+
dest: 'dist/fonts/Manrope-VariableFont_wght.ttf'
283281
},
284282
{
285283
expand: true,

‎SequentThemes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
SequentThemes.current = 'default';
2121

2222
SequentThemes.change = function(theme) {
23-
var base = $("#theme").get('base');
23+
var base = $("#theme")[0].getAttribute('data-base');
2424
$("#theme").attr("href", base + "themes/"+theme+"/app.min.css");
2525
};
2626
}).call(this);

‎app.less

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
@import "avUi/simple-error-directive/simple-error-directive.less";
4242
@import "avUi/children-elections-directive/children-elections-directive.less";
4343
@import "avUi/change-lang-directive/change-lang-directive.less";
44+
@import "avUi/common-footer-directive/common-footer-directive.less";
45+
@import "avUi/common-header-directive/common-header-directive.less";
4446
@import "avUi/foot-directive/foot-directive.less";
4547
@import "avUi/documentation-directive/documentation-directive.less";
4648

‎avRegistration/field-directive/field-directive.less

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[avr-field] {
2+
.form-group {
3+
margin-right: unset;
4+
margin-left: unset;
5+
}
6+
}

‎avRegistration/fields/bool-field-directive/bool-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="form-group">
2-
<label class="control-label col-sm-4">
2+
<label>
33
<input
44
type="checkbox"
55
class="form-control"
@@ -10,7 +10,7 @@
1010
tabindex="0"
1111
ng-required={{field.required}} />
1212
</label>
13-
<div class="col-sm-8">
13+
<div class="bool-text-content">
1414
<label class="text-left" for="{{index}}Text" id="label-{{index}}Text">
1515
<span ng-bind-html="field.name | addTargetBlank"></span>
1616
</label>

‎avRegistration/fields/bool-field-directive/bool-field-directive.less

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
[avr-bool-field] {
2+
.form-group {
3+
display: flex;
4+
flex-direction: row;
5+
align-items: center;
6+
}
7+
28
input[type="checkbox"] {
39
text-align: right;
410
width: auto;
511
float: right;
6-
margin-top: -10px;
12+
margin-top: 0;
13+
accent-color: @brand-success;
14+
}
15+
16+
label {
17+
margin-right: 16px;
18+
}
19+
20+
.bool-text-content {
21+
color: @av-secondary;
22+
23+
a {
24+
color: @brand-success;
25+
}
726
}
827
}

‎avRegistration/fields/captcha-field-directive/captcha-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<div class="col-sm-8 col-sm-offset-4">
33
<img ng-src={{authMethod.captcha_image_url}} style="width:161px;height:65px">
44
</div>
5-
<label id="label-{{index}}Text" for="{{index}}Text" class="control-label col-sm-4">
5+
<label id="label-{{index}}Text" for="{{index}}Text">
66
<span>{{field.name}}</span>
77
</label>
8-
<div class="col-sm-8">
8+
<div>
99
<input
1010
type="text"
1111
class="form-control"

‎avRegistration/fields/code-field-directive/code-field-directive.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="form-group">
2-
<label id="{{code_id}}-code" for="{{code_id}}" class="control-label col-sm-4" ng-i18next="avRegistration.codeLabel"></label>
3-
<div class="col-sm-8">
2+
<label id="{{code_id}}-code" for="{{code_id}}" ng-i18next="avRegistration.codeLabel"></label>
3+
<div>
44
<input
55
type="text"
66
class="form-control"
@@ -28,8 +28,8 @@
2828
ng-if="!!field.help && field.help.length > 0"
2929
ng-bind-html="field.help | addTargetBlank"
3030
></p>
31-
<p class="help-block code-help">
32-
<span ng-if="allowUserResend && showResendAuthCode() && !sendingData && ((method !== 'sms' && method !== 'sms-otp') || isValidTel)">
31+
<p class="help-block code-help" ng-if="allowUserResend && showResendAuthCode() && !sendingData && ((method !== 'sms' && method !== 'sms-otp') || isValidTel)">
32+
<span>
3333
<b ng-i18next="avRegistration.noCodeReceivedQuestion"></b>
3434
<a
3535
ng-click="resendAuthCode(field)"

‎avRegistration/fields/code-field-directive/code-field-directive.less

+4
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22
input.filled {
33
text-transform: uppercase;
44
}
5+
6+
.form-group {
7+
margin-bottom: unset;
8+
}
59
}

‎avRegistration/fields/date-field-directive/date-field-directive.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<div class="form-group">
22
<label
33
ng-if="!label"
4-
class="control-label col-sm-4"
54
>{{field.name}}</label>
65
<label
7-
class="control-label col-sm-4"
86
ng-if="label"
97
ng-bind="label"
108
></label>
11-
<div class="col-sm-8">
9+
<div>
1210
<select
1311
aria-label="{{field.name}}-year"
1412
ng-model="date.year"

‎avRegistration/fields/dni-field-directive/dni-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<div
33
class="form-group"
44
ng-class="{'has-error': fieldForm.input.$dirty && fieldForm.input.$invalid}">
5-
<label id="label-input{{index}}" for="input{{index}}" class="control-label col-sm-4">
5+
<label id="label-input{{index}}" for="input{{index}}">
66
<span>{{field.name}}</span>
77
</label>
8-
<div class="col-sm-8">
8+
<div>
99
<input
1010
type="text"
1111
id="input{{index}}"

‎avRegistration/fields/email-field-directive/email-field-directive.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<label
66
for="emailText"
77
id="label-emailText"
8-
class="control-label col-sm-4"
98
ng-i18next="avRegistration.emailLabel"
109
></label>
11-
<div class="col-sm-8">
10+
<div>
1211
<input
1312
type="text"
1413
class="form-control"

‎avRegistration/fields/image-field-directive/image-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<div
33
class="form-group"
44
ng-class="{'has-error': fieldForm.input.$dirty && fieldForm.input.$invalid}">
5-
<label id="label-image-field" for="image-field" class="control-label col-sm-4">
5+
<label id="label-image-field" for="image-field">
66
<span>{{field.name}}</span>
77
</label>
8-
<div class="col-sm-8">
8+
<div >
99
<input
1010
type="file"
1111
name="image"

‎avRegistration/fields/int-field-directive/int-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<div
33
class="form-group"
44
ng-class="{'has-error': fieldForm.input.$dirty && fieldForm.input.$invalid}">
5-
<label id="label-input{{index}}" for="input{{index}}" class="control-label col-sm-4">
5+
<label id="label-input{{index}}" for="input{{index}}">
66
<span>{{field.name}}</span>
77
</label>
8-
<div class="col-sm-8">
8+
<div>
99
<input
1010
type="number"
1111
class="form-control"

‎avRegistration/fields/password-field-directive/password-field-directive.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
<label
66
id="label-passwordText"
77
for="passwordText"
8-
class="control-label col-sm-4"
98
>
109
<span
1110
ng-i18next="avRegistration.passwordLabel"
1211
></span>
1312
</label>
14-
<div class="col-sm-8">
13+
<div>
1514
<input
1615
type="password"
1716
aria-labeledby="label-passwordText"

‎avRegistration/fields/tel-field-directive/tel-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="form-group">
2-
<label id="label-input{{index}}" for="input{{index}}" class="control-label col-sm-4" ng-i18next="avRegistration.telLabel"></label>
3-
<div class="col-sm-8">
2+
<label id="label-input{{index}}" for="input{{index}}" ng-i18next="avRegistration.telLabel"></label>
3+
<div>
44
<input
55
type="tel"
66
class="form-control phone-login"

‎avRegistration/fields/text-field-directive/text-field-directive.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div
33
class="form-group"
44
ng-class="{'has-error': fieldForm.input.$dirty && fieldForm.input.$invalid}">
5-
<label id="label-input{{index}}" for="input{{index}}" class="control-label col-sm-4">
5+
<label id="label-input{{index}}" for="input{{index}}">
66
<span
77
ng-if="field.name == 'username' || field.name == '__username'"
88
ng-i18next="avRegistration.usernameLabel"
@@ -13,7 +13,7 @@
1313
{{field.name}}
1414
</span>
1515
</label>
16-
<div class="col-sm-8">
16+
<div>
1717
<input
1818
type="text"
1919
name="input"

‎avRegistration/login-controller/login-controller.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="col-xs-12 top-section">
1+
<div class="col-xs-12 login-controller">
22
<div class="pad">
33
<div
44
av-login

‎avRegistration/login-controller/login-controller.less

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* This file is part of common-ui.
3+
* Copyright (C) 2015-2023 Sequent Tech Inc <[email protected]>
4+
5+
* common-ui is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU Affero General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License.
8+
9+
* common-ui is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU Affero General Public License for more details.
13+
14+
* You should have received a copy of the GNU Affero General Public License
15+
* along with common-ui. If not, see <http://www.gnu.org/licenses/>.
16+
**/
17+
18+
.login-controller {
19+
display: flex;
20+
justify-content: center;
21+
22+
.pad {
23+
max-width: 562px;
24+
}
25+
}

‎avRegistration/login-directive/login-directive.html

+31-30
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<div class="container-fluid">
1+
<div class="container-login">
22
<div class="row">
33
<div class="col-sm-12 loginheader">
4-
<h2
5-
class="tex-center"
4+
<h3
5+
class="tex-center login-header-text"
66
ng-if="!isAdmin && !isOtl && !isCensusQuery && method !== 'openid-connect'"
77
ng-i18next="[i18next]({name: orgName})avRegistration.loginHeader">
8-
</h2>
9-
<h2
10-
class="tex-center"
8+
</h3>
9+
<h3
10+
class="tex-center login-header-text"
1111
ng-if="isAdmin && !isOtl"
1212
ng-i18next="[i18next]avRegistration.adminLoginHeader">
13-
</h2>
14-
<h2
15-
class="tex-center"
13+
</h3>
14+
<h3
15+
class="tex-center login-header-text"
1616
ng-if="!isCensusQuery && method === 'openid-connect'"
1717
ng-i18next="[i18next]avRegistration.loginButton">
18-
</h2>
19-
<h2
20-
class="tex-center"
18+
</h3>
19+
<h3
20+
class="tex-center login-header-text"
2121
ng-if="!!isCensusQuery"
2222
ng-i18next="avRegistration.censusQueryHeader">
23-
</h2>
24-
<h2
25-
class="tex-center"
23+
</h3>
24+
<h3
25+
class="tex-center login-header-text"
2626
ng-if="isOtl"
2727
ng-i18next="avRegistration.otlHeader">
28-
</h2>
28+
</h3>
2929
<div
3030
class="text-success"
3131
ng-if="!!successfulRegistration"
@@ -34,7 +34,7 @@
3434
</div>
3535
</div>
3636

37-
<div class="col-sm-6" ng-if="method !== 'openid-connect'">
37+
<div class="col-sm-12" ng-if="method !== 'openid-connect'">
3838
<form name="form" id="loginForm" role="form" class="form-horizontal">
3939
<div
4040
ng-repeat="field in login_fields"
@@ -43,22 +43,23 @@
4343
ng-if="(field.steps === undefined || field.steps.indexOf(currentFormStep) !== -1) && otlStatus !== 'success'">
4444
</div>
4545

46-
<div class="col-sm-offset-4 col-sm-8 button-group">
46+
<div class="button-group">
4747
<div class="input-error" ng-if="!isCensusQuery">
4848
<div class="error text-danger" role="alert" ng-if="error">{{ error }}</div>
4949
</div>
5050
<div class="input-warn">
51-
<span
52-
class="text-warning"
53-
ng-if="!form.$valid || sendingData"
54-
role="alert"
55-
ng-i18next>
56-
avRegistration.fillValidFormText
57-
</span>
51+
<div class="warn-box" ng-if="!form.$valid || sendingData" >
52+
<span class="glyphicon glyphicon-warning-sign"></span>
53+
<div
54+
role="alert"
55+
ng-i18next>
56+
avRegistration.fillValidFormText
57+
</div>
58+
</div>
5859
</div>
5960
<button
6061
type="submit"
61-
class="btn btn-block btn-success-action"
62+
class="btn btn-block btn-lg btn-success-action"
6263
ng-if="!isCensusQuery && !isOtl"
6364
ng-i18next="avRegistration.loginButton"
6465
ng-click="loginUser(form.$valid)"
@@ -67,7 +68,7 @@
6768
</button>
6869
<button
6970
type="submit"
70-
class="btn btn-block btn-success-action"
71+
class="btn btn-block btn-lg btn-success-action"
7172
ng-if="isCensusQuery"
7273
ng-i18next="avRegistration.checkCensusButton"
7374
ng-click="checkCensus(form.$valid)"
@@ -76,7 +77,7 @@
7677
</button>
7778
<button
7879
type="submit"
79-
class="btn btn-block btn-success-action"
80+
class="btn btn-block btn-lg btn-success-action"
8081
ng-if="isOtl && otlStatus !== 'success'"
8182
ng-i18next="avRegistration.otlButton"
8283
ng-click="otlAuth(form.$valid)"
@@ -144,7 +145,7 @@
144145
</div>
145146

146147
<div
147-
class="col-sm-5 col-sm-offset-1 hidden-xs"
148+
class="col-sm-5 col-sm-offset-1 hidden-xs not-registered-yet"
148149
ng-if="registrationAllowed && !isCensusQuery && method !== 'openid-connect' && !isOtl">
149150
<h3
150151
class="help-h3"
@@ -175,7 +176,7 @@
175176
<a
176177
ng-click="openidConnectAuth(provider)"
177178
alt="{{provider.description}}"
178-
class="btn btn-primary btn-login">
179+
class="btn btn-lg btn-primary btn-login">
179180
<img
180181
ng-if="!!provider.icon"
181182
alt="{{provider.description}}"

0 commit comments

Comments
 (0)