haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed input-control block to form-control

This commit is contained in:
Ilya Daynatovich 2016-11-08 17:46:59 +02:00
parent c926e95822
commit 5623a06996
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/_side_toolbar_container.scss
View File

@ -23,7 +23,7 @@
* Form elements and blocks. * Form elements and blocks.
*/ */
input, select, a, input, select, a,
.sideToolbarBlock, .input-control, .button-control { .sideToolbarBlock, .form-control, .button-control {
display: block; display: block;
margin-top: 15px; margin-top: 15px;
margin-left: 10%; margin-left: 10%;

2
css/input-control/_input-control.scss
View File

@ -1,4 +1,4 @@
.input-control { .form-control {
padding: 16px 0; padding: 16px 0;
&:first-child { &:first-child {

2
css/modals/_dialog.scss
View File

@ -72,7 +72,7 @@
} }
} }
.input-control:not(:last-child) { .form-control:not(:last-child) {
border-bottom: 1px solid $auiBorderColor; border-bottom: 1px solid $auiBorderColor;
} }
} }

2
css/modals/feedback/_feedback.scss
View File

@ -62,7 +62,7 @@
text-align: center; text-align: center;
padding: 10px 40px 20px 40px; padding: 10px 40px 20px 40px;
.input-control{ .form-control{
&__input { &__input {
background-color: $feedbackInputBg; background-color: $feedbackInputBg;
color: $feedbackInputTextColor; color: $feedbackInputTextColor;

6
modules/UI/UI.js
View File

@ -80,11 +80,11 @@ JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.NO_DATA_FROM_SOURCE]
function promptDisplayName() { function promptDisplayName() {
let labelKey = 'dialog.enterDisplayName'; let labelKey = 'dialog.enterDisplayName';
let message = ( let message = (
`<div class="input-control"> `<div class="form-control">
<label data-i18n="${labelKey}" class="input-control__label"></label> <label data-i18n="${labelKey}" class="form-control__label"></label>
<input name="displayName" type="text" <input name="displayName" type="text"
data-i18n="[placeholder]defaultNickname" data-i18n="[placeholder]defaultNickname"
class="input-control__input" class="form-control__input"
autofocus> autofocus>
</div>` </div>`
); );

4
modules/UI/authentication/LoginDialog.js
View File

@ -11,10 +11,10 @@ function getPasswordInputHtml() {
return ` return `
<input name="username" type="text" <input name="username" type="text"
class="input-control__input" class="form-control__input"
placeholder=${placeholder} autofocus> placeholder=${placeholder} autofocus>
<input name="password" type="password" <input name="password" type="password"
class="input-control__input" class="form-control__input"
data-i18n="[placeholder]dialog.userPassword">`; data-i18n="[placeholder]dialog.userPassword">`;
} }

2
modules/UI/feedback/FeedbackWindow.js
View File

@ -66,7 +66,7 @@ function createRateFeedbackHTML() {
</div> </div>
</div> </div>
<div class="details"> <div class="details">
<textarea id="feedbackTextArea" class="input-control__input" <textarea id="feedbackTextArea" class="form-control__input"
data-i18n="[placeholder]dialog.feedbackHelp"></textarea> data-i18n="[placeholder]dialog.feedbackHelp"></textarea>
</div> </div>
</form>`; </form>`;

34
modules/UI/invite/InviteDialogView.js
View File

@ -120,20 +120,20 @@ export default class InviteDialogView {
getShareLinkBlock() { getShareLinkBlock() {
let classes = 'button-control button-control_light copyInviteLink'; let classes = 'button-control button-control_light copyInviteLink';
return ( return (
`<div class="input-control"> `<div class="form-control">
<label class="input-control__label" for="inviteLinkRef" <label class="form-control__label" for="inviteLinkRef"
data-i18n="${this.dialog.titleKey}"></label> data-i18n="${this.dialog.titleKey}"></label>
<div class="input-control__container"> <div class="form-control__container">
<input class="input-control__input inviteLink" <input class="form-control__input inviteLink"
id="inviteLinkRef" type="text" id="inviteLinkRef" type="text"
${this.inviteAttributes} readonly> ${this.inviteAttributes} readonly>
<button data-i18n="dialog.copy" class="${classes}"></button> <button data-i18n="dialog.copy" class="${classes}"></button>
</div> </div>
<p class="input-control__hint ${this.lockHint}"> <p class="form-control__hint ${this.lockHint}">
<span class="icon-security-locked"></span> <span class="icon-security-locked"></span>
<span data-i18n="dialog.roomLocked"></span> <span data-i18n="dialog.roomLocked"></span>
</p> </p>
<p class="input-control__hint ${this.unlockHint}"> <p class="form-control__hint ${this.unlockHint}">
<span class="icon-security"></span> <span class="icon-security"></span>
<span data-i18n="roomUnlocked"></span> <span data-i18n="roomUnlocked"></span>
</p> </p>
@ -150,12 +150,12 @@ export default class InviteDialogView {
if (this.model.isModerator) { if (this.model.isModerator) {
html = (` html = (`
<div class="input-control"> <div class="form-control">
<label class="input-control__label" <label class="form-control__label"
for="newPasswordInput" data-i18n="dialog.addPassword"> for="newPasswordInput" data-i18n="dialog.addPassword">
</label> </label>
<div class="input-control__container"> <div class="form-control__container">
<input class="input-control__input" id="newPasswordInput" <input class="form-control__input" id="newPasswordInput"
type="text" type="text"
data-i18n="[placeholder]dialog.createPassword"> data-i18n="[placeholder]dialog.createPassword">
<button id="addPasswordBtn" id="inviteDialogAddPassword" <button id="addPasswordBtn" id="inviteDialogAddPassword"
@ -182,19 +182,19 @@ export default class InviteDialogView {
if (isModerator) { if (isModerator) {
return (` return (`
<div class="input-control"> <div class="form-control">
<label class="input-control__label" <label class="form-control__label"
data-i18n="dialog.passwordLabel"></label> data-i18n="dialog.passwordLabel"></label>
<div class="input-control__container"> <div class="form-control__container">
<p> <p>
<span class="input-control__text" <span class="form-control__text"
data-i18n="dialog.currentPassword"></span> data-i18n="dialog.currentPassword"></span>
<span id="inviteDialogPassword" <span id="inviteDialogPassword"
class="input-control__em"> class="form-control__em">
${password} ${password}
</span> </span>
</p> </p>
<a class="link input-control__right" <a class="link form-control__right"
id="inviteDialogRemovePassword" id="inviteDialogRemovePassword"
data-i18n="dialog.removePassword"></a> data-i18n="dialog.removePassword"></a>
</div> </div>
@ -202,7 +202,7 @@ export default class InviteDialogView {
`); `);
} else { } else {
return (` return (`
<div class="input-control"> <div class="form-control">
<p>A participant protected this call with a password.</p> <p>A participant protected this call with a password.</p>
</div> </div>
`); `);

2
modules/UI/side_pannels/contactlist/ContactListView.js
View File

@ -136,7 +136,7 @@ var ContactListView = {
* Adds layout for lock description * Adds layout for lock description
*/ */
getLockDescriptionLayout(key) { getLockDescriptionLayout(key) {
let classes = "input-control__hint input-control_full-width"; let classes = "form-control__hint form-control_full-width";
let padlockSuffix = ''; let padlockSuffix = '';
if (key === this.lockKey) { if (key === this.lockKey) {
padlockSuffix = '-locked'; padlockSuffix = '-locked';