Skip to content
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.

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

Change menu to left side #690

Merged
merged 3 commits into from
Jul 7, 2017
Merged
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
2 changes: 1 addition & 1 deletion _data/menu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ items:
"Introduction": "/"
"Setup": "/setup/"
"User Guide": "/user-guide/"
"Conversion": "/conversion/"
"Conversion Matrix": "/conversion/"
"Architecture": "/architecture/"
9 changes: 5 additions & 4 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<header>
<h1>
{{ site.project_name }}
</h1>
<p>{{ site.description }}</p>
<h1> {{ site.project_name }}</h1>
<p>{{ site.description }}</p>

<p class="view"><a href="{{ site.repository_url }}">View the Project on GitHub <small>{{ site.repository_shorthand }}</small></a></p>
<a class="github-button" href="https://github.com/{{ site.repository_shorthand }}/subscription" data-icon="octicon-eye" data-count-href="/{{ site.repository_shorthand }}/watchers" data-count-api="/repos/{{ site.repository_shorthand }}#subscribers_count" data-count-aria-label="# watchers on GitHub" aria-label="Watch {{ site.repository_shorthand }} on GitHub">Watch</a>
<a class="github-button" href="https://github.com/{{ site.repository_shorthand }}" data-icon="octicon-star" data-count-href="/{{ site.repository_shorthand }}/stargazers" data-count-api="/repos/{{ site.repository_shorthand }}#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star {{ site.repository_shorthand }} on GitHub">Star</a>
<a class="github-button" href="https://github.com/{{ site.repository_shorthand }}/fork" data-icon="octicon-repo-forked" data-count-href="/{{ site.repository_shorthand }}/network" data-count-api="/repos/{{ site.repository_shorthand }}#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork {{ site.repository_shorthand }} on GitHub">Fork</a>

{% include menu.html %}

</header>
4 changes: 2 additions & 2 deletions _includes/menu.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="menu">
<div class="menubar">
<hr/>
<ul>
{% for item in site.data.menu.items %}
<li><a href="{{ item[1] | prepend: site.baseurl }}">{{ item[0] }}</a></li>
{% endfor %}
</ul>
<hr/>
</div>
4 changes: 0 additions & 4 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@

<section>

{% unless page.no_menu %}
{% include menu.html %}
{% endunless %}

{{ content }}

</section>
Expand Down
18 changes: 12 additions & 6 deletions css/custom.css
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
.menu {
text-align: center;
.headerstyle {
margin: 0;
}

.menubar {
margin-top:10px;
text-align: left;
z-index: 1000;
margin-bottom: 10px;
}

.menu ul {
.menubar ul {
position: static !important;
list-style: none;
margin: 0;
padding: 0;
}

.menu ul li {
display: inline-block;
padding: 10px;
.menubar ul li {
padding: 0 0 10 0;
background: #fff;
margin: 2px;
width:100%;
}
60 changes: 1 addition & 59 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -111,64 +111,6 @@ header {
-webkit-font-smoothing:subpixel-antialiased;
}

header ul {
list-style:none;
height:40px;
padding:0;
background: #f4f4f4;
border-radius:5px;
border:1px solid #e0e0e0;
width:270px;
}

header li {
width:89px;
float:left;
border-right:1px solid #e0e0e0;
height:40px;
}

header li:first-child a {
border-radius:5px 0 0 5px;
}

header li:last-child a {
border-radius:0 5px 5px 0;
}

header ul a {
line-height:1;
font-size:11px;
color:#999;
display:block;
text-align:center;
padding-top:6px;
height:34px;
}

header ul a:hover {
color:#999;
}

header ul a:active {
background-color:#f0f0f0;
}

strong {
color:#222;
font-weight:500;
}

header ul li + li + li {
border-right:none;
width:89px;
}

header ul a strong {
font-size:14px;
display:block;
color:#222;
}

section {
width:500px;
Expand Down Expand Up @@ -215,7 +157,7 @@ footer {
section {
border:1px solid #e5e5e5;
border-width:1px 0;
padding: 0 0 0 0;
padding:20px 0;
margin:0 0 20px;
}

Expand Down