ソースを参照

renamed input-control block to form-control

master
Ilya Daynatovich 8年前
コミット
5623a06996

+ 1
- 1
css/_side_toolbar_container.scss ファイルの表示

23
      * Form elements and blocks.
23
      * Form elements and blocks.
24
      */
24
      */
25
     input, select, a,
25
     input, select, a,
26
-    .sideToolbarBlock, .input-control, .button-control {
26
+    .sideToolbarBlock, .form-control, .button-control {
27
         display: block;
27
         display: block;
28
         margin-top: 15px;
28
         margin-top: 15px;
29
         margin-left: 10%;
29
         margin-left: 10%;

+ 1
- 1
css/input-control/_input-control.scss ファイルの表示

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

+ 1
- 1
css/modals/_dialog.scss ファイルの表示

72
         }
72
         }
73
     }
73
     }
74
 
74
 
75
-    .input-control:not(:last-child) {
75
+    .form-control:not(:last-child) {
76
         border-bottom: 1px solid $auiBorderColor;
76
         border-bottom: 1px solid $auiBorderColor;
77
     }
77
     }
78
 }
78
 }

+ 1
- 1
css/modals/feedback/_feedback.scss ファイルの表示

62
             text-align: center;
62
             text-align: center;
63
             padding: 10px 40px 20px 40px;
63
             padding: 10px 40px 20px 40px;
64
 
64
 
