Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
muChangApp
Project
Project
Details
Activity
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
WitCloud
muChangApp
Commits
c6526952
Commit
c6526952
authored
Dec 13, 2019
by
yating.lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tab式样微调
parent
b73b1579
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
46 additions
and
11 deletions
+46
-11
config.xml
config.xml
+1
-1
env-detail.page.html
src/app/envCtrl/env-detail/env-detail.page.html
+6
-6
env-detail.page.scss
src/app/envCtrl/env-detail/env-detail.page.scss
+20
-2
env-home.page.html
src/app/envCtrl/env-home/env-home.page.html
+1
-1
tabs.page.html
src/app/envCtrl/tabs/tabs.page.html
+1
-1
variables.scss
src/theme/variables.scss
+17
-0
No files found.
config.xml
View file @
c6526952
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='utf-8'?>
<widget
id=
"com.witium.muchang.test"
version=
"2.9.6.6.
7
"
xmlns=
"http://www.w3.org/ns/widgets"
xmlns:cdv=
"http://cordova.apache.org/ns/1.0"
>
<widget
id=
"com.witium.muchang.test"
version=
"2.9.6.6.
8
"
xmlns=
"http://www.w3.org/ns/widgets"
xmlns:cdv=
"http://cordova.apache.org/ns/1.0"
>
<name>
牧场云
</name>
<name>
牧场云
</name>
<description>
test
</description>
<description>
test
</description>
<author
email=
"frank.feng@witium.com"
href=
"http://muchang.witium.com/"
>
Van.chen - frank.feng
</author>
<author
email=
"frank.feng@witium.com"
href=
"http://muchang.witium.com/"
>
Van.chen - frank.feng
</author>
...
...
src/app/envCtrl/env-detail/env-detail.page.html
View file @
c6526952
...
@@ -30,18 +30,18 @@
...
@@ -30,18 +30,18 @@
</ion-header>
</ion-header>
<ion-content
color=
"light"
>
<ion-content
color=
"light"
>
<ion-router-outlet></ion-router-outlet>
<ion-router-outlet></ion-router-outlet>
<ion-tabs
#
tabs
>
<ion-tabs>
<ion-tab-bar
slot=
"top"
mode=
"ios"
style=
"--border: 0px;"
>
<ion-tab-bar
slot=
"top"
mode=
"ios"
style=
"--border: 0px;
height: 30px;"
color=
"light-gray
"
>
<ion-tab-button
tab=
"fan"
class=
"tab
Selected
ion-segment-button"
>
<ion-tab-button
tab=
"fan"
class=
"tab
Btn
ion-segment-button"
>
<ion-label>
风机
</ion-label>
<ion-label>
风机
</ion-label>
</ion-tab-button>
</ion-tab-button>
<ion-tab-button
tab=
"shower"
class=
"tab
Selected
ion-segment-button"
[
routerLink
]="
showerLink
"
>
<!--[rootParams]="fieldRegionNo"-->
<ion-tab-button
tab=
"shower"
class=
"tab
Btn
ion-segment-button"
[
routerLink
]="
showerLink
"
>
<!--[rootParams]="fieldRegionNo"-->
<ion-label>
喷淋
</ion-label>
<ion-label>
喷淋
</ion-label>
</ion-tab-button>
</ion-tab-button>
<ion-tab-button
tab=
"light"
class=
"tab
Selected
ion-segment-button"
[
routerLink
]="
lightLink
"
>
<ion-tab-button
tab=
"light"
class=
"tab
Btn
ion-segment-button"
[
routerLink
]="
lightLink
"
>
<ion-label>
照明
</ion-label>
<ion-label>
照明
</ion-label>
</ion-tab-button>
</ion-tab-button>
<ion-tab-button
tab=
"waterchannel"
class=
"tab
Selected
ion-segment-button"
[
routerLink
]="
waterchannelLink
"
>
<ion-tab-button
tab=
"waterchannel"
class=
"tab
Btn
ion-segment-button"
[
routerLink
]="
waterchannelLink
"
>
<ion-label>
水槽
</ion-label>
<ion-label>
水槽
</ion-label>
</ion-tab-button>
</ion-tab-button>
</ion-tab-bar>
</ion-tab-bar>
...
...
src/app/envCtrl/env-detail/env-detail.page.scss
View file @
c6526952
...
@@ -57,10 +57,14 @@
...
@@ -57,10 +57,14 @@
.warmColor4
{
.warmColor4
{
color
:
#b22222
;
color
:
#b22222
;
}
}
.tab
Selected
{
.tab
Btn
{
// --background-focused: #62C7CC;
// --background-focused: #62C7CC;
--color-selected
:
#62C7CC
;
//
--color-selected: #62C7CC;
// --background: #62C7CC;
// --background: #62C7CC;
border-top-left-radius
:
5px
;
border-top-right-radius
:
6px
;
border-right
:
3px
solid
#f0f0f0
;
height
:
30px
;
}
}
.inHouseDiv
{
.inHouseDiv
{
...
@@ -78,3 +82,17 @@
...
@@ -78,3 +82,17 @@
height
:
35px
;
height
:
35px
;
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
.tab-selected
{
color
:
#ffffff
!
important
;
background-color
:
#62C7CC
;
}
.tab-unselected
{
color
:
#cecece
!
important
;
background-color
:
#dedede
;
}
src/app/envCtrl/env-home/env-home.page.html
View file @
c6526952
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<ion-buttons
slot=
"start"
>
<ion-buttons
slot=
"start"
>
<ion-back-button
mode=
"ios"
defaultHref=
"/index"
text=
""
></ion-back-button>
<ion-back-button
mode=
"ios"
defaultHref=
"/index"
text=
""
></ion-back-button>
</ion-buttons>
</ion-buttons>
<ion-searchbar
mode=
"ios"
color=
"light"
(
ionInput
)="
getItems
($
event
)"
debounce=
"1000"
style=
"height: 40px;"
placeholder=
"输入名称进行搜索"
></ion-searchbar>
<ion-searchbar
mode=
"ios"
color=
"light"
autocomplete=
"on"
(
ionInput
)="
getItems
($
event
)"
debounce=
"1000"
style=
"height: 40px;"
placeholder=
"输入名称进行搜索"
></ion-searchbar>
</ion-toolbar>
</ion-toolbar>
<!--<ion-slides style="width: 100%; height: 125px;" mode="ios"-->
<!--<ion-slides style="width: 100%; height: 125px;" mode="ios"-->
<!--[options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">-->
<!--[options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">-->
...
...
src/app/envCtrl/tabs/tabs.page.html
View file @
c6526952
<router-outlet
name=
'tabs'
(
activate
)='
onActivate
($
event
)'
></router-outlet>
<router-outlet
name=
'tabs'
></router-outlet>
<ion-content>
<ion-content>
<ion-tabs>
<ion-tabs>
<ion-tab-bar
slot=
"bottom"
>
<ion-tab-bar
slot=
"bottom"
>
...
...
src/theme/variables.scss
View file @
c6526952
...
@@ -103,6 +103,14 @@
...
@@ -103,6 +103,14 @@
--ion-color-gray-contrast-rgb
:
0
,
0
,
0
;
--ion-color-gray-contrast-rgb
:
0
,
0
,
0
;
--ion-color-gray-shade
:
#e0e0e0
;
--ion-color-gray-shade
:
#e0e0e0
;
--ion-color-gray-tint
:
#ffffff
;
--ion-color-gray-tint
:
#ffffff
;
/** light gray **/
--ion-color-light-gray
:
#dedee3
87
;
--ion-color-light-gray-rgb
:
239
,
239
,
244
;
--ion-color-light-gray-contrast
:
#000000
;
--ion-color-light-gray-contrast-rgb
:
0
,
0
,
0
;
--ion-color-light-gray-shade
:
#dedee3
;
--ion-color-light-gray-tint
:
#ffffff
;
}
}
.ion-color-white
{
.ion-color-white
{
...
@@ -122,3 +130,12 @@
...
@@ -122,3 +130,12 @@
--ion-color-shade
:
var
(
--
ion-color-gray-shade
);
--ion-color-shade
:
var
(
--
ion-color-gray-shade
);
--ion-color-tint
:
var
(
--
ion-color-gray-tint
);
--ion-color-tint
:
var
(
--
ion-color-gray-tint
);
}
}
.ion-color-light-gray
{
--ion-color-base
:
var
(
--
ion-color-light-gray
);
--ion-color-base-rgb
:
var
(
--
ion-color-light-gray-rgb
);
--ion-color-contrast
:
var
(
--
ion-color-light-gray-contrast
);
--ion-color-contrast-rgb
:
var
(
--
ion-color-light-gray-contrast-rgb
);
--ion-color-shade
:
var
(
--
ion-color-light-gray-shade
);
--ion-color-tint
:
var
(
--
ion-color-light-gray-tint
);
}
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