Skip to content

Commit 75a7cfb

Browse files
authored
Merge pull request #1683 from dxc-technology/rarrojolopez/twitter-app
Update Twitter branding by X branding in /app
2 parents f6d6be5 + cfe36d1 commit 75a7cfb

12 files changed

Lines changed: 144 additions & 7733 deletions

File tree

‎app/src/images/twitter-black.svg‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎app/src/images/twitter.svg‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎app/src/images/twitter_white.svg‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎app/src/images/x.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎app/src/pages/Card.jsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import { DxcCard } from "@dxc-technology/halstack-react";
3-
import twitterIcon from "../images/twitter.svg";
3+
import XIcon from "../images/x.svg";
44

55
function App() {
66
return (
@@ -33,38 +33,38 @@ function App() {
3333
<h4>Image Background Color</h4>
3434
<DxcCard
3535
imageBgColor="#6B4187"
36-
imageSrc={twitterIcon}
36+
imageSrc={XIcon}
3737
imagePadding="xxlarge"
3838
/>
3939
</div>
4040
<h4>Image Paddings</h4>
4141
<div className="test-case" id="xxsmall-imagePadding">
4242
<h4>xxsmall imagePadding</h4>
43-
<DxcCard imageSrc={twitterIcon} imagePadding="xxsmall" />
43+
<DxcCard imageSrc={XIcon} imagePadding="xxsmall" />
4444
</div>
4545
<div className="test-case" id="xsmall-imagePadding">
4646
<h4>xsmall imagePadding</h4>
47-
<DxcCard imageSrc={twitterIcon} imagePadding="xsmall" />
47+
<DxcCard imageSrc={XIcon} imagePadding="xsmall" />
4848
</div>
4949
<div className="test-case" id="small-imagePadding">
5050
<h4>small imagePadding</h4>
51-
<DxcCard imageSrc={twitterIcon} imagePadding="small" />
51+
<DxcCard imageSrc={XIcon} imagePadding="small" />
5252
</div>
5353
<div className="test-case" id="medium-imagePadding">
5454
<h4>medium imagePadding</h4>
55-
<DxcCard imageSrc={twitterIcon} imagePadding="medium" />
55+
<DxcCard imageSrc={XIcon} imagePadding="medium" />
5656
</div>
5757
<div className="test-case" id="large-imagePadding">
5858
<h4>large imagePadding</h4>
59-
<DxcCard imageSrc={twitterIcon} imagePadding="large" />
59+
<DxcCard imageSrc={XIcon} imagePadding="large" />
6060
</div>
6161
<div className="test-case" id="xlarge-imagePadding">
6262
<h4>xlarge imagePadding</h4>
63-
<DxcCard imageSrc={twitterIcon} imagePadding="xlarge" />
63+
<DxcCard imageSrc={XIcon} imagePadding="xlarge" />
6464
</div>
6565
<div className="test-case" id="xxlarge-imagePadding">
6666
<h4>xxlarge imagePadding</h4>
67-
<DxcCard imageSrc={twitterIcon} imagePadding="xxlarge" />
67+
<DxcCard imageSrc={XIcon} imagePadding="xxlarge" />
6868
</div>
6969
<h4>Margins</h4>
7070
<div className="test-case" id="xxsmall-margin">

‎app/src/pages/Dropdown.jsx‎

Lines changed: 53 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,40 @@ const colors = {
88
},
99
};
1010

11-
const facebookSVG = () => {
12-
return (
13-
<svg
14-
version="1.1"
15-
id="Capa_1"
16-
x="0px"
17-
y="0px"
18-
viewBox="0 0 438.536 438.536"
19-
fill="currentColor"
20-
>
21-
<g>
22-
<path
23-
d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
11+
const facebookSVG = (
12+
<svg
13+
version="1.1"
14+
id="Capa_1"
15+
x="0px"
16+
y="0px"
17+
viewBox="0 0 438.536 438.536"
18+
fill="currentColor"
19+
>
20+
<g>
21+
<path
22+
d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
2423
C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
2524
h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
2625
C438.532,59.576,430.49,40.204,414.41,24.123z M373.155,225.548h-49.963V406.84h-74.802V225.548H210.99V163.02h37.401v-37.402
2726
c0-26.838,6.283-47.107,18.843-60.813c12.559-13.706,33.304-20.555,62.242-20.555h49.963v62.526h-31.401
2827
c-10.663,0-17.467,1.853-20.417,5.568c-2.949,3.711-4.428,10.23-4.428,19.558v31.119h56.534L373.155,225.548z"
29-
/>
30-
</g>
31-
</svg>
32-
);
33-
};
28+
/>
29+
</g>
30+
</svg>
31+
);
3432

35-
const linkedinSVG = () => {
36-
return (
37-
<svg
38-
version="1.1"
39-
id="Capa_1"
40-
x="0px"
41-
y="0px"
42-
viewBox="0 0 438.536 438.536"
43-
fill="currentColor"
44-
>
45-
<g>
46-
<path
47-
d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
33+
const linkedinSVG = (
34+
<svg
35+
version="1.1"
36+
id="Capa_1"
37+
x="0px"
38+
y="0px"
39+
viewBox="0 0 438.536 438.536"
40+
fill="currentColor"
41+
>
42+
<g>
43+
<path
44+
d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
4845
C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
4946
h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
5047
C438.532,59.576,430.49,40.204,414.41,24.123z M133.618,367.157H67.666V169.016h65.952V367.157z M127.626,132.332
@@ -55,44 +52,28 @@ const linkedinSVG = () => {
5552
c-1.335,3.422-1.999,8.75-1.999,15.981v110.775h-65.952c0.571-119.529,0.571-185.579,0-198.142h65.952v27.974
5653
c13.867-21.681,33.558-32.544,59.101-32.544c22.84,0,41.21,7.52,55.104,22.554c13.895,15.037,20.841,37.214,20.841,66.519v113.64
5754
H370.873z"
58-
/>
59-
</g>
60-
</svg>
61-
);
62-
};
55+
/>
56+
</g>
57+
</svg>
58+
);
6359

64-
const twitterSVG = () => {
65-
return (
66-
<svg
67-
version="1.1"
68-
id="Capa_1"
69-
x="0px"
70-
y="0px"
71-
viewBox="0 0 438.536 438.536"
72-
fill="currentColor"
73-
>
74-
<g>
75-
<path
76-
d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
77-
C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
78-
h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
79-
C438.532,59.576,430.49,40.204,414.41,24.123z M335.471,168.735c0.191,1.713,0.288,4.278,0.288,7.71
80-
c0,15.989-2.334,32.025-6.995,48.104c-4.661,16.087-11.8,31.504-21.416,46.254c-9.606,14.749-21.074,27.791-34.396,39.115
81-
c-13.325,11.32-29.311,20.365-47.968,27.117c-18.648,6.762-38.637,10.143-59.953,10.143c-33.116,0-63.76-8.952-91.931-26.836
82-
c4.568,0.568,9.329,0.855,14.275,0.855c27.6,0,52.439-8.565,74.519-25.7c-12.941-0.185-24.506-4.179-34.688-11.991
83-
c-10.185-7.803-17.273-17.699-21.271-29.691c4.947,0.76,8.658,1.137,11.132,1.137c4.187,0,9.042-0.76,14.56-2.279
84-
c-13.894-2.669-25.598-9.562-35.115-20.697c-9.519-11.136-14.277-23.84-14.277-38.114v-0.571
85-
c10.085,4.755,19.602,7.229,28.549,7.422c-17.321-11.613-25.981-28.265-25.981-49.963c0-10.66,2.758-20.747,8.278-30.264
86-
c15.035,18.464,33.311,33.213,54.816,44.252c21.507,11.038,44.54,17.227,69.092,18.558c-0.95-3.616-1.427-8.186-1.427-13.704
87-
c0-16.562,5.853-30.692,17.56-42.399c11.703-11.706,25.837-17.561,42.394-17.561c17.515,0,32.079,6.283,43.688,18.846
88-
c13.134-2.474,25.892-7.33,38.26-14.56c-4.757,14.652-13.613,25.788-26.55,33.402c12.368-1.716,23.88-4.95,34.537-9.708
89-
C357.458,149.793,347.462,160.166,335.471,168.735z"
90-
/>
91-
</g>
92-
</svg>
93-
);
94-
};
95-
const more_hor = () => (
60+
const XSVG = (
61+
<svg
62+
width="256"
63+
height="256"
64+
viewBox="0 0 256 256"
65+
fill="none"
66+
xmlns="http://www.w3.org/2000/svg"
67+
>
68+
<rect width="256" height="256" rx="40" fill="white" />
69+
<path
70+
d="M140.192 118.205L187.848 64H176.556L135.158 111.056L102.117 64H64L113.975 135.163L64 192H75.2914L118.982 142.296L153.883 192H192L140.192 118.205ZM124.722 135.787L119.65 128.697L79.3634 72.3294H96.7094L129.232 117.837L134.282 124.927L176.551 184.076H159.205L124.722 135.787Z"
71+
fill="#0F1419"
72+
/>
73+
</svg>
74+
);
75+
76+
const more_hor = (
9677
<svg
9778
xmlns="http://www.w3.org/2000/svg"
9879
height="24px"
@@ -116,7 +97,7 @@ function App() {
11697
},
11798
{
11899
value: "2",
119-
label: "Twitter",
100+
label: "X",
120101
},
121102
{
122103
value: "3",
@@ -136,8 +117,8 @@ function App() {
136117
},
137118
{
138119
value: "3",
139-
label: "Twitter",
140-
icon: twitterSVG,
120+
label: "X",
121+
icon: XSVG,
141122
},
142123
];
143124

@@ -285,7 +266,7 @@ function App() {
285266
options={optionsWithIcon}
286267
icon={facebookSVG}
287268
onSelectOption={selectOption}
288-
label="Basic dropdown"
269+
label="Basic ddddddddropdown"
289270
margin="medium"
290271
></DxcDropdown>
291272
</div>

0 commit comments

Comments
 (0)