Skip to content

Commit 1683731

Browse files
ShaneKShaneK
committed
chore(toolbar): lint fix
1 parent faf2640 commit 1683731

File tree

4 files changed

+150
-183
lines changed

4 files changed

+150
-183
lines changed

‎core/src/components/segment/test/toolbar/index.html‎

Lines changed: 133 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -16,180 +16,145 @@
1616

1717
<body onload="listenForEvent()">
1818
<ion-app>
19-
<ion-toolbar>
20-
<ion-segment value="a">
21-
<ion-segment-button value="a">
22-
<ion-label>First</ion-label>
23-
</ion-segment-button>
24-
<ion-segment-button value="b">
25-
<ion-label>Second</ion-label>
26-
</ion-segment-button>
27-
<ion-segment-button value="c">
28-
<ion-label>Third</ion-label>
29-
</ion-segment-button>
30-
</ion-segment>
31-
<ion-buttons slot="start">
32-
<ion-button id="button" color="primary" fill="solid">
33-
Start
34-
</ion-button>
35-
</ion-buttons>
36-
</ion-toolbar>
19+
<ion-toolbar>
20+
<ion-segment value="a">
21+
<ion-segment-button value="a">
22+
<ion-label>First</ion-label>
23+
</ion-segment-button>
24+
<ion-segment-button value="b">
25+
<ion-label>Second</ion-label>
26+
</ion-segment-button>
27+
<ion-segment-button value="c">
28+
<ion-label>Third</ion-label>
29+
</ion-segment-button>
30+
</ion-segment>
31+
<ion-buttons slot="start">
32+
<ion-button id="button" color="primary" fill="solid"> Start </ion-button>
33+
</ion-buttons>
34+
</ion-toolbar>
3735

38-
<ion-toolbar>
39-
<ion-segment value="a">
40-
<ion-segment-button value="a">
41-
<ion-label>First</ion-label>
42-
</ion-segment-button>
43-
<ion-segment-button value="b">
44-
<ion-label>Second</ion-label>
45-
</ion-segment-button>
46-
<ion-segment-button value="c">
47-
<ion-label>Third</ion-label>
48-
</ion-segment-button>
49-
</ion-segment>
50-
<ion-buttons slot="end">
51-
<ion-button id="button" color="primary" fill="solid">
52-
End
53-
</ion-button>
54-
</ion-buttons>
55-
</ion-toolbar>
36+
<ion-toolbar>
37+
<ion-segment value="a">
38+
<ion-segment-button value="a">
39+
<ion-label>First</ion-label>
40+
</ion-segment-button>
41+
<ion-segment-button value="b">
42+
<ion-label>Second</ion-label>
43+
</ion-segment-button>
44+
<ion-segment-button value="c">
45+
<ion-label>Third</ion-label>
46+
</ion-segment-button>
47+
</ion-segment>
48+
<ion-buttons slot="end">
49+
<ion-button id="button" color="primary" fill="solid"> End </ion-button>
50+
</ion-buttons>
51+
</ion-toolbar>
5652

57-
<ion-toolbar>
58-
<ion-segment value="a">
59-
<ion-segment-button value="a">
60-
<ion-label>First</ion-label>
61-
</ion-segment-button>
62-
<ion-segment-button value="b">
63-
<ion-label>Second</ion-label>
64-
</ion-segment-button>
65-
<ion-segment-button value="c">
66-
<ion-label>Third</ion-label>
67-
</ion-segment-button>
68-
</ion-segment>
69-
<ion-buttons slot="start">
70-
<ion-button id="button" color="primary" fill="solid">
71-
Start
72-
</ion-button>
73-
</ion-buttons>
74-
<ion-buttons slot="end">
75-
<ion-button id="button" color="primary" fill="solid">
76-
End
77-
</ion-button>
78-
</ion-buttons>
79-
</ion-toolbar>
53+
<ion-toolbar>
54+
<ion-segment value="a">
55+
<ion-segment-button value="a">
56+
<ion-label>First</ion-label>
57+
</ion-segment-button>
58+
<ion-segment-button value="b">
59+
<ion-label>Second</ion-label>
60+
</ion-segment-button>
61+
<ion-segment-button value="c">
62+
<ion-label>Third</ion-label>
63+
</ion-segment-button>
64+
</ion-segment>
65+
<ion-buttons slot="start">
66+
<ion-button id="button" color="primary" fill="solid"> Start </ion-button>
67+
</ion-buttons>
68+
<ion-buttons slot="end">
69+
<ion-button id="button" color="primary" fill="solid"> End </ion-button>
70+
</ion-buttons>
71+
</ion-toolbar>
8072

