Skip to content

Commit

Permalink
Merge pull request #3 from Srikanth635/main
Browse files Browse the repository at this point in the history
Updated home page with new pictures
  • Loading branch information
sunava authored Feb 27, 2024
2 parents 1e1acc6 + e56ddad commit 5e1e7b7
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 11 deletions.
3 changes: 3 additions & 0 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ pygmentsCodefencesGuessSyntax = true
[[Params.bigimg]]
src = "img/Neujahrskarte_2023_ViB_layer_11.jpg"

[[Params.bigredimg]]
src = "img/ViB_banner_Uni_Rot.png"


[Author]
# Set only your "username" for default hosts and full URLs otherwise (e.g., "https://MyGitLab.org/username")
Expand Down
3 changes: 2 additions & 1 deletion content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<p>In our innovative Virtual Research and Training Building (ViB) we aim at providing convenient open access to our research infrastructure for cooperative and cognition-enabled robotics and AI through our ViB.</br></br>Researchers worldwide can access the ViB to conduct research in virtual labs with digital twin robots and their control software, and household and retail experimental environments, as well as virtual knowledge labs and everyday activity labs.</p>
</div>
<div class="right-main-well-flex">
<img class="timer-change-image" data-wait="5000" data-imgs='[{"src":"img/popcorn_making.jpg"},{"src":"img/pot_grasping.jpg"},{"src":"img/learning_from_videos.jpg"},{"src":"img/picking_up_actions.jpg"}]'>
<!-- <img class="timer-change-image" data-wait="5000" data-imgs='[{"src":"img/popcorn_making.jpg"},{"src":"img/pot_grasping.jpg"},{"src":"img/learning_from_videos.jpg"},{"src":"img/picking_up_actions.jpg"}]'> -->
<img class="timer-change-image" data-wait="5000" data-imgs='[{"src":"img/pr2_holding_pot.png"},{"src":"img/pr2_image_sequence.png"},{"src":"img/pr2_learning_human.png"}]'>
</div>
</div>
11 changes: 7 additions & 4 deletions layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,28 @@

<div class="flex-item-left">
<div class="sidebar-image-container">
<img class="sidebar-image-sticky" src="{{ .Site.Params.rightsideimg | absURL }}" width="1000px" height="1000px">
<img class="sidebar-image-sticky" src="{{ .Site.Params.rightsideimg | absURL }}" width="100%" height="1200px">
</div>
</div>

<div class="flex-item-right">
<div class="flex-item-center">

<!-- <div class="flex-container"> -->

<!-- <div class="flex-item-right"> -->
{{ end }}

{{ block "header" . }}{{ partial "header.html" . }}{{ end }}
<!-- {{ block "header" . }}{{ partial "header.html" . }}{{ end }} -->
<!-- <div class="intro-header big-img" style="background-image: url('img/ViB_banner_Uni_Rot.png')"> -->
<img src="img/ViB_banner_Uni_Rot.png" width="80%" style="margin-top: 50px; padding: 15px;">

{{ block "main" . }}{{ end }}

{{ if isset .Site.Params "rightsideimg" }}
<!-- </div> -->
</div>

<div class="flex-item-left" style="background-color: rgb(135, 161, 172, 0.09);">
<div class="flex-item-right" style="background-color: rgb(135, 161, 172, 0.09);">
<!-- <div style="position: relative; left: 85%; top: 20%; overflow: hidden; margin-right: 2%;"></div> -->
<div style="position: relative;">
<div style="position: fixed; top: 45px; overflow-y: scroll;">
Expand Down
1 change: 0 additions & 1 deletion layouts/_default/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1">
<article role="main" class="blog-post">
{{ .Content }}

{{ if .Params.tags }}
<div class="blog-tags">
{{ range .Params.tags }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1">
<div class="{{ .Type }}-heading">
<!-- <div class="{{ .Type }}-heading">
<h1>{{ with $.Scratch.Get "title" }}{{.}}{{ else }}<br/>{{ end }}</h1>
{{ if $subtitle }}
{{ if eq .Type "page" }}
Expand All @@ -47,7 +47,7 @@ <h2 class="{{ .Type }}-subheading">{{ $subtitle }}</h2>
{{ if eq .Type "post" }}
{{ partial "post_meta.html" . }}
{{ end }}
</div>
</div> -->
</div>
</div>
</div>
Expand Down
19 changes: 16 additions & 3 deletions static/css/override.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,32 @@ div.post-entry param.hidde-after-preview + *, div.post-entry div.hidde-after-pre
flex-wrap: nowrap;
}
.flex-item-left {
flex: 20%;
flex: 30%;
justify-content: center;
}
.flex-item-right {
flex: 80%;
.flex-item-center {
flex: 60%;
justify-content: center;
align-content: center;
overflow-y: auto;
}

.flex-item-right {
flex: 10%;
}

@media only screen and (max-width: 1280px) and (max-height: 900px) { /* remove left side image when screen to small */
.flex-item-left {
display: none;
}
}

@media only screen and (max-width: 1280px) { /* remove left side image when screen to small */
.flex-item-right {
display: none;
}
}

/* homepage main content about block */
div.main-well-flex-container {
display: flex;
Expand Down
Binary file added static/img/ViB_banner_Uni_Rot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/pr2_holding_pot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/pr2_image_sequence.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/pr2_learning_human.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5e1e7b7

Please sign in to comment.