Просмотр исходного кода

Fix Bootstrap 4 help-text components

- Also fix typo in template
- Also remove no-longer-used "bootstrap-datetime-picker" from
  "package.json"
master
Joseph Wayodi 4 лет назад
Родитель
Сommit
f02a6babde

+ 0
- 6
package-lock.json Просмотреть файл

578
       "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==",
578
       "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==",
579
       "dev": true
579
       "dev": true
580
     },
580
     },
581
-    "bootstrap-datetime-picker": {
582
-      "version": "2.4.4",
583
-      "resolved": "https://registry.npmjs.org/bootstrap-datetime-picker/-/bootstrap-datetime-picker-2.4.4.tgz",
584
-      "integrity": "sha1-t8/oQ6PG0iHAMpPJpGSkzDXXOWg=",
585
-      "dev": true
586
-    },
587
     "brace-expansion": {
581
     "brace-expansion": {
588
       "version": "1.1.11",
582
       "version": "1.1.11",
589
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
583
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

+ 0
- 1
package.json Просмотреть файл

7
   "devDependencies": {
7
   "devDependencies": {
8
     "@fortawesome/fontawesome-free": "^5.15.1",
8
     "@fortawesome/fontawesome-free": "^5.15.1",
9
     "bootstrap": "^4.5.3",
9
     "bootstrap": "^4.5.3",
10
-    "bootstrap-datetime-picker": "^2.4.4",
11
     "eslint": "^7.14.0",
10
     "eslint": "^7.14.0",
12
     "extend": ">=3.0.2",
11
     "extend": ">=3.0.2",
13
     "gulp": "^4.0.2",
12
     "gulp": "^4.0.2",

+ 2
- 2
src/oscar/templates/oscar/dashboard/partials/form_field.html Просмотреть файл

44
 
44
 
45
                     {% block help_text %}
45
                     {% block help_text %}
46
                         {% if field.help_text %}
46
                         {% if field.help_text %}
47
-                            <span class='form-text'>
47
+                            <small class="form-text text-muted">
48
                                 {# We allow HTML within form help fields #}
48
                                 {# We allow HTML within form help fields #}
49
                                 {{ field.help_text|safe }}
49
                                 {{ field.help_text|safe }}
50
-                            </span>
50
+                            </small>
51
                         {% endif %}
51
                         {% endif %}
52
                     {% endblock %}
52
                     {% endblock %}
53
                 </div>
53
                 </div>

+ 1
- 1
src/oscar/templates/oscar/dashboard/partials/form_fields.html Просмотреть файл

9
 {% if form.non_field_errors %}
9
 {% if form.non_field_errors %}
10
     {% for error in form.non_field_errors %}
10
     {% for error in form.non_field_errors %}
11
         <div class="alert alert-danger form-group">
11
         <div class="alert alert-danger form-group">
12
-            <span class="help-inline"><<i class="fas fa-exclamation"></i> {{ error }}</span>
12
+            <span class="help-inline"><i class="fas fa-exclamation"></i> {{ error }}</span>
13
         </div>
13
         </div>
14
     {% endfor %}
14
     {% endfor %}
15
 {% endif %}
15
 {% endif %}

+ 2
- 2
src/oscar/templates/oscar/dashboard/reviews/review_update.html Просмотреть файл

47
                                         </span>
47
                                         </span>
48
                                     {% endfor %}
48
                                     {% endfor %}
49
                                     {% if field.help_text %}
49
                                     {% if field.help_text %}
50
-                                        <span class='form-text'>
50
+                                        <small class="form-text text-muted">
51
                                             {{ field.help_text }}
51
                                             {{ field.help_text }}
52
-                                        </span>
52
+                                        </small>
53
                                     {% endif %}
53
                                     {% endif %}
54
                                 </div>
54
                                 </div>
55
                             {% endif %}
55
                             {% endif %}

+ 2
- 2
src/oscar/templates/oscar/partials/form_field.html Просмотреть файл

42
 
42
 
43
                     {% block help_text %}
43
                     {% block help_text %}
44
                         {% if field.help_text %}
44
                         {% if field.help_text %}
45
-                            <span class='form-text'>
45
+                            <small class="form-text text-muted">
46
                                 {# We allow HTML within form help fields #}
46
                                 {# We allow HTML within form help fields #}
47
                                 {{ field.help_text|safe }}
47
                                 {{ field.help_text|safe }}
48
-                            </span>
48
+                            </small>
49
                         {% endif %}
49
                         {% endif %}
50
                     {% endblock %}
50
                     {% endblock %}
51
                 </div>
51
                 </div>

Загрузка…
Отмена
Сохранить