Skip to content

Commit 5440d57

Browse files
borsbors
committed
Auto merge of #3265 - Turbo87:tooltips, r=locks
VersionList::Row: Show feature names in tooltip <img width="967" alt="Bildschirmfoto 2021-02-09 um 19 48 38" src="https://user-images.githubusercontent.com/141300/107412421-ee340480-6b0f-11eb-8dcf-e7a6747d177f.png">
2 parents fe3bf43 + 5368de8 commit 5440d57

File tree

6 files changed

+130
-5
lines changed

6 files changed

+130
-5
lines changed

‎app/components/ember-tooltip.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import EmberTooltipComponent from 'ember-tooltips/components/ember-tooltip';
2+
3+
export default class extends EmberTooltipComponent {
4+
delay = 200;
5+
}

‎app/components/version-list/row.hbs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
...attributes
99
>
1010
<div local-class="version">
11-
<div title={{this.releaseTrackTitle}} local-class="release-track">
11+
<div local-class="release-track">
1212
{{#if @version.yanked}}
1313
{{svg-jar "trash"}}
1414
{{else if @version.isFirst}}
1515
{{svg-jar "star"}}
1616
{{else}}
1717
{{@version.releaseTrack}}
1818
{{/if}}
19+
20+
<EmberTooltip @text={{this.releaseTrackTitle}} @side="right" />
1921
</div>
2022

2123
<LinkTo
@@ -40,12 +42,13 @@
4042
{{/if}}
4143

4244
<time
43-
title={{date-format @version.created_at 'PPP'}}
4445
datetime={{date-format-iso @version.updated_at}}
4546
local-class="date {{if @version.isNew "new"}}"
4647
>
4748
{{svg-jar "calendar"}}
4849
{{date-format-distance-to-now @version.created_at addSuffix=true}}
50+
51+
<EmberTooltip @text={{date-format @version.created_at 'PPP'}} />
4952
</time>
5053
</div>
5154

@@ -66,6 +69,17 @@
6669
<span local-class="num-features">
6770
{{svg-jar "checkbox"}}
6871
{{@version.featureList.length}} Features
72+
73+
<EmberTooltip>
74+
<ul local-class="feature-list">
75+
{{#each @version.featureList as |feature|}}
76+
<li>
77+
{{svg-jar (if feature.isDefault "checkbox" "checkbox-empty")}}
78+
{{feature.name}}
79+
</li>
80+
{{/each}}
81+
</ul>
82+
</EmberTooltip>
6983
</span>
7084
{{/if}}
7185
</div>

‎app/components/version-list/row.module.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
--fg-color: hsl(0, 84%, 32%);
3737
}
3838

39-
[title] {
39+
[title], :global(.ember-tooltip-target) {
4040
position: relative;
4141
z-index: 1;
4242
cursor: help;
@@ -126,6 +126,11 @@
126126
margin-right: 2px;
127127
margin-bottom: -.1em;
128128
}
129+
130+
:global(.ember-tooltip) {
131+
text-transform: none;
132+
letter-spacing: normal;
133+
}
129134
}
130135

131136
.avatar {
@@ -167,6 +172,12 @@
167172
font-variant-numeric: tabular-nums;
168173
}
169174

175+
.feature-list {
176+
padding: 0;
177+
margin: 10px 5px;
178+
list-style: none;
179+
}
180+
170181
.yank-button {
171182
position: relative;
172183
margin-left: 10px;

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"ember-svg-jar": "2.2.3",
105105
"ember-template-lint": "2.18.1",
106106
"ember-test-selectors": "5.0.0",
107+
"ember-tooltips": "^3.4.6",
107108
"ember-truth-helpers": "3.0.0",
108109
"ember-web-app": "5.0.1",
109110
"ember-window-mock": "0.7.2",

‎public/assets/checkbox-empty.svg

Lines changed: 60 additions & 0 deletions
Loading

‎yarn.lock

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4278,6 +4278,11 @@ broccoli-source@^1.1.0:
42784278
resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
42794279
integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
42804280

4281+
broccoli-source@^2.0.0:
4282+
version "2.1.2"
4283+
resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
4284+
integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
4285+
42814286
broccoli-source@^3.0.0:
42824287
version "3.0.0"
42834288
resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
@@ -6784,7 +6789,7 @@ ember-get-config@^0.2.4, "ember-get-config@^0.2.4 || ^0.3.0":
67846789
broccoli-file-creator "^1.1.1"
67856790
ember-cli-babel "^6.3.0"
67866791

6787-
ember-in-element-polyfill@^1.0.0:
6792+
ember-in-element-polyfill@^1.0.0, ember-in-element-polyfill@^1.0.1:
67886793
version "1.0.1"
67896794
resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.1.tgz#143504445bb4301656a2eaad42644d684f5164dd"
67906795
integrity sha512-eHs+7D7PuQr8a1DPqsJTsEyo3FZ1XuH6WEZaEBPDa9s0xLlwByCNKl8hi1EbXOgvgEZNHHi9Rh0vjxyfakrlgg==
@@ -7044,6 +7049,23 @@ [email protected]:
70447049
ember-cli-babel "^7.22.1"
70457050
ember-cli-version-checker "^5.1.1"
70467051

7052+
ember-tooltips@^3.4.6:
7053+
version "3.4.6"
7054+
resolved "https://registry.yarnpkg.com/ember-tooltips/-/ember-tooltips-3.4.6.tgz#a6fa7f8c73843f4048e3763892b38e90f203e05b"
7055+
integrity sha512-MnbxlT2IqeraFnKg/oNDWUZeinf1Sz6CFKzxehektxlNn550JKWNUd3CHlHCiUfbiLuE9GEtJzFBPel+g/Q2hg==
7056+
dependencies:
7057+
broccoli-file-creator "^2.1.1"
7058+
broccoli-funnel "^2.0.2"
7059+
broccoli-merge-trees "^2.0.0"
7060+
broccoli-source "^2.0.0"
7061+
broccoli-string-replace "^0.1.2"
7062+
ember-cli-babel "^7.23.0"
7063+
ember-cli-htmlbars "^4.2.0"
7064+
ember-in-element-polyfill "^1.0.1"
7065+
popper.js "^1.12.5"
7066+
resolve "^1.10.1"
7067+
tooltip.js "^1.1.5"
7068+
70477069
[email protected]:
70487070
version "3.0.0"
70497071
resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-3.0.0.tgz#86766bdca4ac9b86bce3d262dff2aabc4a0ea384"
@@ -11627,6 +11649,11 @@ pluralize@^8.0.0:
1162711649
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
1162811650
integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
1162911651

11652+
popper.js@^1.0.2, popper.js@^1.12.5:
11653+
version "1.16.1"
11654+
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
11655+
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
11656+
1163011657
portfinder@^1.0.28:
1163111658
version "1.0.28"
1163211659
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -12745,7 +12772,7 @@ resolve-url@^0.2.1:
1274512772
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1274612773
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1274712774

12748-
resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
12775+
resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.0, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
1274912776
version "1.19.0"
1275012777
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
1275112778
integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -14015,6 +14042,13 @@ [email protected]:
1401514042
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
1401614043
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
1401714044

14045+
tooltip.js@^1.1.5:
14046+
version "1.3.3"
14047+
resolved "https://registry.yarnpkg.com/tooltip.js/-/tooltip.js-1.3.3.tgz#2ad0d77bb6776a76e117eac0afcd3c7d3a237121"
14048+
integrity sha512-XWWuy/dBdF/F/YpRE955yqBZ4VdLfiTAUdOqoU+wJm6phJlMpEzl/iYHZ+qJswbeT9VG822bNfsETF9wzmoy5A==
14049+
dependencies:
14050+
popper.js "^1.0.2"
14051+
1401814052
toposort@^1.0.6:
1401914053
version "1.0.7"
1402014054
resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"

0 commit comments

Comments
 (0)