Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update MoveIt Pro references #849

Merged
merged 2 commits into from
May 13, 2024
Merged

Update MoveIt Pro references #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
090a17f
Update MoveIt Pro references
Laco-code May 2, 2024
f74a01f
Merge branch 'main' into Update_MoveIt_Pro_references
L4co77 May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions _includes/announcement-banner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<div class="moveit_announcement_banner">
<span class="moveit_announcement_banner--close"></span>
<!-- Close button -->
<a href="https://picknik.ai/pro/">
<img
src="/assets/images/MoveIt_Announcement_Banner.png"
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<p>
Check out our
<a href="https://picknik.ai/pro/" target="_blank"
>MoveIt Developer Platform</a
>MoveIt Pro Developer Platform</a
>
</p>
<a class="button" href="/install">INSTALL NOW</a>
Expand Down
47 changes: 44 additions & 3 deletions _sass/_body.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ img {
position: fixed;
z-index: 9999;
bottom: 10px;
right: 0;
right: 10px;
animation: fadeFromRight 1s linear;

img {
Expand All @@ -200,16 +200,57 @@ img {
}
}

.moveit_announcement_banner--hide {
right: -500px;
animation: fadeToRight 1s linear;
}

.moveit_announcement_banner--close {
cursor: pointer;
background-color: #17181d;
position: absolute;
right: -5px;
top: -11px;
font-size: 21px;
line-height: 1;
color: white;
height: 24px;
width: 24px;
border: 1px solid red;
border-radius: 100%;
background-color: #17181d;
&::after{
display: flex;
content: "\00d7";
justify-content: center;
align-items: center;
}
}

@keyframes fadeFromRight {
0% {
right: -500px;
}

70% {
right: 5px;
right: 20px;
}

100% {
right: 0;
right: 10px;
}
}

@keyframes fadeToRight {
0% {
right: 10px;
}

70% {
right: 30px;
}

100% {
right: -500px;
}
}
15 changes: 11 additions & 4 deletions _sass/_homepage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,15 @@
}

a {
color: #fff;

&:hover {
color: #fff;
text-decoration: underline;
color: #0a58f7;

span.blue {
background-color: #fff;
color: #0a58f7;
}
}
}

Expand All @@ -78,6 +84,7 @@
margin-right: 2px;
padding: 0 10px;
margin-left: 0;
border: 1px solid #0a58f7;
}
}
}
Expand Down Expand Up @@ -107,12 +114,12 @@
max-width: 500px;
margin: 20px auto;
background: #fff;
padding: 15px 100px;
padding: 15px 45px;
text-align: center;
border-radius: 4px;
box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.2);
@media screen and (max-width: 520px) {
padding: 15px 60px;
padding: 15px 30px;
}
}

Expand Down
Binary file added assets/images/Companies/picknik-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 45 additions & 6 deletions assets/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
$(document).ready(function() {
$('#toggle-nav').click(function() {
$(this).toggleClass('open');
});
});

var videoSrc = $('#modalVideo iframe').attr('src');

$('#modalVideo').on('show.bs.modal', function() {
Expand Down Expand Up @@ -36,6 +30,51 @@ function futureVersion() {
}
}

function setCookie(cname,cvalue,exdays) {
const d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
let expires = "expires=" + d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}

function getCookie(cname) {
let name = cname + "=";
let decodedCookie = decodeURIComponent(document.cookie);
let ca = decodedCookie.split(';');
for(let i = 0; i < ca.length; i++) {
let c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}

function checkCookie() {
let user = getCookie("bannerMoveitPro");
let targetHtml = $('.moveit_announcement_banner');
if (user !== "") {
targetHtml.css('display', 'none');
}
}

function closeBannerOnClick() {
let targetHtml = $('.moveit_announcement_banner');
targetHtml.click(function() {
$(this).addClass('moveit_announcement_banner--hide');
setCookie("bannerMoveitPro", "moveit_announcement_banner", 30);
});
}

$(document).ready(function() {
$('#toggle-nav').click(function() {
$(this).toggleClass('open');
});

futureVersion();
checkCookie();
closeBannerOnClick();
});
28 changes: 23 additions & 5 deletions index.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ redirect_from: '/moveit/'
<div class="col-xs-12 col-lg-6 col-sm-12">
<div class="main">
<div class="main-tag">
<span class="blue">Announcement</span>
<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>
<a href="https://discourse.ros.org/t/announcing-moveit-studio-2-0-and-moveit-2-7-iron-releases/32296" target="_blank">
<span class="blue">Announcing</span>
<span>MoveIt Pro Runtime and Developer Platform</span>
</a>
</div>
<h1>Moving robots into&nbsp;the&nbsp;future</h1>
<p class="main-text">Incorporating the latest advances in motion planning,<br/>
Expand Down Expand Up @@ -58,9 +60,11 @@ redirect_from: '/moveit/'
Ubuntu 22.04
</div>
<div class="link-group">
<a href="/install-moveit2/source/" class="info-box-link">Build From Source</a>
<a href="/install-moveit2/source/" class="info-box-link">Build&nbsp;From&nbsp;Source</a>
<span>|</span>
<a href="https://github.com/moveit/moveit2" target="_blank" class="info-box-link">View on Github</a>
<a href="https://github.com/moveit/moveit2" target="_blank" class="info-box-link">View&nbsp;on&nbsp;Github</a>
<span>|</span>
<a href="https://picknik.ai/pro/" target="_blank" class="info-box-link">MoveIt&nbsp;Pro</a>
</div>
<img src="/assets/images/logo/ROS_logo.png" alt="ROS logo" class="info-box-logo" />
</div>
Expand Down Expand Up @@ -149,7 +153,7 @@ redirect_from: '/moveit/'
<img class="companies-using-moveit-logos" src="/assets/images/Companies/nasa-logo.png" alt="Nasa logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/google-logo.png" alt="Google logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/ms-logo.png" alt="Microsoft logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/fetch-logo.png" alt="Fetch robotics logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/picknik-logo.png" alt="PickNik logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/franka-logo.png" alt="Franka Emika logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/pal-logo.png" alt="Pal Robotics logo">
<img class="companies-using-moveit-logos" src="/assets/images/Companies/kinova-logo.png" alt="Kinova logo">
Expand Down Expand Up @@ -268,6 +272,20 @@ redirect_from: '/moveit/'
<div class="release-versions__3">STATUS</div>
</div>
<div class="release-versions__body">
<div class="release-versions__content">
<div class="release-versions__1">
<h3>MoveIt Pro 5.0</h3>
<p>
<a href="https://picknik.ai/pro/" target="_blank">View product page</a>
</p>
</div>
<div class="release-versions__2">
ROS 2
</div>
<div class="release-versions__3">
<span class="label label--green">COMMERCIALLY SUPPORTED</span>
</div>
</div>
<div class="release-versions__content">
<div class="release-versions__1">
<h3>Rolling 2.7</h3>
Expand Down
Loading