From 9bfc5e1cd5fd5106d65bd7d637cf5e1705a1eb6a Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 27 Oct 2021 23:46:02 -0700 Subject: [PATCH 1/5] update upload script with fixed include paths Signed-off-by: Tully Foote --- upload.bash | 4 +++- upload_exclusions.txt | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 upload_exclusions.txt diff --git a/upload.bash b/upload.bash index 6465938..21fa261 100755 --- a/upload.bash +++ b/upload.bash @@ -1,4 +1,6 @@ #!/bin/bash -rsync -av --delete output/ ros1.osuosl.org:/var/www/beta.ros.org --exclude .well-known \ No newline at end of file +# todo read --delete when excludes are verified + +rsync -av output/ ros1.osuosl.org:/var/www/beta.ros.org --exclude-from=upload_exclusions.txt diff --git a/upload_exclusions.txt b/upload_exclusions.txt new file mode 100644 index 0000000..fad6e96 --- /dev/null +++ b/upload_exclusions.txt @@ -0,0 +1,12 @@ +.well-known +news +reps +wordpress +wp-content +wp-config.php +images +wp-config.php +mt-static +index.php +favicon.ico +mt.cgi \ No newline at end of file From bd804b6aa7e846df94caaae85828e6445771e412 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 27 Oct 2021 23:46:33 -0700 Subject: [PATCH 2/5] embed discourse topics Fixes #5 Signed-off-by: Tully Foote --- content/css/blog.scss | 2 +- content/index.html | 56 +++------------------------------- layouts/_head.html.erb | 2 ++ layouts/blog/_sidebar.html.erb | 3 ++ 4 files changed, 11 insertions(+), 52 deletions(-) diff --git a/content/css/blog.scss b/content/css/blog.scss index 727df84..b42e030 100644 --- a/content/css/blog.scss +++ b/content/css/blog.scss @@ -192,7 +192,7 @@ p { } .blog-sidebar { - padding: 0 15px 70px 15px; + padding: 100px 15px 70px 15px; grid-column: 3 / 4; grid-row: 2 / 3; background-color: $white;//$gray-lighter; diff --git a/content/index.html b/content/index.html index b9d3a0f..dc38bac 100644 --- a/content/index.html +++ b/content/index.html @@ -159,60 +159,14 @@

Support

Recent Updates and Highlights

-
-

ROS 2 Rolling Ridley

-
-
-

The bleeding edge of ROS 2

-
-
-

8/11/2021 - Katherine Scott

-
-
-

- It has been well over a - year - since we quietly rolled out the first rolling release for ROS 2 - under the codename Rolling Ridley. For those of you who are still - unfamiliar with our rolling release, it is our new approach to - synchronizing and releasing code. The ROS 2 Rolling Ridley release - is simply the bleeding edge of ROS 2 development delivered at a - regular cadence. Unlike our long term support (LTS) and off year - releases, the Rolling Ridley release is essentially a snapshot of - the most current branch of each ROS 2 repository. The advantage of - this approach it that it gives package developers and easy way to - keep up to date with all the new features that are constantly being - added to ROS 2. -

- READ MORE -
+ + +

Recent ROS Discourse Posts

-
-
-

micro-ROS Enabled Robot and Kinematics

 -
-
-

10/12/2021 - ROS Discourse

-
-
-
-
-

Nav 2 Composition

 -
-
-

9/5/2021 - ROS Discourse

-
-
-
-
-

REP-2008 RFC - ROS 2 Hardware Acceleration Architecture and Conventions

 -
-
-

8/25/2021 - ROS Discourse

-
-
+ +
diff --git a/layouts/_head.html.erb b/layouts/_head.html.erb index aabf024..3abc77a 100644 --- a/layouts/_head.html.erb +++ b/layouts/_head.html.erb @@ -23,6 +23,8 @@ href="https://www.ros.org/wp-content/uploads/2013/10/rosorg-favicon.png" type="image/x-icon" /> + + diff --git a/layouts/blog/_sidebar.html.erb b/layouts/blog/_sidebar.html.erb index 91eee16..50ef6ec 100644 --- a/layouts/blog/_sidebar.html.erb +++ b/layouts/blog/_sidebar.html.erb @@ -3,6 +3,9 @@
+

Recent ROS Discourse Posts

