Skip to content

Commit ed86339

Browse files
Merge pull request #80 from WeeRox/master
Updated the look of the progress bar
2 parents 6be400b + e0d7997 commit ed86339

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

Diff for: _layouts/tutorial.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@
7878

7979
{% if p_language == page.lang %}
8080
{% if p_topic == topic and same_topic_started == false %}
81-
<span class="same-topic">
81+
<div class="same-topic">
8282
{% assign same_topic_started = true %}
8383
{% endif %}
8484
{% if p_topic != topic and same_topic_started == true %}
85-
</span>
85+
</div>
8686
{% assign same_topic_started = false %}
8787
{% endif %}
88-
<a id="page-{{ p.path }}" class="step {% if page == p %}current{% endif %}" href="..{{ p.url }}"><span></span></a>
88+
<a id="page-{{ p.path }}" class="step {% if page == p %}current{% endif %}" href="..{{ p.url }}"></a>
8989
{% if should_assign_next %}
9090
{% assign should_assign_next = false %}
9191
{% assign has_next_page = true %}

Diff for: css/progress.css

+19-23
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,40 @@
44
.progress {
55
text-align: center;
66
width: 100%;
7-
padding-top: 0.25em;
7+
padding: 5px;
88
background-color: {{ site.data.colors.progress-color }};
99
display: block;
1010
}
1111

12-
.progress .step span {
13-
display: inline-block; /* http://stackoverflow.com/questions/2491068/ddg#2491072 */
14-
height: 0.7em;
15-
width: 0.7em;
16-
border-radius: 0.7em;
17-
border-width: 0.2em;
18-
border-style: solid;
19-
border-color: {{ site.data.colors.step-color }};
20-
}
2112
.progress .step {
22-
display: inline-block; /* http://stackoverflow.com/questions/2491068/ddg#2491072 */
23-
padding-left: 0.1em;
24-
padding-right: 0.1em;
25-
padding-top: 0.7em;
26-
padding-bottom: 1em;
27-
clear: none;
13+
width: 10px;
14+
height: 10px;
15+
border: 3px solid {{ site.data.colors.step-color }};
16+
border-radius: 10px;
17+
display: inline-block;
18+
vertical-align: middle;
19+
}
20+
21+
.progress > .step {
22+
margin-top: 5px;
23+
margin-bottom: 5px;
24+
display: inline-block;
2825
}
2926

30-
.progress .step.done span {
27+
.progress .step.done {
3128
background-color: {{ site.data.colors.step-done-color }};
3229
border-color: {{ site.data.colors.step-done-border-color }};
3330
}
3431

35-
.progress .step.current span {
32+
.progress .step.current {
3633
background-color: {{ site.data.colors.step-color }};
3734
}
3835

3936
.progress .same-topic {
4037
background-color: {{ site.data.colors.header-color }};
4138
clear: none;
42-
padding-left: 0.35em;
43-
padding-right: 0.35em;
44-
border-radius: 1.05em;
45-
padding-top: 0.75em;
46-
padding-bottom: 0.3em;
39+
padding: 5px;
40+
border-radius: 20px;
41+
display: inline-block;
42+
line-height: 10px;
4743
}

0 commit comments

Comments
 (0)