Skip to content

Updated the look of the progress bar #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2017
Merged

Updated the look of the progress bar #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 _layouts/tutorial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@

{% if p_language == page.lang %}
{% if p_topic == topic and same_topic_started == false %}
<span class="same-topic">
<div class="same-topic">
{% assign same_topic_started = true %}
{% endif %}
{% if p_topic != topic and same_topic_started == true %}
</span>
</div>
{% assign same_topic_started = false %}
{% endif %}
<a id="page-{{ p.path }}" class="step {% if page == p %}current{% endif %}" href="..{{ p.url }}"><span></span></a>
<a id="page-{{ p.path }}" class="step {% if page == p %}current{% endif %}" href="..{{ p.url }}"></a>
{% if should_assign_next %}
{% assign should_assign_next = false %}
{% assign has_next_page = true %}
Expand Down
42 changes: 19 additions & 23 deletions css/progress.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,40 @@
.progress {
text-align: center;
width: 100%;
padding-top: 0.25em;
padding: 5px;
background-color: {{ site.data.colors.progress-color }};
display: block;
}

.progress .step span {
display: inline-block; /* http://stackoverflow.com/questions/2491068/ddg#2491072 */
height: 0.7em;
width: 0.7em;
border-radius: 0.7em;
border-width: 0.2em;
border-style: solid;
border-color: {{ site.data.colors.step-color }};
}
.progress .step {
display: inline-block; /* http://stackoverflow.com/questions/2491068/ddg#2491072 */
padding-left: 0.1em;
padding-right: 0.1em;
padding-top: 0.7em;
padding-bottom: 1em;
clear: none;
width: 10px;
height: 10px;
border: 3px solid {{ site.data.colors.step-color }};
border-radius: 10px;
display: inline-block;
vertical-align: middle;
}

.progress > .step {
margin-top: 5px;
margin-bottom: 5px;
display: inline-block;
}

.progress .step.done span {
.progress .step.done {
background-color: {{ site.data.colors.step-done-color }};
border-color: {{ site.data.colors.step-done-border-color }};
}

.progress .step.current span {
.progress .step.current {
background-color: {{ site.data.colors.step-color }};
}

.progress .same-topic {
background-color: {{ site.data.colors.header-color }};
clear: none;
padding-left: 0.35em;
padding-right: 0.35em;
border-radius: 1.05em;
padding-top: 0.75em;
padding-bottom: 0.3em;
padding: 5px;
border-radius: 20px;
display: inline-block;
line-height: 10px;
}