+ + <% sorted_articles.first(8).each do |recent_post| %> From f18aa5127a8eb45ffc805723141fd7c511d66ea9 Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 3 Nov 2021 14:19:35 -0700 Subject: [PATCH 3/5] More flags, still not styled. --- content/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/index.html b/content/index.html index 7d47980..bcc72da 100644 --- a/content/index.html +++ b/content/index.html @@ -160,12 +160,12 @@

Support

Recent Updates and Highlights

- +

Recent ROS Discourse Posts

- +
From 821db804e68f7100742b640eb59c59391b6c0558 Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 3 Nov 2021 16:19:57 -0700 Subject: [PATCH 4/5] Not quite there but we have traction. --- content/css/stylesheet.scss | 12 ++++++++++++ content/index.html | 15 ++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/content/css/stylesheet.scss b/content/css/stylesheet.scss index 2996467..505f79c 100644 --- a/content/css/stylesheet.scss +++ b/content/css/stylesheet.scss @@ -27,6 +27,15 @@ $white: #fff; } +d-topics-list iframe{ + width: 600px !important; + margin-left: auto; + margin-right: auto; + font-size: 22px; + font-weight: 700; + font-color: $black; +} + // Kat added for ROS explainer video .explainer { color: $gray-lighter; @@ -988,6 +997,9 @@ button.owl-next { height: 100%; display: grid; grid-template-columns: 600px 270px; + + + grid-template-rows: 50px 225px 250px; grid-gap: 30px; justify-content: center; diff --git a/content/index.html b/content/index.html index bcc72da..35dc1fd 100644 --- a/content/index.html +++ b/content/index.html @@ -157,18 +157,19 @@

Support

-

Recent Updates and Highlights

+

Recent Highlights from ROS Discourse

+ + + -
-
-

Recent ROS Discourse Posts

- + + - -
+ + From 294f4e87f9fbf1ba63ab1d814bfe39b71e3ac01b Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 3 Nov 2021 16:46:24 -0700 Subject: [PATCH 5/5] Turn off right hand links on mobile. Almost working. --- content/css/mobile-styles.scss | 24 ++++++++++++++++++++++-- content/css/stylesheet.scss | 23 +++++++++++++++++++++-- content/index.html | 19 ++++++++++--------- 3 files changed, 53 insertions(+), 13 deletions(-) diff --git a/content/css/mobile-styles.scss b/content/css/mobile-styles.scss index 28b5681..52b7f8e 100644 --- a/content/css/mobile-styles.scss +++ b/content/css/mobile-styles.scss @@ -10,6 +10,9 @@ display: none; } + .recent-posts{ + display:none; + } body { height: auto; @@ -439,7 +442,11 @@ } @media screen and (max-width: 992px) and (max-height: 450px) { - .banner { + .recent-posts{ + display:none; + } + + .banner { background-size: 200px; background-position: 100% 200%; h1 { @@ -454,7 +461,11 @@ } @media screen and (max-width: 768px) and (min-width: 500px) and (max-height: 450px) and (min-height: 200px) { - .banner { + .recent-posts{ + display:none; + } + + .banner { background-size: 300px; background-position: 110% -50%; } @@ -474,6 +485,10 @@ } } @media screen and (max-width: 500px) { + .recent-posts{ + display: none; + } + .github-corner { display: none; } @@ -496,6 +511,11 @@ @media screen and (max-width: 330px) { + .recent-posts{ + display:none; + } + + .github-corner { display: none; } diff --git a/content/css/stylesheet.scss b/content/css/stylesheet.scss index 505f79c..70094ed 100644 --- a/content/css/stylesheet.scss +++ b/content/css/stylesheet.scss @@ -27,14 +27,30 @@ $white: #fff; } + +.list-view{ +d-topics-list iframe{ + width: 300px !important; + margin-left: auto; + margin-right: auto; + font-size: 12px; + font-weight: 700; + +}} + +.full-view{ d-topics-list iframe{ width: 600px !important; margin-left: auto; margin-right: auto; - font-size: 22px; + background-color: #FFFFFF; + font-size: 20px; font-weight: 700; font-color: $black; -} +}} + + + // Kat added for ROS explainer video .explainer { @@ -405,6 +421,9 @@ header { .main-menu-mobile { display: none; } + .recent-posts{ + display:none; + } } #dropdown-dots { diff --git a/content/index.html b/content/index.html index 35dc1fd..4c29df1 100644 --- a/content/index.html +++ b/content/index.html @@ -159,17 +159,18 @@

Support

Recent Highlights from ROS Discourse

- +
- - - + +
+
+
+

Top Discourse Posts

+
+ + +
- - - - -