Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-easy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
easyUI
hls-easy-ui
Commits
9d4b0361
Commit
9d4b0361
authored
Sep 16, 2019
by
JingChao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复heade背景无法覆写问题
parent
0907c658
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
59 deletions
+64
-59
hlsPopup.js
packages/common/scripts/hlsPopup.js
+2
-2
ionic-public-style.less
packages/common/styles/ionic-public-style.less
+0
-38
index.vue
packages/components/HHeader/index.vue
+16
-5
Item.vue
packages/components/ListItem/Item.vue
+21
-0
index.vue
packages/components/Switch/index.vue
+22
-11
variables.less
src/styles/variables.less
+3
-3
No files found.
packages/common/scripts/hlsPopup.js
View file @
9d4b0361
...
@@ -4,7 +4,7 @@ import ActionSheet from '../../components/ActionSheet/index'
...
@@ -4,7 +4,7 @@ import ActionSheet from '../../components/ActionSheet/index'
import
ShowPicture
from
'../../components/ShowPicture/index'
import
ShowPicture
from
'../../components/ShowPicture/index'
import
Select
from
'../../components/select/index'
import
Select
from
'../../components/select/index'
import
Notify
from
'../../components/Dialog/plugins/index'
import
Notify
from
'../../components/Dialog/plugins/index'
import
HlsModal
from
'../../components/Modal/index'
//
import HlsModal from '../../components/Modal/index'
import
NumberKeyboard
from
'../../components/NumberKeyboard/index'
import
NumberKeyboard
from
'../../components/NumberKeyboard/index'
...
@@ -19,7 +19,7 @@ Vue.use(Select)
...
@@ -19,7 +19,7 @@ Vue.use(Select)
Vue
.
use
(
NumberKeyboard
)
Vue
.
use
(
NumberKeyboard
)
Vue
.
use
(
Notify
)
Vue
.
use
(
Notify
)
Vue
.
use
(
HlsModal
)
Vue
.
use
(
HlsModal
)
Vue
.
prototype
.
HlsModal
=
window
.
HlsModal
=
HlsModal
//
Vue.prototype.HlsModal = window.HlsModal = HlsModal
export
default
{
export
default
{
...
...
packages/common/styles/ionic-public-style.less
View file @
9d4b0361
...
@@ -54,44 +54,6 @@
...
@@ -54,44 +54,6 @@
padding-top: 0.8rem;
padding-top: 0.8rem;
}
}
}
}
.header-bar {
background-color: #FFFFFF;
border-bottom: 1px solid rgba(0, 0, 0, 0.1); /*no*/
.buttons {
.button {
color: @headerColor;
font-size: 0.32rem;
padding-left: 0.2rem;
padding-right: 0.25rem;
}
}
.title {
color: #4A4A4A;
font-size: 0.34rem;
//font-weight: 600;
left: 0 !important;
right: 0 !important;
}
.iconLeft {
text-align: left;
i {
font-size: 0.25rem;
padding-left: 0.1rem;
}
}
}
.bar-custom {
background-color: @headerColor;
border-bottom: none;
.buttons {
.button {
color: #ffffff;
}
}
.title {
color: #ffffff;
}
}
// ion-list he ion-item公用样式 -
// ion-list he ion-item公用样式 -
.content {
.content {
//padding-top: 2px;
//padding-top: 2px;
...
...
packages/components/HHeader/index.vue
View file @
9d4b0361
...
@@ -116,11 +116,12 @@ export default {
...
@@ -116,11 +116,12 @@ export default {
vertical-align: middle;
vertical-align: middle;
box-sizing: border-box;
box-sizing: border-box;
width: 80%;
width: 80%;
color:@headerColor;
}
}
.ion-ios-arrow-back {
.ion-ios-arrow-back {
font-size: 32px;
font-size: 32px;
color: @headerColor;
//
color: @headerColor;
}
}
}
}
...
@@ -128,13 +129,23 @@ export default {
...
@@ -128,13 +129,23 @@ export default {
.h-header-border {
.h-header-border {
border-bottom: 1px solid rgba(0, 0, 0, .1); /*no*/
border-bottom: 1px solid rgba(0, 0, 0, .1); /*no*/
}
}
.bar-custom {
.bar-custom {
.h-header-center, .h-header-btn {
background-color: @headerColor;
border-bottom: none;
.buttons {
.button {
color: #fff;
color: #fff;
}
}
}
.ion-ios-arrow-back {
.title {
color: #fff;
}
.h-header-left, .h-header-right{
.h-header-btn{
color: #fff;
}
}
.h-header-center{
color: #fff;
color: #fff;
}
}
}
}
...
...
packages/components/ListItem/Item.vue
View file @
9d4b0361
...
@@ -241,4 +241,25 @@ export default {
...
@@ -241,4 +241,25 @@ export default {
}
}
}
}
}
}
@media (device-width: 320px) and (device-height: 568px) {
.hls-item{
.contents{
.add-content{
.toggle-check {
.track {
.handle{
top:4px
}
}
}
.toggle.toggle-positive input:checked + .track{
.handle {
top:4px
}
}
}
}
}
}
</
style
>
</
style
>
packages/components/Switch/index.vue
View file @
9d4b0361
<
template
>
<
template
>
<label
<label
:class=
"cusClass"
class=
"toggle toggle-positive toggle-check"
:class=
"cusClass"
class=
"toggle toggle-positive toggle-check"
@
click=
"checked"
>
@
click
.
prevent
=
"checked"
>
<input
:checked=
"value"
:disabled=
"disable"
type=
"checkbox"
>
<input
:checked=
"value"
:disabled=
"disable"
type=
"checkbox"
>
<div
class=
"track"
>
<div
class=
"track"
>
<div
class=
"handle"
/>
<div
class=
"handle"
/>
...
@@ -31,11 +31,8 @@ export default {
...
@@ -31,11 +31,8 @@ export default {
// clickValue: false
// clickValue: false
}
}
},
},
computed
:
{
computed
:
{},
watch
:
{},
},
watch
:
{
},
methods
:
{
methods
:
{
checked
()
{
checked
()
{
if
(
!
this
.
disable
)
{
if
(
!
this
.
disable
)
{
...
@@ -47,14 +44,11 @@ export default {
...
@@ -47,14 +44,11 @@ export default {
}
}
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
>
@import "../../common/styles/variables";
@import "../../common/styles/variables";
.toggle-check {
.toggle-check {
display: -webkit-flex;
display: flex;
display: flex;
-webkit-justify-content: space-between;
justify-content: space-between;
justify-content: space-between;
-webkit-align-items: center;
align-items: center;
align-items: center;
.track {
.track {
...
@@ -62,6 +56,7 @@ export default {
...
@@ -62,6 +56,7 @@ export default {
height: 25px;
height: 25px;
margin-right: 2.5px;
margin-right: 2.5px;
border-radius: 15px;
border-radius: 15px;
.handle {
.handle {
width: 22.5px;
width: 22.5px;
height: 22.5px;
height: 22.5px;
...
@@ -82,4 +77,20 @@ export default {
...
@@ -82,4 +77,20 @@ export default {
left: 9px;
left: 9px;
}
}
}
}
@media (device-width: 320px) and (device-height: 568px) {
.toggle-check {
.track {
.handle {
top: 4px
}
}
.toggle.toggle-positive input:checked + .track {
.handle {
top: 4px
}
}
}
}
</
style
>
</
style
>
src/styles/variables.less
View file @
9d4b0361
...
@@ -10,14 +10,14 @@
...
@@ -10,14 +10,14 @@
/**
/**
* 颜色
* 颜色
*/
*/
@theme-color:#
5D98F6
;
@theme-color:#
0041C4
;
@font-color:#666666;
@font-color:#666666;
@mainColor: #000;
@mainColor: #000;
@baseColor: white;
@baseColor: white;
@hintColor:rgb(181,181,181);
@hintColor:rgb(181,181,181);
@headerColor:
#5D98F6
;
@headerColor:
@theme-color
;
@background-color-gray: #fafafa;
@background-color-gray: #fafafa;
@activated-color:
#5D98F6
;
@activated-color:
@theme-color
;
@divider-color:#fafafa;
@divider-color:#fafafa;
@switch-box-bg:#48D2A0;
@switch-box-bg:#48D2A0;
@check-box-bg:@theme-color;
@check-box-bg:@theme-color;
...
...
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