65
-            .input-control{
65
+            .form-control{
66
                 &__input {
66
                 &__input {
67
                     background-color: $feedbackInputBg;
67
                     background-color: $feedbackInputBg;
68
                     color: $feedbackInputTextColor;
68
                     color: $feedbackInputTextColor;

+ 3
- 3
modules/UI/UI.js ファイルの表示

80
 function promptDisplayName() {
80
 function promptDisplayName() {
81
     let labelKey = 'dialog.enterDisplayName';
81
     let labelKey = 'dialog.enterDisplayName';
82
     let message = (
82
     let message = (
83
-        `<div class="input-control">
84
-            <label data-i18n="${labelKey}" class="input-control__label"></label>
83
+        `<div class="form-control">
84
+            <label data-i18n="${labelKey}" class="form-control__label"></label>
85
             <input name="displayName" type="text"
85
             <input name="displayName" type="text"
86
                data-i18n="[placeholder]defaultNickname"
86
                data-i18n="[placeholder]defaultNickname"
87
-               class="input-control__input"
87
+               class="form-control__input"
88
                autofocus>
88
                autofocus>
89
          </div>`
89
          </div>`
90
     );
90
     );

+ 2
- 2
modules/UI/authentication/LoginDialog.js ファイルの表示

11
 
11
 
12
     return `
12
     return `
13
         <input name="username" type="text" 
13
         <input name="username" type="text" 
14
-               class="input-control__input"
14
+               class="form-control__input"
15
                placeholder=${placeholder} autofocus>
15
                placeholder=${placeholder} autofocus>
16
         <input name="password" type="password"
16
         <input name="password" type="password"
17
-               class="input-control__input"
17
+               class="form-control__input"
18
                data-i18n="[placeholder]dialog.userPassword">`;
18
                data-i18n="[placeholder]dialog.userPassword">`;
19
 }
19
 }
20
 
20
 

+ 1
- 1
modules/UI/feedback/FeedbackWindow.js ファイルの表示

66
                 </div>
66
                 </div>
67
             </div>
67
             </div>
68
             <div class="details">
68
             <div class="details">
69
-                <textarea id="feedbackTextArea" class="input-control__input" 
69
+                <textarea id="feedbackTextArea" class="form-control__input" 
70
                     data-i18n="[placeholder]dialog.feedbackHelp"></textarea>
70
                     data-i18n="[placeholder]dialog.feedbackHelp"></textarea>
71
             </div>
71
             </div>
72
         </form>`;
72
         </form>`;

+ 17
- 17
modules/UI/invite/InviteDialogView.js ファイルの表示

120
     getShareLinkBlock() {
120
     getShareLinkBlock() {
121
         let classes = 'button-control button-control_light copyInviteLink';
121
         let classes = 'button-control button-control_light copyInviteLink';
122
         return (
122
         return (
123
-            `<div class="input-control">
124
-                <label class="input-control__label" for="inviteLinkRef"
123
+            `<div class="form-control">
124
+                <label class="form-control__label" for="inviteLinkRef"
125
                     data-i18n="${this.dialog.titleKey}"></label>
125
                     data-i18n="${this.dialog.titleKey}"></label>
126
-                <div class="input-control__container">
127
-                    <input class="input-control__input inviteLink"
126
+                <div class="form-control__container">
127
+                    <input class="form-control__input inviteLink"
128
                            id="inviteLinkRef" type="text"
128
                            id="inviteLinkRef" type="text"
129
                            ${this.inviteAttributes} readonly>
129
                            ${this.inviteAttributes} readonly>
130
                     <button data-i18n="dialog.copy" class="${classes}"></button>
130
                     <button data-i18n="dialog.copy" class="${classes}"></button>
131
                 </div>
131
                 </div>
132
-                <p class="input-control__hint ${this.lockHint}">
132
+                <p class="form-control__hint ${this.lockHint}">
133
                    <span class="icon-security-locked"></span>
133
                    <span class="icon-security-locked"></span>
134
                    <span data-i18n="dialog.roomLocked"></span>
134
                    <span data-i18n="dialog.roomLocked"></span>
135
                 </p>
135
                 </p>
136
-                <p class="input-control__hint ${this.unlockHint}">
136
+                <p class="form-control__hint ${this.unlockHint}">
137
                    <span class="icon-security"></span>
137
                    <span class="icon-security"></span>
138
                    <span data-i18n="roomUnlocked"></span>
138
                    <span data-i18n="roomUnlocked"></span>
139
                 </p>
139
                 </p>
150
 
150
 
151
         if (this.model.isModerator) {
151
         if (this.model.isModerator) {
152
             html = (`
152
             html = (`
153
-            <div class="input-control">
154
-                <label class="input-control__label"
153
+            <div class="form-control">
154
+                <label class="form-control__label"
155
                        for="newPasswordInput" data-i18n="dialog.addPassword">
155
                        for="newPasswordInput" data-i18n="dialog.addPassword">
156
                </label>
156
                </label>
157
-                <div class="input-control__container">
158
-                    <input class="input-control__input" id="newPasswordInput"
157
+                <div class="form-control__container">
158
+                    <input class="form-control__input" id="newPasswordInput"
159
                            type="text" 
159
                            type="text" 
160
                            data-i18n="[placeholder]dialog.createPassword">
160
                            data-i18n="[placeholder]dialog.createPassword">
161
                     <button id="addPasswordBtn" id="inviteDialogAddPassword"
161
                     <button id="addPasswordBtn" id="inviteDialogAddPassword"
182
 
182
 
183
         if (isModerator) {
183
         if (isModerator) {
184
             return (`
184
             return (`
185
-                <div class="input-control">
186
-                    <label class="input-control__label"
185
+                <div class="form-control">
186
+                    <label class="form-control__label"
187
                            data-i18n="dialog.passwordLabel"></label>
187
                            data-i18n="dialog.passwordLabel"></label>
188
-                    <div class="input-control__container">
188
+                    <div class="form-control__container">
189
                         <p>
189
                         <p>
190
-                            <span class="input-control__text"
190
+                            <span class="form-control__text"
191
                                   data-i18n="dialog.currentPassword"></span>
191
                                   data-i18n="dialog.currentPassword"></span>
192
                             <span id="inviteDialogPassword"
192
                             <span id="inviteDialogPassword"
193
-                                  class="input-control__em">
193
+                                  class="form-control__em">
194
                                 ${password}
194
                                 ${password}
195
                             </span>
195
                             </span>
196
                         </p>
196
                         </p>
197
-                        <a class="link input-control__right"
197
+                        <a class="link form-control__right"
198
                            id="inviteDialogRemovePassword"
198
                            id="inviteDialogRemovePassword"
199
                            data-i18n="dialog.removePassword"></a>
199
                            data-i18n="dialog.removePassword"></a>
200
                     </div>
200
                     </div>
202
             `);
202
             `);
203
         } else {
203
         } else {
204
             return (`
204
             return (`
205
-                <div class="input-control">
205
+                <div class="form-control">
206
                     <p>A participant protected this call with a password.</p>
206
                     <p>A participant protected this call with a password.</p>
207
                 </div>
207
                 </div>
208
             `);
208
             `);

+ 1
- 1
modules/UI/side_pannels/contactlist/ContactListView.js ファイルの表示

136
      * Adds layout for lock description
136
      * Adds layout for lock description
137
      */
137
      */
138
     getLockDescriptionLayout(key) {
138
     getLockDescriptionLayout(key) {
139
-        let classes = "input-control__hint input-control_full-width";
139
+        let classes = "form-control__hint form-control_full-width";
140
         let padlockSuffix = '';
140
         let padlockSuffix = '';
141
         if (key === this.lockKey) {
141
         if (key === this.lockKey) {
142
             padlockSuffix = '-locked';
142
             padlockSuffix = '-locked';

読み込み中…
キャンセル
保存