Skip to content

Commit

Permalink
Fix Mobile Rendering (#29)
Browse files Browse the repository at this point in the history 
* Bump kramdown from 2.1.0 to 2.3.0 (Phlow#211)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.1.0 to 2.3.0.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update _06_typography.scss (Phlow#221)

* Revert Commit which destroyed the mobile navigation

* Update 2015-08-16-typography.md

Fixed an URL

* Added jekyll-theme-feeling-responsive.gemspec

* New Analytics › Moved from Footer to Head to increase speed › Use GA Async Tag

See › Phlow#142

* Update images, some text, some formatting

* No mesh together › Nav buttons at bottom of blog posts mesh together

* Bump rexml from 3.2.4 to 3.2.5 (Phlow#227)

Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](ruby/rexml@v3.2.4...v3.2.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump kramdown from 2.3.0 to 2.3.1 (Phlow#225)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump addressable from 2.7.0 to 2.8.0 (Phlow#229)

Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](sporkmonger/addressable@addressable-2.7.0...addressable-2.8.0)

---
updated-dependencies:
- dependency-name: addressable
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Broken link

* _11_syntax-highlighting.scss include data-language (Phlow#236)

Adds data-language label in top-right corner of highlight.

* Switched/Flipped Links for mobile order

* Hide the title and icon when full navigation is shown

* Update Google Analytics and correct mistyped var (Phlow#244)

Updated old Google Analytics (analytics.js) to new Global site tag (gtag.js) Google Analytics.

BTW old Google Analytics was not working here because of mistyped variable.

* Handling external links gracefully (Phlow#245)

You are setting `_baseurl` but then using `site.baseurl`.

* Typo

* fix mobile bug

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark C. Miller <miller86@llnl.gov>
Co-authored-by: Phlow <mo.phlow@gmail.com>
Co-authored-by: Denver Prophit Jr <denver.prophit@gmail.com>
Co-authored-by: litusgm <109998342+litusgm@users.noreply.github.com>
Co-authored-by: Mikael Vejdemo-Johansson <mikael@johanssons.org>
Co-authored-by: Ousikai <mtfallsVR@protonmail.com>
  • Loading branch information
@oscoDOTblog @dependabot
@markcmiller86 @Phlow @inetbiz @litusgm @michiexile
8 people authored Mar 5, 2023
1 parent 49a4d57 commit d945fa8
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 83 deletions.
2 changes: 0 additions & 2 deletions _data/socialmedia.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
class: icon-heart
title: "Buy us a Ko-fi and support us!"



# - name: Mixcloud
# url: http://www.mixcloud.com/phlow/
# class: icon-cloud
Expand Down
11 changes: 7 additions & 4 deletions _includes/_head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,14 @@
{% endunless %}

{% if site.google_analytics_tracking_id %}
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics_tracking_id }}"></script>
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
ga('create', '{{ site.analytics.google.tracking_id }}', 'auto');
ga('send', 'pageview');
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', '{{ site.google_analytics_tracking_id }}');
</script>
<script async src='https://www.google-analytics.com/analytics.js'></script>
{% endif %}

75 changes: 39 additions & 36 deletions _includes/_navigation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
*
{% endcomment %}
<div id="navigation" class="sticky">
<nav class="top-bar" role="navigation" data-topbar>
<nav class="top-bar" role="navigation" data-topbar data-options="scrolltop: false">
<ul class="title-area">
<li class="name">
<h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class="icon-tree"> {{ site.title }}</a></h1>
<h1 class="hide-for-large-up"><a href="{{ site.url }}{{ site.baseurl }}" class="icon-tree"> {{ site.title }}</a></h1>
</li>
<!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
<li class="toggle-topbar menu-icon"><a href="#"><span>Nav</span></a></li>
<li class="toggle-topbar toggle-topbar-click menu-icon"><a><span>Nav</span></a></li>
</ul>
<section class="top-bar-section">
{% comment %}

____ _ __ __ _ __ _ __ _
/ __ \(_)___ _/ /_ / /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
/ /_/ / / __ `/ __ \/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
/ _, _/ / /_/ / / / / /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
/_/ |_/_/\__, /_/ /_/\__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
/____/ /____/
__ ______ _ __ _ __ _
/ / ___ / __/ /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
/ / / _ \/ /_/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
/ /___/ __/ __/ /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
/_____/\___/_/ \__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
/____/

{% endcomment %}
<ul class="right">
<ul class="left">
{% for link in site.data.navigation %}

{% if link.url contains 'http' %}
Expand All @@ -38,21 +38,19 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
{% assign _baseurl = site.baseurl %}
{% endif %}

{% comment %} If there are links for left side begin {% endcomment %}
{% if link.side == 'left' %}


{% comment %} If there are links for right side begin {% endcomment %}
{% if link.side == 'right' %}
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}
{% if link.dropdown == nil %}
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
<li class="divider"></li>
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>

{% comment %} If right side WITH dropdown menu do {% endcomment %}
{% comment %} If left side WITH dropdown menu do {% endcomment %}
{% else %}

<li class="divider"></li>
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>

<ul class="dropdown">
{% for dropdown_link in link.dropdown %}
Expand All @@ -63,27 +61,30 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
{% assign domain = site.url %}
{% endif %}

<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
{% endfor %}
</ul>

</li>
<li class="divider"></li>
{% endif %}
{% endif %}
{% endfor %}
{% comment %} First loop finished 1 {% endcomment %}
{% comment %} Second loop finished {% endcomment %}
</ul>


{% comment %}

__ ______ _ __ _ __ _
/ / ___ / __/ /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
/ / / _ \/ /_/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
/ /___/ __/ __/ /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
/_____/\___/_/ \__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
/____/
____ _ __ __ _ __ _ __ _
/ __ \(_)___ _/ /_ / /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
/ /_/ / / __ `/ __ \/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
/ _, _/ / /_/ / / / / /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
/_/ |_/_/\__, /_/ /_/\__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
/____/ /____/

{% endcomment %}
<ul class="left">
<ul class="right">
{% for link in site.data.navigation %}

{% if link.url contains 'http' %}
Expand All @@ -97,19 +98,21 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
{% assign _baseurl = site.baseurl %}
{% endif %}

{% comment %} If there are links for left side begin {% endcomment %}
{% if link.side == 'left' %}

{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}

{% comment %} If there are links for right side begin {% endcomment %}
{% if link.side == 'right' %}
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
{% if link.dropdown == nil %}
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
<li class="divider"></li>
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>

{% comment %} If left side WITH dropdown menu do {% endcomment %}
{% comment %} If right side WITH dropdown menu do {% endcomment %}
{% else %}

<li class="divider"></li>
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>

<ul class="dropdown">
{% for dropdown_link in link.dropdown %}
Expand All @@ -120,17 +123,17 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
{% assign domain = site.url %}
{% endif %}

<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ _baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
{% endfor %}
</ul>

</li>
<li class="divider"></li>
{% endif %}
{% endif %}
{% endfor %}
{% comment %} Second loop finished {% endcomment %}
{% comment %} First loop finished 1 {% endcomment %}
</ul>

</section>
</nav>
</div><!-- /#navigation -->
40 changes: 0 additions & 40 deletions _sass/_06_typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,65 +97,25 @@ h1 {
font-size: $font-size-h1;
margin-top: 0;
}
h1::before {
display: block;
content: " ";
margin-top: -60px;
height: 60px;
visibility: hidden;
pointer-events: none;
}
h2 {
font-size: $font-size-h2;
margin: 1.563em 0 0 0;
}
.blog-index h2 {
margin-top: 0;
}
h2::before {
display: block;
content: " ";
margin-top: -60px;
height: 60px;
visibility: hidden;
pointer-events: none;
}
h3 {
font-size: $font-size-h3;
margin: 1.152em 0 0 0;
}
h3::before {
display: block;
content: " ";
margin-top: -50px;
height: 50px;
visibility: hidden;
pointer-events: none;
}
h4 {
font-size: $font-size-h4;
margin: 1.152em 0 0 0;
}
h4::before {
display: block;
content: " ";
margin-top: -50px;
height: 50px;
visibility: hidden;
pointer-events: none;
}
h5 {
font-size: $font-size-h5;
margin: 1em 0 0 0;
}
h5::before {
display: block;
content: " ";
margin-top: -50px;
height: 50px;
visibility: hidden;
pointer-events: none;
}



Expand Down
Binary file added images/webdesign_screenshot_andersneu.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/webdesign_screenshot_moritz_sauer.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/webdesign_screenshot_mosonic.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/webdesign_screenshot_phlow.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pages/contact.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ header:
* Email: **ohaiyo+contact@atemosta.com**
<!-- * Mastodon: [@Atemosta@mastodon.social ][1] -->

[1]: https://mastodon.social/@Atemosta
[1]: https://mastodon.social/@Atemosta
4 changes: 4 additions & 0 deletions pages/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ permalink : "/getting-started/"
1. Add your own `logo.png` to `/assets/img/`.
1. Add your own social media links and open `_data/socialmedia.yml`.
1. Open `_sass/_01_settings_colors.scss` and adjust the the colors to your taste.
<<<<<<< HEAD
1. Ccustomize your navigation and open `_data/navigation.yml`.
=======
1. Customize your navigation and open `_data/navigation.yml`.
>>>>>>> 6b298e4a7a32eb411f7d8b976737539389ba04ec
1. Translate this theme and open `_data/language.yml`.
1. Change the links in the footer and open `_data/services.yml` and `_data/network.yml`.
1. Open `_data/authors.yml` and edit author information and set default author in `config.yml`.
Expand Down

0 comments on commit d945fa8

Please sign in to comment.