81-
<ion-toolbar color="primary">
82-
<ion-segment value="a">
83-
<ion-segment-button value="a">
84-
<ion-label>First</ion-label>
85-
</ion-segment-button>
86-
<ion-segment-button value="b">
87-
<ion-label>Second</ion-label>
88-
</ion-segment-button>
89-
<ion-segment-button value="c" disabled="true">
90-
<ion-label>Third</ion-label>
91-
</ion-segment-button>
92-
</ion-segment>
93-
<ion-buttons slot="secondary">
94-
<ion-button id="button" color="primary" fill="solid">
95-
Secondary
96-
</ion-button>
97-
</ion-buttons>
98-
<ion-buttons slot="primary">
99-
<ion-button id="button" color="primary" fill="solid">
100-
Primary
101-
</ion-button>
102-
</ion-buttons>
103-
</ion-toolbar>
73+
<ion-toolbar color="primary">
74+
<ion-segment value="a">
75+
<ion-segment-button value="a">
76+
<ion-label>First</ion-label>
77+
</ion-segment-button>
78+
<ion-segment-button value="b">
79+
<ion-label>Second</ion-label>
80+
</ion-segment-button>
81+
<ion-segment-button value="c" disabled="true">
82+
<ion-label>Third</ion-label>
83+
</ion-segment-button>
84+
</ion-segment>
85+
<ion-buttons slot="secondary">
86+
<ion-button id="button" color="primary" fill="solid"> Secondary </ion-button>
87+
</ion-buttons>
88+
<ion-buttons slot="primary">
89+
<ion-button id="button" color="primary" fill="solid"> Primary </ion-button>
90+
</ion-buttons>
91+
</ion-toolbar>
10492

105-
<ion-toolbar color="light">
106-
<ion-segment value="a">
107-
<ion-segment-button value="a">
108-
<ion-label>First</ion-label>
109-
</ion-segment-button>
110-
<ion-segment-button value="b">
111-
<ion-label>Second</ion-label>
112-
</ion-segment-button>
113-
<ion-segment-button value="c" disabled="true">
114-
<ion-label>Third</ion-label>
115-
</ion-segment-button>
116-
</ion-segment>
117-
<ion-buttons slot="start">
118-
<ion-button id="button" color="primary" fill="solid">
119-
Start
120-
</ion-button>
121-
</ion-buttons>
122-
<ion-buttons slot="secondary">
123-
<ion-button id="button" color="primary" fill="solid">
124-
Secondary
125-
</ion-button>
126-
</ion-buttons>
127-
</ion-toolbar>
93+
<ion-toolbar color="light">
94+
<ion-segment value="a">
95+
<ion-segment-button value="a">
96+
<ion-label>First</ion-label>
97+
</ion-segment-button>
98+
<ion-segment-button value="b">
99+
<ion-label>Second</ion-label>
100+
</ion-segment-button>
101+
<ion-segment-button value="c" disabled="true">
102+
<ion-label>Third</ion-label>
103+
</ion-segment-button>
104+
</ion-segment>
105+
<ion-buttons slot="start">
106+
<ion-button id="button" color="primary" fill="solid"> Start </ion-button>
107+
</ion-buttons>
108+
<ion-buttons slot="secondary">
109+
<ion-button id="button" color="primary" fill="solid"> Secondary </ion-button>
110+
</ion-buttons>
111+
</ion-toolbar>
128112

129-
<ion-toolbar color="medium">
130-
<ion-segment value="a">
131-
<ion-segment-button value="a">
132-
<ion-label>First</ion-label>
133-
</ion-segment-button>
134-
<ion-segment-button value="b">
135-
<ion-label>Second</ion-label>
136-
</ion-segment-button>
137-
<ion-segment-button value="c" disabled="true">
138-
<ion-label>Third</ion-label>
139-
</ion-segment-button>
140-
</ion-segment>
141-
<ion-buttons slot="primary">
142-
<ion-button id="button" color="primary" fill="solid">
143-
Primary
144-
</ion-button>
145-
</ion-buttons>
146-
<ion-buttons slot="end">
147-
<ion-button id="button" color="primary" fill="solid">
148-
End
149-
</ion-button>
150-
</ion-buttons>
151-
</ion-toolbar>
113+
<ion-toolbar color="medium">
114+
<ion-segment value="a">
115+
<ion-segment-button value="a">
116+
<ion-label>First</ion-label>
117+
</ion-segment-button>
118+
<ion-segment-button value="b">
119+
<ion-label>Second</ion-label>
120+
</ion-segment-button>
121+
<ion-segment-button value="c" disabled="true">
122+
<ion-label>Third</ion-label>
123+
</ion-segment-button>
124+
</ion-segment>
125+
<ion-buttons slot="primary">
126+
<ion-button id="button" color="primary" fill="solid"> Primary </ion-button>
127+
</ion-buttons>
128+
<ion-buttons slot="end">
129+
<ion-button id="button" color="primary" fill="solid"> End </ion-button>
130+
</ion-buttons>
131+
</ion-toolbar>
152132

