diff --git a/Gemfile.lock b/Gemfile.lock index 305ae9a..40d330e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -223,4 +223,8 @@ DEPENDENCIES web-console (>= 3.3.0) BUNDLED WITH +<<<<<<< HEAD 1.16.6 +======= + 1.16.1 +>>>>>>> 5f5256bedc688f7bc228597a9dd5865b4df6686c diff --git a/app/assets/images/finanse.jpeg b/app/assets/images/finanse.jpeg deleted file mode 100644 index 53cd0d9..0000000 Binary files a/app/assets/images/finanse.jpeg and /dev/null differ diff --git a/app/assets/images/pedefik150.png b/app/assets/images/pedefik150.png new file mode 100644 index 0000000..580fb84 Binary files /dev/null and b/app/assets/images/pedefik150.png differ diff --git a/app/assets/images/pedefik400.png b/app/assets/images/pedefik400.png new file mode 100644 index 0000000..0aa0416 Binary files /dev/null and b/app/assets/images/pedefik400.png differ diff --git a/app/assets/images/pedefik400a.png b/app/assets/images/pedefik400a.png new file mode 100644 index 0000000..365eea1 Binary files /dev/null and b/app/assets/images/pedefik400a.png differ diff --git a/app/assets/stylesheets/main.css.erb b/app/assets/stylesheets/main.css.erb index ac78ba6..a34277c 100644 --- a/app/assets/stylesheets/main.css.erb +++ b/app/assets/stylesheets/main.css.erb @@ -1580,7 +1580,7 @@ input, select, textarea { /* Features */ - #features { + .features { background: #353D40 url("<%= asset_path('bg02.jpg') %>"); border-bottom: solid 1px #272e31; padding: 45px 0 45px 0; @@ -1588,63 +1588,63 @@ input, select, textarea { color: #a0a8ab; } - #features h2 { + .features h2 { font-size: 1.25em; color: #fff; margin: 0 0 0.25em 0; } - #features a { + .features a { color: #e0e8eb; } - #features strong { + .features strong { color: #fff; } /* Content */ - #content { + .content { background: #f7f7f7 url("<%= asset_path('bg04.png') %>"); border-top: solid 1px #fff; padding: 45px 0 45px 0; } - #content section { + .content section { background: #fff; padding: 40px 30px 45px 30px; box-shadow: 2px 2px 2px 1px rgba(128, 128, 128, 0.1); margin: 0 0 25px 0; } - #content h2 { + .content h2 { font-size: 1.8em; color: #373f42; margin: 0 0 0.25em 0; } - #content h3 { + .content h3 { color: #000000; /* #96a9b5; */ font-size: 1.25em; } - #content a { + .content a { color: #ED391B; } - #content header { + .content header { margin: 0 0 2em 0; } - #content .quote-list li { + .content .quote-list li { border-bottom: solid 1px #e2e6e8; } - #content .link-list li { + .content .link-list li { border-bottom: solid 1px #e2e6e8; } - #content .check-list li { + .content .check-list li { border-bottom: solid 1px #e2e6e8; } @@ -1757,15 +1757,15 @@ input, select, textarea { /* Content */ - #content h2 { + .content h2 { font-size: 1.4em; } - #content h3 { + .content h3 { font-size: 1.1em; } - #content header { + .content header { margin: 0 0 1.25em 0; } @@ -1797,7 +1797,7 @@ input, select, textarea { /* Content */ - #content { + .content { padding: 25px 0; } @@ -1993,19 +1993,19 @@ input, select, textarea { /* Content */ - #content section { + .content section { padding: 30px 20px; } - #content h2 { + .content h2 { font-size: 1.25em; } - #content h3 { + .content h3 { font-size: 1em; } - #content header { + .content header { margin: 0 0 1.25em 0; } @@ -2120,3 +2120,17 @@ input, select, textarea { background:linear-gradient(to bottom, #34CACA 5%, #30C9C9 100%); background-color:#34CACA; } + +.videoWrapper { + position: relative; + padding-bottom: 56.25%; /* 16:9 */ + padding-top: 25px; + height: 0; +} +.videoWrapper iframe { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 58f4f99..3620f00 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -19,7 +19,7 @@ module ApplicationHelper ret end # generate errors html - def errors_to_html(errors ) + def errors_to_html(errors) ret = '
' ret += I18n.t("activerecord.errors.messages.record_invalid", errors: errors.count) ret += '
    ' diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index deeefa9..0a20d4d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -25,6 +25,7 @@ @@ -44,4 +45,4 @@ <%= javascript_include_tag 'browser.min', 'breakpoints.min', 'util', 'main' %> <%= yield :footer_scripts %> - \ No newline at end of file + diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index abe1790..a1ee0a2 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -1,4 +1,4 @@ -
    +
    @@ -23,8 +23,52 @@
    - +
    + +
    -
    + +
    +
    +
    +
    +
    + Zapisz się do newslettera

    +

    a poznasz 20 sposobów na wykorzystanie włókien węglowych


    + <%= link_to 'Zapisz się', { controller: :newsletter, action: :new }, { remote: false, class: "button-large", style: 'color:white;' } %> +
    +
    +
    + <%= image_tag 'pedefik400a' %> +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Między innymi o tym dowiesz się biorąc udział w kursie:

    +
    +
      +
    • Czym jest CFRP?
      • +
    • Dlaczego CFRP jest mocniejsze od stali?
      • +
    • Procedura wzmacniania belek ze względu na zginanie używając CFRP
      • +
    • Procedura wzmacniania belek ze względu na ścinanie używając CFRP
      • +
    • Procedura wzmocnienia słupów ze względu na ściskanie używając CFRP
      • +
    • Szczegóły rozwiązań technicznych i detali
      • +
    • Prawidłowa procedura wykonania i odbioru robót
      • +
    +
    +

    Jeżeli jeszcze tego nie zrobiłeś, to po prostu zapisz się do newslettera, a informacje na temat tego kursu cię nie ominą.

    + <%= link_to 'Zapisz się', { controller: :newsletter, action: :new }, { remote: false, class: "button-large", style: 'color:white;' } %> +
    + +
    +
    +
    +
    diff --git a/app/views/site/show.html.erb b/app/views/site/show.html.erb index cbb5850..3ba20ae 100644 --- a/app/views/site/show.html.erb +++ b/app/views/site/show.html.erb @@ -1,4 +1,4 @@ -
    +