Skip to content

Commit 6d6244e

Browse files
stan-osipovstan-osipov
authored
Merge pull request #3 from StansAssets/aboutTab-hyperlink
fix: changed VisualElement to Hyperlink
2 parents b9049d4 + 8ff4829 commit 6d6244e

File tree

2 files changed

+139
-152
lines changed

2 files changed

+139
-152
lines changed

‎com.stansassets.plugins-dev-kit/Editor/UIToolkit/AboutTab/AboutTab.uss‎

Lines changed: 97 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,98 @@
1-
SettingsBlock {
2-
flex-shrink: 0;
3-
}
4-
5-
.hyperlink {
6-
background-color: initial;
7-
border-width: 0;
8-
margin: 0;
9-
width: auto;
10-
flex-shrink: 0;
11-
flex-direction: row;
12-
}
13-
14-
.hyperlink:hover {
15-
border-bottom-width: 1px;
16-
}
17-
18-
.description {
19-
flex-wrap: wrap;
20-
flex-shrink: 0;
21-
}
22-
23-
.icon {
24-
width: 16px;
25-
height: 16px;
26-
flex-shrink: 0;
27-
}
28-
29-
.icon-game {
30-
background-image: url('Resources/game.png');
31-
}
32-
33-
.icon-plugin {
34-
background-image: url('Resources/plugin.png');
35-
}
36-
37-
.icon-team {
38-
background-image: url('Resources/team.png');
39-
}
40-
41-
.icon-linkedin {
42-
background-image: url('Resources/linkedin.png');
43-
}
44-
45-
.icon-twitter {
46-
background-image: url('Resources/twitter.png');
47-
}
48-
49-
.icon-facebook {
50-
background-image: url('Resources/facebook.png');
51-
}
52-
53-
.icon-youtube {
54-
background-image: url('Resources/youtube.png');
55-
}
56-
57-
.icon-google-plus {
58-
background-image: url('Resources/google-plus.png');
59-
}
60-
61-
.icon-twitch {
62-
background-image: url('Resources/twitch.png');
63-
}
64-
65-
.contact-text {
66-
padding: 0 0 0 6px;
67-
}
68-
69-
.contact-container {
70-
margin: 0 13px 0 13px;
71-
flex-direction: row;
72-
flex-wrap: wrap;
73-
}
74-
75-
.contact-element {
76-
margin-top: 10px;
77-
flex-direction: row;
78-
margin-right: 5px;
79-
min-height: 20px;
80-
flex-shrink: 0;
81-
width: 100px;
82-
}
83-
84-
.logo-container {
85-
margin-top: 5px;
86-
width: 200px;
87-
height: 59px;
88-
}
89-
90-
.icon-logo {
91-
background-image: url('Resources/sa_logo_small.png');
92-
width: 200px;
93-
height: 59px;
94-
}
95-
96-
.mail {
97-
-unity-font-style: bold;
98-
margin-left: 10px;
99-
-unity-text-align: middle-left;
100-
flex-shrink: 0;
101-
flex-grow: 0;
102-
/*margin-right: 68%;*/
103-
}
104-
105-
.mail:hover {
106-
border-width: 0;
107-
}
108-
109-
.row {
110-
flex-direction: row;
1+
SettingsBlock {
2+
flex-shrink: 0;
3+
}
4+
5+
.description {
6+
flex-wrap: wrap;
7+
flex-shrink: 0;
8+
}
9+
10+
.icon {
11+
width: 16px;
12+
height: 16px;
13+
flex-shrink: 0;
14+
}
15+
16+
.icon-game {
17+
background-image: url('Resources/game.png');
18+
}
19+
20+
.icon-plugin {
21+
background-image: url('Resources/plugin.png');
22+
}
23+
24+
.icon-team {
25+
background-image: url('Resources/team.png');
26+
}
27+
28+
.icon-linkedin {
29+
background-image: url('Resources/linkedin.png');
30+
}
31+
32+
.icon-twitter {
33+
background-image: url('Resources/twitter.png');
34+
}
35+
36+
.icon-facebook {
37+
background-image: url('Resources/facebook.png');
38+
}
39+
40+
.icon-youtube {
41+
background-image: url('Resources/youtube.png');
42+
}
43+
44+
.icon-google-plus {
45+
background-image: url('Resources/google-plus.png');
46+
}
47+
48+
.icon-twitch {
49+
background-image: url('Resources/twitch.png');
50+
}
51+
52+
.contact-text {
53+
padding: 0 0 0 6px;
54+
}
55+
56+
.contact-container {
57+
margin: 0 13px 0 13px;
58+
flex-direction: row;
59+
flex-wrap: wrap;
60+
}
61+
62+
.contact-element {
63+
margin-top: 10px;
64+
flex-direction: row;
65+
margin-right: 5px;
66+
min-height: 20px;
67+
flex-shrink: 0;
68+
width: 100px;
69+
}
70+
71+
.logo-container {
72+
margin-top: 5px;
73+
width: 200px;
74+
height: 59px;
75+
}
76+
77+
.icon-logo {
78+
background-image: url('Resources/sa_logo_small.png');
79+
width: 200px;
80+
height: 59px;
81+
}
82+
83+
.mail {
84+
-unity-font-style: bold;
85+
margin-left: 10px;
86+
-unity-text-align: middle-left;
87+
flex-shrink: 0;
88+
flex-grow: 0;
89+
/*margin-right: 68%;*/
90+
}
91+
92+
.mail:hover {
93+
border-width: 0;
94+
}
95+
96+
.row {
97+
flex-direction: row;
11198
}

‎com.stansassets.plugins-dev-kit/Editor/UIToolkit/AboutTab/AboutTab.uxml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@
1919

2020
<!--Our Games-->
2121
<ui:VisualElement class="contact-element">
22-
<ui:Button class="hyperlink" name="GamesElement"
23-
link="https://stansassets.com/#portfolio">
22+
<sa:Hyperlink name="GamesElement"
23+
link="https://stansassets.com/#portfolio">
2424
<ui:Label text="" name="GamesIcon" class="icon icon-game"/>
2525
<ui:Label text="Our Games" name="GamesText" class="contact-text"/>
26-
</ui:Button>
26+
</sa:Hyperlink>
2727
</ui:VisualElement>
2828

2929
<!--Our Plugins-->
3030
<ui:VisualElement class="contact-element">
31-
<ui:Button class="hyperlink" name="PluginsElement"
32-
link="https://assetstore.unity.com/publishers/2256">
31+
<sa:Hyperlink name="PluginsElement"
32+
link="https://assetstore.unity.com/publishers/2256">
3333
<ui:Label text="" name="PluginsIcon" class="icon icon-plugin"/>
3434
<ui:Label text="Our Plugins" name="PluginsText" class="contact-text"/>
35-
</ui:Button>
35+
</sa:Hyperlink>
3636
</ui:VisualElement>
3737

3838
<!--Our Team-->
3939
<ui:VisualElement class="contact-element">
40-
<ui:Button class="hyperlink" name="TeamElement"
41-
link="https://stansassets.com/#our-team">
40+
<sa:Hyperlink name="TeamElement"
41+
link="https://stansassets.com/#our-team">
4242
<ui:Label text="" name="TeamIcon" class="icon icon-team"/>
4343
<ui:Label text="Our Team" name="TeamText" class="contact-text"/>
44-
</ui:Button>
44+
</sa:Hyperlink>
4545
</ui:VisualElement>
4646
</ui:VisualElement>
4747

@@ -52,87 +52,87 @@
5252
<ui:Label
5353
text="If you have any technical issues or questions, do not hesitate to drop us a message at:"
5454
name="descriptionWhatWeDo" class="description"/>
55-
<ui:Button
56-
text="[email protected]"
57-
name="supportEmail" class="hyperlink mail"/>
55+
<ui:VisualElement class="mail">
56+
<sa:Hyperlink link="mailto:[email protected]" name="supportEmail">
57+
<ui:Label text="[email protected]" name="supportEmailText"/>
58+
</sa:Hyperlink>
59+
</ui:VisualElement>
5860
<ui:Label
5961
text="For a non technical and business related questions, use:"
6062
name="descriptionWhatWeDo" class="description"/>
61-
<ui:Button
62-
text="[email protected]"
63-
name="ceoEmail" class="hyperlink mail"/>
63+
<ui:VisualElement class="mail">
64+
<sa:Hyperlink link="mailto:[email protected]" name="ceoEmail">
65+
<ui:Label text="[email protected]" name="ceoEmailText"/>
66+
</sa:Hyperlink>
67+
</ui:VisualElement>
6468

6569
<!--1st Line-->
6670
<ui:VisualElement class="contact-container" name="contactContainer">
6771

6872
<!--Linkedin-->
6973
<ui:VisualElement class="contact-element">
70-
<ui:Button class="hyperlink" name="LinkedinElement"
71-
link="https://www.linkedin.com/in/lacost">
74+
<sa:Hyperlink name="LinkedinElement"
75+
link="https://www.linkedin.com/in/lacost">
7276
<ui:Label text="" name="LinkedinIcon" class="icon icon-linkedin"/>
7377
<ui:Label text="Linkedin" name="LinkedinText" class="contact-text"/>
74-
</ui:Button>
78+
</sa:Hyperlink>
7579
</ui:VisualElement>
76-
7780
<!--Twitter-->
7881
<ui:VisualElement class="contact-element">
79-
<ui:Button class="hyperlink" name="TwitterElement"
80-
link="https://twitter.com/stansassets">
82+
<sa:Hyperlink name="TwitterElement"
83+
link="https://twitter.com/stansassets">
8184
<ui:Label text="" name="TwitterIcon" class="icon icon-twitter"/>
8285
<ui:Label text="Twitter" name="TwitterText" class="contact-text"/>
83-
</ui:Button>
86+
</sa:Hyperlink>
8487
</ui:VisualElement>
8588

8689
<!--Facebook-->
8790
<ui:VisualElement class="contact-element">
88-
<ui:Button class="hyperlink" name="FacebookElement"
89-
link="https://www.facebook.com/stansassets/">
91+
<sa:Hyperlink name="FacebookElement"
92+
link="https://www.facebook.com/stansassets/">
9093
<ui:Label text="" name="FacebookIcon" class="icon icon-facebook"/>
9194
<ui:Label text="Facebook" name="FacebookText" class="contact-text"/>
92-
</ui:Button>
95+
</sa:Hyperlink>
9396
</ui:VisualElement>
9497
</ui:VisualElement>
9598
<!--2st Line-->
9699
<ui:VisualElement class="contact-container" name="contactContainer">
97100

98101
<!--Youtube-->
99102
<ui:VisualElement class="contact-element">
100-
<ui:Button class="hyperlink" name="YoutubeElement"
101-
link="https://www.youtube.com/user/stansassets/videos">
103+
<sa:Hyperlink name="YoutubeElement"
104+
link="https://www.youtube.com/user/stansassets/videos">
102105
<ui:Label text="" name="YoutubeIcon" class="icon icon-youtube"/>
103106
<ui:Label text="Youtube" name="YoutubeText" class="contact-text"/>
104-
</ui:Button>
107+
</sa:Hyperlink>
105108
</ui:VisualElement>
106109

107110
<!--Google+-->
108111
<ui:VisualElement class="contact-element">
109-
<ui:Button class="hyperlink" name="GooglePlusElement"
110-
link="https://plus.google.com/+StansassetsOfficia">
112+
<sa:Hyperlink name="GooglePlusElement"
113+
link="https://plus.google.com/+StansassetsOfficia">
111114
<ui:Label text="" name="GooglePlusIcon" class="icon icon-google-plus"/>
112115
<ui:Label text="Google+" name="GooglePlusText" class="contact-text"/>
113-
</ui:Button>
116+
</sa:Hyperlink>
114117
</ui:VisualElement>
115118

116119
<!--Twitch-->
117120
<ui:VisualElement class="contact-element">
118-
<ui:Button class="hyperlink" name="TwitchElement"
119-
link="https://www.twitch.tv/stans_assets">
121+
<sa:Hyperlink name="TwitchElement"
122+
link="https://www.twitch.tv/stans_assets">
120123
<ui:Label text="" name="TwitchIcon" class="icon icon-twitch"/>
121124
<ui:Label text="Twitch" name="TwitchText" class="contact-text"/>
122-
</ui:Button>
125+
</sa:Hyperlink>
123126
</ui:VisualElement>
124127
</ui:VisualElement>
125128

126129
<!--Logo-->
127-
<ui:Button class="hyperlink logo-container" name="LogoElement" link="https://stansassets.com/">
128-
<ui:Label text="" name="Logo" class="icon-logo"/>
129-
</ui:Button>
130+
<ui:VisualElement class="logo-container">
131+
<sa:Hyperlink name="LogoElement" link="https://stansassets.com/">
132+
<ui:Label text="" name="Logo" class="icon-logo"/>
133+
</sa:Hyperlink>
134+
</ui:VisualElement>
130135

131136
</sa:SettingsBlock>
132137

133-
<sa:Hyperlink link="https://stansassets.com/">
134-
<ui:Label text="" name="TeamIcon" class="icon icon-team"/>
135-
<ui:Label text="Our Team" name="TeamText" class="contact-text"/>
136-
</sa:Hyperlink>
137-
138138
</ui:UXML>

0 commit comments

Comments
 (0)