Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6585e3d8
Commit
6585e3d8
authored
Jun 05, 2018
by
Dennis Tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use bootstrap 4 utilities for error states
parent
5ef0e1c3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
12 deletions
+18
-12
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
...luster_dropdowns/components/gke_machine_type_dropdown.vue
+6
-4
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
..._cluster_dropdowns/components/gke_project_id_dropdown.vue
+6
-4
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
...ts/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
+6
-4
No files found.
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
View file @
6585e3d8
...
@@ -89,14 +89,13 @@ export default {
...
@@ -89,14 +89,13 @@ export default {
<div>
<div>
<div
<div
class=
"js-gcp-machine-type-dropdown dropdown"
class=
"js-gcp-machine-type-dropdown dropdown"
:class=
"
{ 'gl-show-field-errors': hasErrors }"
>
>
<dropdown-hidden-input
<dropdown-hidden-input
:name=
"fieldName"
:name=
"fieldName"
:value=
"selectedMachineType"
:value=
"selectedMachineType"
/>
/>
<dropdown-button
<dropdown-button
:class=
"
{ '
gl-field-error-outline
': hasErrors }"
:class=
"
{ '
border-danger
': hasErrors }"
:is-disabled="isDisabled"
:is-disabled="isDisabled"
:is-loading="isLoading"
:is-loading="isLoading"
:toggle-text="toggleText"
:toggle-text="toggleText"
...
@@ -132,8 +131,11 @@ export default {
...
@@ -132,8 +131,11 @@ export default {
</div>
</div>
</div>
</div>
<span
<span
class=
"form-text text-muted"
class=
"form-text"
:class=
"
{ 'gl-field-error': hasErrors }"
:class=
"
{
'text-danger': hasErrors,
'text-muted': !hasErrors
}"
v-if="hasErrors"
v-if="hasErrors"
>
>
{{
errorMessage
}}
{{
errorMessage
}}
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
View file @
6585e3d8
...
@@ -147,7 +147,6 @@ export default {
...
@@ -147,7 +147,6 @@ export default {
<div>
<div>
<div
<div
class=
"js-gcp-project-id-dropdown dropdown"
class=
"js-gcp-project-id-dropdown dropdown"
:class=
"
{ 'gl-show-field-errors': hasErrors }"
>
>
<dropdown-hidden-input
<dropdown-hidden-input
:name=
"fieldName"
:name=
"fieldName"
...
@@ -155,7 +154,7 @@ export default {
...
@@ -155,7 +154,7 @@ export default {
/>
/>
<dropdown-button
<dropdown-button
:class=
"
{
:class=
"
{
'
gl-field-error-outline
': hasErrors,
'
border-danger
': hasErrors,
'read-only': hasOneProject
'read-only': hasOneProject
}"
}"
:is-disabled="isDisabled"
:is-disabled="isDisabled"
...
@@ -193,8 +192,11 @@ export default {
...
@@ -193,8 +192,11 @@ export default {
</div>
</div>
</div>
</div>
<span
<span
class=
"form-text text-muted"
class=
"form-text"
:class=
"
{ 'gl-field-error': hasErrors }"
:class=
"
{
'text-danger': hasErrors,
'text-muted': !hasErrors
}"
v-html="helpText"
v-html="helpText"
>
</span>
>
</span>
</div>
</div>
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
View file @
6585e3d8
...
@@ -63,14 +63,13 @@ export default {
...
@@ -63,14 +63,13 @@ export default {
<div>
<div>
<div
<div
class=
"js-gcp-zone-dropdown dropdown"
class=
"js-gcp-zone-dropdown dropdown"
:class=
"
{ 'gl-show-field-errors': hasErrors }"
>
>
<dropdown-hidden-input
<dropdown-hidden-input
:name=
"fieldName"
:name=
"fieldName"
:value=
"selectedZone"
:value=
"selectedZone"
/>
/>
<dropdown-button
<dropdown-button
:class=
"
{ '
gl-field-error-outline
': hasErrors }"
:class=
"
{ '
border-danger
': hasErrors }"
:is-disabled="isDisabled"
:is-disabled="isDisabled"
:is-loading="isLoading"
:is-loading="isLoading"
:toggle-text="toggleText"
:toggle-text="toggleText"
...
@@ -106,8 +105,11 @@ export default {
...
@@ -106,8 +105,11 @@ export default {
</div>
</div>
</div>
</div>
<span
<span
class=
"form-text text-muted"
class=
"form-text"
:class=
"
{ 'gl-field-error': hasErrors }"
:class=
"
{
'text-danger': hasErrors,
'text-muted': !hasErrors
}"
v-if="hasErrors"
v-if="hasErrors"
>
>
{{
errorMessage
}}
{{
errorMessage
}}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment