Skip to content

Commit bafe8f7

Browse files
L4co77Laco-code
andauthored
Update MoveIt Pro references (#849)
Co-authored-by: laco <[email protected]>
1 parent c4ff970 commit bafe8f7

File tree

7 files changed

+126
-19
lines changed

7 files changed

+126
-19
lines changed

_includes/announcement-banner.html

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<div class="moveit_announcement_banner">
2+
<span class="moveit_announcement_banner--close"></span>
3+
<!-- Close button -->
24
<a href="https://picknik.ai/pro/">
35
<img
46
src="/assets/images/MoveIt_Announcement_Banner.png"

_includes/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<p>
1515
Check out our
1616
<a href="https://picknik.ai/pro/" target="_blank"
17-
>MoveIt Developer Platform</a
17+
>MoveIt Pro Developer Platform</a
1818
>
1919
</p>
2020
<a class="button" href="/install">INSTALL NOW</a>

_sass/_body.scss

+44-3
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ img {
188188
position: fixed;
189189
z-index: 9999;
190190
bottom: 10px;
191-
right: 0;
191+
right: 10px;
192192
animation: fadeFromRight 1s linear;
193193

194194
img {
@@ -200,16 +200,57 @@ img {
200200
}
201201
}
202202

203+
.moveit_announcement_banner--hide {
204+
right: -500px;
205+
animation: fadeToRight 1s linear;
206+
}
207+
208+
.moveit_announcement_banner--close {
209+
cursor: pointer;
210+
background-color: #17181d;
211+
position: absolute;
212+
right: -5px;
213+
top: -11px;
214+
font-size: 21px;
215+
line-height: 1;
216+
color: white;
217+
height: 24px;
218+
width: 24px;
219+
border: 1px solid red;
220+
border-radius: 100%;
221+
background-color: #17181d;
222+
&::after{
223+
display: flex;
224+
content: "\00d7";
225+
justify-content: center;
226+
align-items: center;
227+
}
228+
}
229+
203230
@keyframes fadeFromRight {
204231
0% {
205232
right: -500px;
206233
}
207234

208235
70% {
209-
right: 5px;
236+
right: 20px;
210237
}
211238

212239
100% {
213-
right: 0;
240+
right: 10px;
241+
}
242+
}
243+
244+
@keyframes fadeToRight {
245+
0% {
246+
right: 10px;
247+
}
248+
249+
70% {
250+
right: 30px;
251+
}
252+
253+
100% {
254+
right: -500px;
214255
}
215256
}

_sass/_homepage.scss

+11-4
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,15 @@
4949
}
5050

5151
a {
52+
color: #fff;
53+
5254
&:hover {
53-
color: #fff;
54-
text-decoration: underline;
55+
color: #0a58f7;
56+
57+
span.blue {
58+
background-color: #fff;
59+
color: #0a58f7;
60+
}
5561
}
5662
}
5763

@@ -78,6 +84,7 @@
7884
margin-right: 2px;
7985
padding: 0 10px;
8086
margin-left: 0;
87+
border: 1px solid #0a58f7;
8188
}
8289
}
8390
}
@@ -107,12 +114,12 @@
107114
max-width: 500px;
108115
margin: 20px auto;
109116
background: #fff;
110-
padding: 15px 100px;
117+
padding: 15px 45px;
111118
text-align: center;
112119
border-radius: 4px;
113120
box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.2);
114121
@media screen and (max-width: 520px) {
115-
padding: 15px 60px;
122+
padding: 15px 30px;
116123
}
117124
}
118125

6.62 KB
Loading

assets/js/main.js

+45-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
$(document).ready(function() {
2-
$('#toggle-nav').click(function() {
3-
$(this).toggleClass('open');
4-
});
5-
});
6-
71
var videoSrc = $('#modalVideo iframe').attr('src');
82

93
$('#modalVideo').on('show.bs.modal', function() {
@@ -36,6 +30,51 @@ function futureVersion() {
3630
}
3731
}
3832

33+
function setCookie(cname,cvalue,exdays) {
34+
const d = new Date();
35+
d.setTime(d.getTime() + (exdays*24*60*60*1000));
36+
let expires = "expires=" + d.toUTCString();
37+
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
38+
}
39+
40+
function getCookie(cname) {
41+
let name = cname + "=";
42+
let decodedCookie = decodeURIComponent(document.cookie);
43+
let ca = decodedCookie.split(';');
44+
for(let i = 0; i < ca.length; i++) {
45+
let c = ca[i];
46+
while (c.charAt(0) == ' ') {
47+
c = c.substring(1);
48+
}
49+
if (c.indexOf(name) == 0) {
50+
return c.substring(name.length, c.length);
51+
}
52+
}
53+
return "";
54+
}
55+
56+
function checkCookie() {
57+
let user = getCookie("bannerMoveitPro");
58+
let targetHtml = $('.moveit_announcement_banner');
59+
if (user !== "") {
60+
targetHtml.css('display', 'none');
61+
}
62+
}
63+
64+
function closeBannerOnClick() {
65+
let targetHtml = $('.moveit_announcement_banner');
66+
targetHtml.click(function() {
67+
$(this).addClass('moveit_announcement_banner--hide');
68+
setCookie("bannerMoveitPro", "moveit_announcement_banner", 30);
69+
});
70+
}
71+
3972
$(document).ready(function() {
73+
$('#toggle-nav').click(function() {
74+
$(this).toggleClass('open');
75+
});
76+
4077
futureVersion();
78+
checkCookie();
79+
closeBannerOnClick();
4180
});

index.markdown

+23-5
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ redirect_from: '/moveit/'
2828
<div class="col-xs-12 col-lg-6 col-sm-12">
2929
<div class="main">
3030
<div class="main-tag">
31-
<span class="blue">Announcement</span>
32-
<span>MoveIt Pro 2.0 and MoveIt 2.7 <a href="https://discourse.ros.org/t/announcing-moveit-studio-2-0-and-moveit-2-7-iron-releases/32296" target="_blank">released!</a></span>
31+
<a href="https://discourse.ros.org/t/announcing-moveit-studio-2-0-and-moveit-2-7-iron-releases/32296" target="_blank">
32+
<span class="blue">Announcing</span>
33+
<span>MoveIt Pro Runtime and Developer Platform</span>
34+
</a>
3335
</div>
3436
<h1>Moving robots into&nbsp;the&nbsp;future</h1>
3537
<p class="main-text">Incorporating the latest advances in motion planning,<br/>
@@ -58,9 +60,11 @@ redirect_from: '/moveit/'
5860
Ubuntu 22.04
5961
</div>
6062
<div class="link-group">
61-
<a href="/install-moveit2/source/" class="info-box-link">Build From Source</a>
63+
<a href="/install-moveit2/source/" class="info-box-link">Build&nbsp;From&nbsp;Source</a>
6264
<span>|</span>
63-
<a href="https://github.com/moveit/moveit2" target="_blank" class="info-box-link">View on Github</a>
65+
<a href="https://github.com/moveit/moveit2" target="_blank" class="info-box-link">View&nbsp;on&nbsp;Github</a>
66+
<span>|</span>
67+
<a href="https://picknik.ai/pro/" target="_blank" class="info-box-link">MoveIt&nbsp;Pro</a>
6468
</div>
6569
<img src="/assets/images/logo/ROS_logo.png" alt="ROS logo" class="info-box-logo" />
6670
</div>
@@ -149,7 +153,7 @@ redirect_from: '/moveit/'
149153
<img class="companies-using-moveit-logos" src="/assets/images/Companies/nasa-logo.png" alt="Nasa logo">
150154
<img class="companies-using-moveit-logos" src="/assets/images/Companies/google-logo.png" alt="Google logo">
151155
<img class="companies-using-moveit-logos" src="/assets/images/Companies/ms-logo.png" alt="Microsoft logo">
152-
<img class="companies-using-moveit-logos" src="/assets/images/Companies/fetch-logo.png" alt="Fetch robotics logo">
156+
<img class="companies-using-moveit-logos" src="/assets/images/Companies/picknik-logo.png" alt="PickNik logo">
153157
<img class="companies-using-moveit-logos" src="/assets/images/Companies/franka-logo.png" alt="Franka Emika logo">
154158
<img class="companies-using-moveit-logos" src="/assets/images/Companies/pal-logo.png" alt="Pal Robotics logo">
155159
<img class="companies-using-moveit-logos" src="/assets/images/Companies/kinova-logo.png" alt="Kinova logo">
@@ -268,6 +272,20 @@ redirect_from: '/moveit/'
268272
<div class="release-versions__3">STATUS</div>
269273
</div>
270274
<div class="release-versions__body">
275+
<div class="release-versions__content">
276+
<div class="release-versions__1">
277+
<h3>MoveIt Pro 5.0</h3>
278+
<p>
279+
<a href="https://picknik.ai/pro/" target="_blank">View product page</a>
280+
</p>
281+
</div>
282+
<div class="release-versions__2">
283+
ROS 2
284+
</div>
285+
<div class="release-versions__3">
286+
<span class="label label--green">COMMERCIALLY SUPPORTED</span>
287+
</div>
288+
</div>
271289
<div class="release-versions__content">
272290
<div class="release-versions__1">
273291
<h3>Rolling 2.7</h3>

0 commit comments

Comments
 (0)