diff --git a/app/assets/images/landing/bbb.png b/app/assets/images/landing/bbb.png new file mode 100644 index 00000000..5812f26b Binary files /dev/null and b/app/assets/images/landing/bbb.png differ diff --git a/app/assets/images/landing/mobile.png b/app/assets/images/landing/mobile.png new file mode 100644 index 00000000..2cb3b8bb Binary files /dev/null and b/app/assets/images/landing/mobile.png differ diff --git a/app/assets/images/landing/world.png b/app/assets/images/landing/world.png new file mode 100644 index 00000000..66f31d99 Binary files /dev/null and b/app/assets/images/landing/world.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index dcce13e7..09534506 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -26,9 +26,11 @@ $background-color: #F5F7FB; $error-background-color: #EFE6E6; +$header-height: 65px; $footer-height: 65px; html, body { + position: relative; width: 100%; height: 100%; background-color: white; @@ -39,17 +41,19 @@ a { cursor: pointer; } -.wrapper { - height: calc(100% - #{$footer-height}); +.header { + height: $header-height; +} + +.page { position: relative; + height: auto; + min-height: calc(100% - #{$header-height} - #{$footer-height}); } .footer { - position: fixed; height: $footer-height; width: 100%; - bottom: 0; - z-index: 5; } .table-responsive { diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index b04f35d7..bb1a763f 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -29,3 +29,20 @@ } } } + +.img-cycle img { + display: none; + position: absolute; + top: 0; + left: 0; +} + +.img-cycle img:first-child { + display:block; +} + +.green-grad { + background: linear-gradient(to right, rgba(164,179,87,1) 0%, rgba(117,137,12,1) 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bf5a174d..07792839 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,9 +18,9 @@ -
- <%= render "shared/header" %> + <%= render "shared/header" %> +
<% if bigbluebutton_endpoint_default? %> <%= render "shared/error_banner" do %> diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 7fdb4e3c..d6900b29 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -6,17 +6,37 @@ <% end %> <% end %> -
-
-
-

<%= t("landing.welcome") %>

-

<%= t("landing.about") %>

- - <%= link_to "https://youtu.be/Hso8yLzkqj8", class: "d-inline-block p-3", target: "_blank" do %> +
+
+
+

<%= t("landing.welcome").html_safe %>

+

<%= t("landing.about", href: link_to(t("bigbluebutton"), "http://bigbluebutton.org/", target: "_blank", class: "text-blue")).html_safe %>

+
+ <%= link_to "https://youtu.be/Hso8yLzkqj8", target: "_blank" do %>

<%= t("landing.video") %>

<% end %>
+
+ <%= image_tag("landing/world.png", class: "active") %> + <%= image_tag("landing/bbb.png") %> + <%= image_tag("landing/mobile.png") %> +
+ <%= render "shared/features" %>
-<%= render "shared/features" %> + diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 1220f485..39edce12 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,4 +1,4 @@ -