153-
<ion-toolbar color="dark">
154-
<ion-segment value="a">
155-
<ion-segment-button value="a">
156-
<ion-label>First</ion-label>
157-
</ion-segment-button>
158-
<ion-segment-button value="b">
159-
<ion-label>Second</ion-label>
160-
</ion-segment-button>
161-
<ion-segment-button value="c" disabled="true">
162-
<ion-label>Third</ion-label>
163-
</ion-segment-button>
164-
</ion-segment>
165-
<ion-buttons slot="start">
166-
<ion-button id="button" color="primary" fill="solid">
167-
Start
168-
</ion-button>
169-
</ion-buttons>
170-
<ion-buttons slot="secondary">
171-
<ion-button id="button" color="primary" fill="solid">
172-
Secondary
173-
</ion-button>
174-
</ion-buttons>
175-
<ion-buttons slot="primary">
176-
<ion-button id="button" color="primary" fill="solid">
177-
Primary
178-
</ion-button>
179-
</ion-buttons>
180-
<ion-buttons slot="end">
181-
<ion-button id="button" color="primary" fill="solid">
182-
End
183-
</ion-button>
184-
</ion-buttons>
185-
</ion-toolbar>
186-
187-
<script>
188-
</script>
189-
</ion-content>
190-
191-
<style>
192-
</style>
133+
<ion-toolbar color="dark">
134+
<ion-segment value="a">
135+
<ion-segment-button value="a">
136+
<ion-label>First</ion-label>
137+
</ion-segment-button>
138+
<ion-segment-button value="b">
139+
<ion-label>Second</ion-label>
140+
</ion-segment-button>
141+
<ion-segment-button value="c" disabled="true">
142+
<ion-label>Third</ion-label>
143+
</ion-segment-button>
144+
</ion-segment>
145+
<ion-buttons slot="start">
146+
<ion-button id="button" color="primary" fill="solid"> Start </ion-button>
147+
</ion-buttons>
148+
<ion-buttons slot="secondary">
149+
<ion-button id="button" color="primary" fill="solid"> Secondary </ion-button>
150+
</ion-buttons>
151+
<ion-buttons slot="primary">
152+
<ion-button id="button" color="primary" fill="solid"> Primary </ion-button>
153+
</ion-buttons>
154+
<ion-buttons slot="end">
155+
<ion-button id="button" color="primary" fill="solid"> End </ion-button>
156+
</ion-buttons>
157+
</ion-toolbar>
193158
</ion-app>
194159
</body>
195160
</html>

‎core/src/components/toolbar/test/basic/index.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@
9494
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
9595
</ion-button>
9696
</ion-buttons>
97-
<ion-title> This is a long title with start
98-
and end buttons.
99-
It just goes on and on my friend. </ion-title>
97+
<ion-title> This is a long title with start and end buttons. It just goes on and on my friend. </ion-title>
10098
</ion-toolbar>
10199

102100
<ion-toolbar>
@@ -113,7 +111,9 @@
113111
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
114112
</ion-button>
115113
</ion-buttons>
116-
<ion-title> This is a long title with start and primary buttons. It just goes on and on my friend. </ion-title>
114+
<ion-title>
115+
This is a long title with start and primary buttons. It just goes on and on my friend.
116+
</ion-title>
117117
</ion-toolbar>
118118

119119
<ion-toolbar>
@@ -130,7 +130,9 @@
130130
<ion-icon slot="icon-only" ios="ellipsis-horizontal" md="ellipsis-vertical"></ion-icon>
131131
</ion-button>
132132
</ion-buttons>
133-
<ion-title> This is a long title with secondary and end buttons. It just goes on and on my friend. </ion-title>
133+
<ion-title>
134+
This is a long title with secondary and end buttons. It just goes on and on my friend.
135+
</ion-title>
134136
</ion-toolbar>
135137

136138
<ion-toolbar>

‎core/src/components/toolbar/toolbar.ionic.scss‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
.toolbar-content {
2626
flex: 1 1 auto;
27+
2728
min-width: 0;
2829
}
2930

@@ -55,32 +56,39 @@
5556
:host(.has-end-content) slot[name="end"],
5657
:host(.show-end) slot[name="end"] {
5758
display: flex;
59+
5860
flex: 1 1 0;
5961
gap: globals.$ion-space-200;
62+
6063
justify-content: flex-end;
64+
6165
text-align: end;
6266
}
6367

6468
:host(.has-start-content) slot[name="start"],
6569
:host(.show-start) slot[name="start"] {
6670
display: flex;
71+
6772
flex: 1 1 0;
6873
gap: globals.$ion-space-200;
6974
}
7075

7176
:host(.has-primary-content) slot[name="primary"],
7277
:host(.show-primary) slot[name="primary"] {
7378
display: flex;
79+
7480
flex: 1 1 0;
7581
gap: globals.$ion-space-200;
82+
7683
justify-content: flex-end;
84+
7785
text-align: end;
7886
}
7987

8088
:host(.has-secondary-content) slot[name="secondary"],
8189
:host(.show-secondary) slot[name="secondary"] {
8290
display: flex;
91+
8392
flex: 1 1 0;
8493
gap: globals.$ion-space-200;
8594
}
86-

0 commit comments

Comments
 (0)