Skip to content

Commit ceeeb9e

Browse files
committed
feat: [Request] QTimeline always one-sided quasarframework#2324
1 parent b5261d9 commit ceeeb9e

File tree

3 files changed

+65
-59
lines changed

3 files changed

+65
-59
lines changed

dev/components/components/timeline.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="layout-padding" style="max-width: 800px">
3-
<q-timeline color="secondary" style="padding: 0 24px;">
3+
<q-timeline responsive color="secondary" style="padding: 0 24px;">
44
<q-timeline-entry heading>November, 2017</q-timeline-entry>
55

66
<q-timeline-entry
@@ -79,7 +79,7 @@
7979
</q-timeline-entry>
8080
</q-timeline>
8181

82-
<q-timeline color="red" dark class="bg-black" style="padding: 24px; margin-top: 50px;">
82+
<q-timeline responsive color="red" dark class="bg-black" style="padding: 24px; margin-top: 50px;">
8383
<q-timeline-entry
8484
title="Event Title"
8585
subtitle="February 22, 1986"

src/components/timeline/QTimeline.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ export default {
1010
type: String,
1111
default: 'primary'
1212
},
13+
responsive: Boolean,
1314
dark: Boolean
1415
},
1516
render (h) {
1617
return h('ul', {
1718
staticClass: 'q-timeline',
18-
'class': { 'q-timeline-dark': this.dark }
19+
'class': {
20+
'q-timeline-dark': this.dark,
21+
'q-timeline-responsive': this.responsive
22+
}
1923
}, this.$slots.default)
2024
}
2125
}

src/components/timeline/timeline.mat.styl

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -97,62 +97,64 @@
9797
margin 0
9898

9999
@media (min-width $breakpoint-md-min) and (max-width $breakpoint-md-max)
100-
.q-timeline-heading
101-
display table-row
102-
font-size 200%
103-
> div
100+
.q-timeline-responsive
101+
.q-timeline-heading
102+
display table-row
103+
font-size 200%
104+
> div
105+
display table-cell
106+
.q-timeline-heading-title
107+
margin-left -50px
108+
.q-timeline
109+
display table
110+
.q-timeline-entry
111+
display table-row
112+
padding 0
113+
.q-timeline-subtitle, .q-timeline-dot, .q-timeline-content
104114
display table-cell
105-
.q-timeline-heading-title
106-
margin-left -50px
107-
.q-timeline
108-
display table
109-
.q-timeline-entry
110-
display table-row
111-
padding 0
112-
.q-timeline-subtitle, .q-timeline-dot, .q-timeline-content
113-
display table-cell
114-
vertical-align top
115-
.q-timeline-subtitle
116-
text-align right
117-
width 35%
118-
.q-timeline-dot
119-
position relative
120-
.q-timeline-content
121-
padding-left 30px
122-
.q-timeline-entry-with-icon .q-timeline-content
123-
padding-top 8px
124-
.q-timeline-subtitle
125-
padding-right 30px
115+
vertical-align top
116+
.q-timeline-subtitle
117+
text-align right
118+
width 35%
119+
.q-timeline-dot
120+
position relative
121+
.q-timeline-content
122+
padding-left 30px
123+
.q-timeline-entry-with-icon .q-timeline-content
124+
padding-top 8px
125+
.q-timeline-subtitle
126+
padding-right 30px
126127

127128
@media (min-width $breakpoint-lg-min)
128-
.q-timeline-heading-title
129-
text-align center
130-
margin-left 0
131-
.q-timeline-entry, .q-timeline-subtitle, .q-timeline-dot, .q-timeline-content
132-
display block
133-
margin 0
134-
padding 0
135-
.q-timeline-dot
136-
position absolute
137-
left 50%
138-
margin-left -7.15px
139-
.q-timeline-entry-with-icon .q-timeline-dot
140-
left 50%
141-
margin-left -15px
142-
.q-timeline-subtitle, .q-timeline-content
143-
width 50%
144-
.q-timeline-entry-left .q-timeline-content,
145-
.q-timeline-entry-right .q-timeline-subtitle
146-
float left
147-
padding-right 30px
148-
text-align right
149-
.q-timeline-entry-left .q-timeline-subtitle,
150-
.q-timeline-entry-right .q-timeline-content
151-
float right
152-
text-align left
153-
padding-left 30px
154-
.q-timeline-entry-with-icon .q-timeline-content
155-
padding-top 8px
156-
.q-timeline-entry
157-
padding-bottom 24px
158-
overflow hidden
129+
.q-timeline-responsive
130+
.q-timeline-heading-title
131+
text-align center
132+
margin-left 0
133+
.q-timeline-entry, .q-timeline-subtitle, .q-timeline-dot, .q-timeline-content
134+
display block
135+
margin 0
136+
padding 0
137+
.q-timeline-dot
138+
position absolute
139+
left 50%
140+
margin-left -7.15px
141+
.q-timeline-entry-with-icon .q-timeline-dot
142+
left 50%
143+
margin-left -15px
144+
.q-timeline-subtitle, .q-timeline-content
145+
width 50%
146+
.q-timeline-entry-left .q-timeline-content,
147+
.q-timeline-entry-right .q-timeline-subtitle
148+
float left
149+
padding-right 30px
150+
text-align right
151+
.q-timeline-entry-left .q-timeline-subtitle,
152+
.q-timeline-entry-right .q-timeline-content
153+
float right
154+
text-align left
155+
padding-left 30px
156+
.q-timeline-entry-with-icon .q-timeline-content
157+
padding-top 8px
158+
.q-timeline-entry
159+
padding-bottom 24px
160+
overflow hidden

0 commit comments

Comments
 (0)