Skip to content
This repository was archived by the owner on Jan 27, 2021. It is now read-only.

Update tabler version #192

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions services/web/assets/js/lesson/components/TabsBox.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ const TabsBox = (props) => {
<div className="mr-auto">
<Nav variant="tabs">
<Nav.Item>
<Nav.Link eventKey="editor" title={t('editor')}>{t('editor')}</Nav.Link>
<Nav.Link className="rounded-0" eventKey="editor" title={t('editor')}>{t('editor')}</Nav.Link>
</Nav.Item>
<Nav.Item>
<Nav.Link eventKey="console" title={t('console')}>{t('console')}</Nav.Link>
<Nav.Link className="rounded-0" eventKey="console" title={t('console')}>{t('console')}</Nav.Link>
</Nav.Item>
<Nav.Item>
<Nav.Link eventKey="solution" title={t('solution')}>{t('solution')}</Nav.Link>
<Nav.Link className="rounded-0" eventKey="solution" title={t('solution')}>{t('solution')}</Nav.Link>
</Nav.Item>
</Nav>
</div>
Expand Down
8 changes: 4 additions & 4 deletions services/web/assets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@
.show id="module_#{@module.id}"
.row
.col-12.col-md-6.mt-4
ul class="list-group"
= for lesson <- @lessons do
- lesson_description = @descriptions_by_lesson[lesson.id]
- finished_lesson = @user_finished_lessons_by_lesson[lesson.id]
li class="list-group-item d-flex"
- url = Routes.language_module_lesson_path(@conn, :show, @language.slug, @module.slug, lesson.slug)
= link to: url, class: "stretched-link text-decoration-none" do
= lesson.natural_order
| .&nbsp;
= lesson_description.name
= if finished_lesson do
.ml-auto
i class="text-primary fas fa-check"
.card
ul.list-group.card-list-group
= for lesson <- @lessons do
- lesson_description = @descriptions_by_lesson[lesson.id]
- finished_lesson = @user_finished_lessons_by_lesson[lesson.id]
li.list-group-item.d-flex
- url = Routes.language_module_lesson_path(@conn, :show, @language.slug, @module.slug, lesson.slug)
= link to: url, class: "stretched-link text-decoration-none" do
= lesson.natural_order
| .&nbsp;
= lesson_description.name
= if finished_lesson do
.ml-auto
span.text-primary.fas.fa-check

.col-12.col-md-6.mt-4
= module_description.description
Expand All @@ -32,4 +33,3 @@
= link to: Routes.locale_path(@conn, :switch, redirect_url: redirect_current_url(@conn, switch_map[@locale]), locale: switch_map[@locale]) do
= gettext("Russian only")
i.fas.fa-arrow-right.ml-1

Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
.card.h-md-100
ul.nav.nav-tabs.justify-content-center.flex-shrink-0 data-toggle="tabs"
li.nav-item
a.nav-link.active href="#lesson-tab" data-toggle="tab" role="tab"= gettext "lesson"
a.nav-link.rounded-0.active href="#lesson-tab" data-toggle="tab" role="tab"= gettext "lesson"
li.nav-item
a.nav-link href="#discuss-tab" data-toggle="tab" role="tab"= gettext "discuss"
a.nav-link.rounded-0 href="#discuss-tab" data-toggle="tab" role="tab"= gettext "discuss"

.card-body.overflow-auto.pt-2
.tab-content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,20 @@ h1.text-center.display-4= @header
= module_description.name
.row
.col-12.col-md-6.mt-4
ul class="list-group"
= for lesson <- module.lessons do
- lesson_description = @descriptions_by_lesson[lesson.id]
- finished_lesson = @user_finished_lessons_by_lesson[lesson.id]
li class="list-group-item d-flex"
- url = Routes.language_module_lesson_path(@conn, :show, @language.slug, module.slug, lesson.slug)
= link to: url, class: "stretched-link text-decoration-none" do
= lesson.natural_order
| .&nbsp;
= lesson_description.name
= if finished_lesson do
.ml-auto
i class="text-primary fas fa-check"
.card
ul.list-group.card-list-group
= for lesson <- module.lessons do
- lesson_description = @descriptions_by_lesson[lesson.id]
- finished_lesson = @user_finished_lessons_by_lesson[lesson.id]
li.list-group-item.d-flex
- url = Routes.language_module_lesson_path(@conn, :show, @language.slug, module.slug, lesson.slug)
= link to: url, class: "stretched-link text-decoration-none" do
= lesson.natural_order
| .&nbsp;
= lesson_description.name
= if finished_lesson do
.ml-auto
span.text-primary.fas.fa-check

.col-12.col-md-6.mt-4
= module_description.description
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ html.h-100 lang=@locale
button.close type="button" data-dismiss="alert" aria-label="Close"
span aria-hidden="true" &times;

.mt-6
.mt-5
= render @view_module, @view_template, assigns

footer
.container-xl.mt-7.pt-6.pb-3.border-top
footer.mt-6
.container-xl.pt-6.pb-3.border-top
.row.row-cols-1.row-cols-sm-2.row-cols-md-3.row-cols-lg-4
.col.mb-4.mb-lg-0.order-4.order-md-0
div
Expand Down
24 changes: 12 additions & 12 deletions services/web/lib/hexlet_basics_web/templates/page/index.html.slime
Original file line number Diff line number Diff line change
@@ -1,84 +1,84 @@
.row.justify-content-center.mb-6
.row.justify-content-center.mb-5
.col-12.col-md-10.col-lg-9.col-xl-8.text-center
h1= gettext("Free programming courses")
.h2.font-weight-light
== gettext("For beginners. From creators %{hexlet_link}", hexlet_link: safe_to_string(link(gettext("of Hexlet"), to: hexlet_link(), class: 'text-muted')))

.row.row-cols-1.row-cols-sm-2.row-cols-md-3.row-cols-lg-4
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:php, :bg)
h2.card-title.text-white PHP
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/php.png") alt="php programming lessons")
- phpAnchor = if Enum.member?(@started_languages_by_slug, "php"), do: gettext("Continue"), else: gettext("Start")
= link phpAnchor, to: Routes.language_path(@conn, :show, "php"), class: "btn btn-light btn-block stretched-link"
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:javascript, :bg)
h2.card-title.text-white JavaScript
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/javascript.png") alt="JavaScript programming lessons")
- jsAnchor = if Enum.member?(@started_languages_by_slug, "javascript"), do: gettext("Continue"), else: gettext("Start")
= link jsAnchor, to: Routes.language_path(@conn, :show, "javascript"), class: "btn btn-light btn-block stretched-link"
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:python, :bg)
h2.card-title.text-white Python
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/python.png") alt="Python programming lessons")
- pythonAnchor = if Enum.member?(@started_languages_by_slug, "python"), do: gettext("Continue"), else: gettext("Start")
= link pythonAnchor, to: Routes.language_path(@conn, :show, "python"), class: "btn btn-light btn-block stretched-link"
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:java, :bg)
h2.card-title.text-white Java
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/java.png") alt="Java programming lessons")
- javaAnchor = if Enum.member?(@started_languages_by_slug, "java"), do: gettext("Continue"), else: gettext("Start")
= link javaAnchor, to: Routes.language_path(@conn, :show, "java"), class: "btn btn-light btn-block stretched-link"

