fix floating images in some sizesfixes

Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>

5 files changed, 34 insertions, 35 deletions

diff --git a/assets/css/custom.css b/assets/css/custom.css
index 9f57aa64..cca0ada0 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -10038,10 +10038,10 @@ span.avoidwrap {
       .benefits .banner .big-img, .benefits .banner .big-img-invert {
         display: none; } }
 
-@media (min-width: 768px) {
+@media (min-width: 991px) {
   .image--floated {
     float: right; } }
-@media (max-width: 768px) {
+@media (max-width: 991px) {
   .image--floated {
     float: none !important; }
 
diff --git a/assets/css/custom.scss b/assets/css/custom.scss
index 39a90f58..d7d9f399 100644
--- a/assets/css/custom.scss
+++ b/assets/css/custom.scss
@@ -175,13 +175,13 @@ span.avoidwrap {
 
 // image floating on feature pages
 
-@media (min-width: $break-small) {
+@media (min-width: $break-big) {
 	.image--floated {
 		float: right;
 	}
 }
 
-@media (max-width: $break-small) {
+@media (max-width: $break-big) {
 .image--floated {
 	float: none !important;
 	}
diff --git a/assets/img/features/calendar-resource-booking.png b/assets/img/features/calendar-resource-booking.png
new file mode 100644
index 00000000..2310029c
--- /dev/null
+++ b/assets/img/features/calendar-resource-booking.png
diff --git a/page-groupware.php b/page-groupware.php
index dac12e21..374e2f70 100644
--- a/page-groupware.php
+++ b/page-groupware.php
@@ -77,14 +77,13 @@
         </div>
         <div class="col-md-6"><h3 class="section--paragraph__title"><?php echo $l->t('Nextcloud Mail');?></h3>
 			<p class="section--paragraph"><?php echo $l->t('Send and receive emails in a breeze');?></p>
-			<p class="section--paragraph"><?php echo $l->t('<ul>
-			<li>Multiple accounts with unified inbox</li>
-			<li>Recognizes travel itineraries and adds them to calendar</li>
-			<li>Supports end-to-end encryption using OpenPGP</li>
+			<ul>
+                <li><?php echo $l->t('Multiple accounts with unified, smart inbox');?></li>
+                <li><?php echo $l->t('Travel itinerary recognition and Calendar integration');?></li>
+                <li><?php echo $l->t('Supports end-to-end encryption using OpenPGP');?></li>
 			</ul>
 			<br>
-			<small><strong>Note:</strong> Nextcloud Mail is a client for IMAP servers;<br>Nextcloud does not include a mail server.</small>
-			');?></p>
+			<p class="section--paragraph"><small><?php echo $l->t('<strong>Note:</strong> Nextcloud Mail is a client for IMAP servers; Nextcloud does not include a mail server.');?></small></p>
         </div>
 	</div>
     <div class="row">
@@ -103,22 +102,22 @@
         </div>
         <div class="col-md-6"><h3 class="section--paragraph__title"><?php echo $l->t('Nextcloud Calendar');?></h3>
 			<p class="section--paragraph"><?php echo $l->t('Schedule work and meetings online');?></p>
-			<p class="section--paragraph"><?php echo $l->t('<ul>
-			<li>Create and share multiple calendars</li>
-            <li>Integrate external calendar resources (WebCal)</li>
-			<li>Book resources through a busy view or plan a Talk meeting</li>
+			<p class="section--paragraph"><ul>
+			<li><?php echo $l->t('Create and share multiple calendars');?></li>
+            <li><?php echo $l->t('Integrate external calendar resources (WebCal)');?></li>
+			<li><?php echo $l->t('Appointment scheduling, resource booking & Talk integration');?></li>
 			</ul>
-			');?></p>
+			</p>
         </div>
 	</div>
     <div class="row">
 		<div class="col-md-6 image--feature">
-			<a href="<?php bloginfo('template_directory'); ?>/assets/img/features/calendar_list_view.png"><img alt="<?php echo $l->t('Calendar list view');?>" class="overlay-trigger img-responsive featureimg" src="<?php bloginfo('template_directory'); ?>/assets/img/features/calendar_list_view.png" /></a><br />
-			<?php echo $l->t('Calendar list view');?>
+			<div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/650621426?h=5896b9b0bd&amp;badge=0&amp;autopause=0&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen style="position:absolute;top:0;left:0;width:100%;height:100%;" title="Appointments planning in Calendar"></iframe></div>
+			<?php echo $l->t('Appointment planning');?>
         </div>
 		<div class="col-md-6 image--feature">
-			<a href="<?php bloginfo('template_directory'); ?>/assets/img/features/calendar_day_view.png"><img alt="<?php echo $l->t('Calendar day view');?>" class="overlay-trigger img-responsive featureimg" src="<?php bloginfo('template_directory'); ?>/assets/img/features/calendar_day_view.png" /></a><br />
-            <?php echo $l->t('Calendar day view');?>
+			<a href="<?php bloginfo('template_directory'); ?>/assets/img/features/calendar-resource-booking.png"><img alt="<?php echo $l->t('Calendar day view');?>" class="overlay-trigger img-responsive featureimg" src="<?php bloginfo('template_directory'); ?>/assets/img/features/calendar-resource-booking.png" /></a><br />
+            <?php echo $l->t('Resource search and booking');?>
         </div>
 	</div>
 	<div class="row">
@@ -127,12 +126,12 @@
         </div>
         <div class="col-md-6"><h3 class="section--paragraph__title"><?php echo $l->t('Nextcloud Contacts');?></h3>
 			<p class="section--paragraph"><?php echo $l->t('Keep your relations organized');?></p>
-			<p class="section--paragraph"><?php echo $l->t('<ul>
-			<li>Track birthdays of your contacts</li>
-			<li>Share your address books with your team</li>
-			<li>Sync your contacts with phones and other devices</li>
+			<p class="section--paragraph"><ul>
+			<li><?php echo $l->t('Share your address books with your team');?></li>
+			<li><?php echo $l->t('Sync your contacts with phones and other devices');?></li>
+			<li><?php echo $l->t('Create, join and manage custom groups you can share with across Nextcloud');?></li>
 			</ul>
-			');?></p>
+			</p>
         </div>
 	</div>
     <div class="row">
@@ -151,12 +150,12 @@
         </div>
         <div class="col-md-6"><h3 class="section--paragraph__title"><?php echo $l->t('Nextcloud Deck');?></h3>
 			<p class="section--paragraph"><?php echo $l->t('Manage your work with others');?></p>
-			<p class="section--paragraph"><?php echo $l->t('<ul>
-			<li>Create any number of private or shared Kanban-style task boards</li>
-			<li>Drag\'n\'drop cards, assign them to team members and set due dates</li>
-			<li>Use checklists, attach files & export boards</li>
+			<p class="section--paragraph"><ul>
+			<li><?php echo $l->t('Create any number of private or shared Kanban-style task boards');?></li>
+			<li><?php echo $l->t('Drag\'n\'drop cards, assign them to team members and set due dates');?></li>
+			<li><?php echo $l->t('Use checklists, attach files & export boards');?></li>
 			</ul>
-			');?></p>
+			</p>
         </div>
 	</div>
     <div class="row">
diff --git a/page-talk.php b/page-talk.php
index 1df8e478..1d9b5b71 100644
--- a/page-talk.php
+++ b/page-talk.php
@@ -171,6 +171,7 @@
                     <li><?php echo $l->t('Individual and group calls & chat');?></li>
                     <li><?php echo $l->t('Mobile apps for Android and iOS');?></li>
                     <li><?php echo $l->t('Easy screen sharing');?></li>
+                    <li><?php echo $l->t('Permission management by moderators');?></li>
                     <li><?php echo $l->t('Integration with');?> <a class="hyperlink" href="<?php echo home_url('files') ?>">Nextcloud Files</a> <?php echo $l->t('and');?> <a class="hyperlink" href="<?php echo home_url('groupware') ?>">Groupware</a></li>
                 </ul></p>
             </div>
@@ -178,7 +179,7 @@
                 <ul>
                     <li><?php echo $l->t('Mobile calls & chat with push notifications');?></li>
                     <li><?php echo $l->t('Commands to enable integration with other tools');?></li>
-                    <li><?php echo $l->t('Webinars & public web meetings¹');?></li>
+                    <li><?php echo $l->t('Webinars & public web meetings¹ with lobby');?></li>
                     <li><?php echo $l->t('SIP bridge: dial in by phone²');?></li>
                 </ul>
             </div>
@@ -374,15 +375,14 @@
     </div>
 	<div class="row">
 		<div class="col-md-6 image--floated">
-			<div style="padding:75% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/556061980?badge=0&amp;autopause=0&amp;dnt=1&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen style="position:absolute;top:0;left:0;width:100%;height:100%;" title="Raise hand in Talk video"></iframe></div>
-<!-- 			<a target="_blank" href="<?php bloginfo('template_directory'); ?>/assets/img/features/talk-screensharing-other-nw.png"><img class="overlay-trigger img-responsive featureimg" src="<?php bloginfo('template_directory'); ?>/assets/img/features/talk-screensharing-other-nw.png" /></a> -->
+			<div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/650819931?h=7e60a839cc&amp;badge=0&amp;autopause=0&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen style="position:absolute;top:0;left:0;width:100%;height:100%;" title="Talk moderation"></iframe></div>
 		</div>
 		<div class="col-md-6">
 			<p class="section--paragraph__tittle"><?php echo $l->t('Webinars and presentations');?></p>
 			<p class="section--paragraph"><?php echo $l->t('Share the content of a single window or a full desktop screen for presentations with chat-partners.');?></p>
-			<p class="section--paragraph"><?php echo $l->t('Manage participants by inviting, muting or removing them.');?></p>
+			<p class="section--paragraph"><?php echo $l->t('Manage participants permissions for audio/video and screen sharing.');?></p>
 			<p class="section--paragraph"><?php echo $l->t('Schedule meetings and be notified when they start.');?></p>
-			<p class="section--paragraph"><?php echo $l->t('A lobby is provided for guests to wait until the call starts.');?></p>
+			<p class="section--paragraph"><?php echo $l->t('A lobby is provided for guests to wait until the call starts. Moderators can let a selected guest in early.');?></p>
 			<p class="section--paragraph"><?php echo $l->t('Participants can raise their hand to get attention or be allowed to speak.');?></p>
 		</div>
 	</div>
@@ -398,7 +398,7 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-md-6  image--floated  image--feature new-img">
+		<div class="col-md-6 image--floated image--feature new-img">
             <a target="_blank" href="<?php bloginfo('template_directory'); ?>/assets/img/features/Talk_settings.png"><img src="<?php bloginfo('template_directory'); ?>/assets/img/features/Talk_settings.png" class="overlay-trigger img-responsive featureimg" /></a>
 		</div>
         <div class="col-md-6">