sean/manja_dev_ui
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: fix Forms and Switches bugs

Browse Source
This commit is contained in:
woothu
2019-04-05 12:53:57 +02:00
parent d5a0511652
commit d938bd4b9b
2 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/base/Forms.vue
+27 -27
View File
@@ -187,7 +187,7 @@
:custom="key > 1"
:name="`Option 1${key}`"
:checked="Math.random() > 0.6"
:class="key % 2 === 1 ? 'form-check-inline' : ''"
:inline="key % 2 === 1"
/>
</CCol>
</div>
@@ -207,7 +207,7 @@
:custom="key > 1"
:name="`Option 1${key}`"
checked="Option 1"
:class="key % 2 === 1 ? 'form-check-inline' : ''"
:inline="key % 2 === 1"
/>
</CCol>
</div>
@@ -474,18 +474,18 @@
<CCardBody>
<CFormInput
placeholder="Username"
prepend="<i class='fa fa-user'></i>"
prependHtml="<i class='fa fa-user'></i>"
/>
<CFormInput
type="email"
placeholder="Email"
autocomplete="email"
append="<i class='fa fa-envelope-o'></i>"
appendHtml="<i class='fa fa-envelope-o'></i>"
/>
<CFormInput
prepend="<i class='fa fa-euro'></i>"
prependHtml="<i class='fa fa-euro'></i>"
placeholder="ex. $1.000.000"
append=".00"
appendHtml=".00"
/>
</CCardBody>
<CCardFooter>
@@ -542,7 +542,7 @@
<CFormInput placeholder="Username">
<template #prepend>
<CDropdown
buttonContent="Action"
buttonHtml="Action"
variant="primary"
>
<CDropdownItem>Action</CDropdownItem>
@@ -559,7 +559,7 @@
>
<template #append>
<CDropdown
buttonContent="Action"
buttonHtml="Action"
variant="primary"
right
>
@@ -574,7 +574,7 @@
<template #prepend>
<CDropdown
buttonContent="Split"
buttonHtml="Split"
variant="primary"
split
>
@@ -587,7 +587,7 @@
<template #append>
<CDropdown
buttonContent="Action"
buttonHtml="Action"
variant="primary"
right
>
@@ -674,20 +674,20 @@
<CCardBody>
<CForm>
<CFormInput
prepend="Username"
append="<i class='fa fa-user'></i>"
prependHtml="Username"
appendHtml="<i class='fa fa-user'></i>"
/>
<CFormInput
prepend="Email"
prependHtml="Email"
type="email"
autocomplete="email"
append="<i class='fa fa-envelope'></i>"
appendHtml="<i class='fa fa-envelope'></i>"
/>
<CFormInput
prepend="Password"
prependHtml="Password"
type="password"
autocomplete="current-password"
append="<i class='fa fa-asterisk'></i>"
appendHtml="<i class='fa fa-asterisk'></i>"
/>
<div class="form-group form-actions">
<CButton type="submit" size="sm" variant="primary">Submit</CButton>
@@ -705,19 +705,19 @@
<CForm>
<CFormInput
placeholder="Username"
append="<i class='fa fa-user'></i>"
appendHtml="<i class='fa fa-user'></i>"
/>
<CFormInput
placeholder="Email"
type="email"
autocomplete="email"
append="<i class='fa fa-envelope'></i>"
appendHtml="<i class='fa fa-envelope'></i>"
/>
<CFormInput
placeholder="Password"
type="password"
autocomplete="current-password"
append="<i class='fa fa-asterisk'></i>"
appendHtml="<i class='fa fa-asterisk'></i>"
/>
<div class="form-group form-actions">
<CButton type="submit" class="btn btn-sm btn-secondary">Submit</CButton>
@@ -735,19 +735,19 @@
<CForm>
<CFormInput
placeholder="Username"
prepend="<i class='fa fa-user'></i>"
prependHtml="<i class='fa fa-user'></i>"
/>
<CFormInput
placeholder="Email"
type="email"
autocomplete="email"
prepend="<i class='fa fa-envelope'></i>"
prependHtml="<i class='fa fa-envelope'></i>"
/>
<CFormInput
placeholder="Password"
type="password"
autocomplete="current-password"
prepend="<i class='fa fa-asterisk'></i>"
prependHtml="<i class='fa fa-asterisk'></i>"
/>
<div class="form-group form-actions">
<CButton type="submit" size="sm" variant="success">Submit</CButton>
@@ -782,20 +782,20 @@
<CCardBody>
<CFormInput
label="Prepended text"
prepend="@"
prependHtml="@"
description="Here's some help text"
type="email"
autocomplete="email"
/>
<CFormInput
label="Appended text"
append=".00"
appendHtml=".00"
description="Here's some help text"
/>
<CFormInput
label="Appended text"
prepend="$"
append=".00"
label="Appended and prepended text"
prependHtml="$"
appendHtml=".00"
description="Here's some help text"
/>
<CFormInput
src/views/base/Switches.vue
+15 -7
View File
@@ -1,6 +1,5 @@
<template>
<div class="animated fadeIn">
<CRow>
<CCol xs="12" md="6">
<CCard v-if="true">
@@ -12,6 +11,14 @@
</h5>
</CCardHeader>
<CCardBody>
<!-- <CSwitch
:checked.sync="test11"
trueValue="yes"
falseValue="no"
id="alt"
name="lg"
required
/> -->
<!-- <CSwitch class="mx-1" variant="primary" shape="3d" outline="alt" v-bind="labelIcon" type="radio" name="radio" checked.sync="radio" trueValue="primary"/> -->
<CSwitch class="mx-1"
:key="key"
@@ -368,7 +375,7 @@
Switch <small><code>label</code></small>
</CCardHeader>
<CCardBody>
<CSwitch class="mx-1" variant="primary" checked dataOn="" dataOff=""/>
<CSwitch class="mx-1" variant="primary" checked v-bind="labelIcon"/>
<CSwitch class="mx-1" variant="secondary" checked v-bind="labelIcon" />
<CSwitch class="mx-1" variant="success" checked v-bind="labelIcon" />
<CSwitch class="mx-1" variant="warning" checked v-bind="labelIcon" />
@@ -526,13 +533,14 @@ export default {
checker: 'yes',
radio: 'primary',
labelIcon: {
dataOn: '\u2713',
dataOff: '\u2715'
labelOn: '\u2713',
labelOff: '\u2715'
},
labelTxt: {
dataOn: 'yes',
dataOff: 'no'
}
labelOn: 'yes',
labelOff: 'no'
},
}
}
}