.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:html, :bg)
h2.card-title.text-white HTML
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/html.png") alt="html lessons")
- htmlAnchor = if Enum.member?(@started_languages_by_slug, "html"), do: gettext("Continue"), else: gettext("Start")
= link htmlAnchor, to: Routes.language_path(@conn, :show, "html"), class: "btn btn-light btn-block stretched-link"

.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:css, :bg)
h2.card-title.text-white CSS
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/css.png") alt="css lessons")
- cssAnchor = if Enum.member?(@started_languages_by_slug, "css"), do: gettext("Continue"), else: gettext("Start")
= link cssAnchor, to: Routes.language_path(@conn, :show, "css"), class: "btn btn-light btn-block stretched-link"

.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:racket, :bg)
h2.card-title.text-white Racket
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/racket.png") alt="Racket programming lessons")
- racketAnchor = if Enum.member?(@started_languages_by_slug, "racket"), do: gettext("Continue"), else: gettext("Start")
= link racketAnchor, to: Routes.language_path(@conn, :show, "racket"), class: "btn btn-light btn-block stretched-link"

.row.justify-content-center.mb-5.mt-5
.row.justify-content-center.mb-4.mt-5
.col-12.col-md-9.text-center
h3.h1.font-weight-light = gettext("Courses in development")
p = gettext("Courses in development description")

.row.row-cols-1.row-cols-sm-2.row-cols-md-3.row-cols-lg-4
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:ruby, :bg)
h2.card-title.text-white Ruby
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/ruby.png") alt="ruby programming lessons")
- rubyAnchor = if Enum.member?(@started_languages_by_slug, "ruby"), do: gettext("Continue"), else: gettext("Start")
= link rubyAnchor, to: Routes.language_path(@conn, :show, "ruby"), class: "btn btn-light btn-block stretched-link"
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:elixir, :bg)
h2.card-title.text-white Elixir
img.img-fluid.mt-3.mb-4(src=Routes.static_path(@conn, "/images/elixir.png") alt="elixir programming lessons")
- elixirAnchor = if Enum.member?(@started_languages_by_slug, "elixir"), do: gettext("Continue"), else: gettext("Start")
= link elixirAnchor, to: Routes.language_path(@conn, :show, "elixir"), class: "btn btn-light btn-block stretched-link"
.col.mb-5
.col.mb-4
.card.h-100
.card-body.text-center class=style_for_lang(:go, :bg)
h2.card-title.text-white Go
Expand Down