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.

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

Jump to bottom

Fix responsiveness #2199

Merged
merged 5 commits into from
Jun 12, 2019
Merged

Fix responsiveness #2199

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afd309d
fix not-responsive blog pagination
taniki Jun 12, 2019
38b49be
consistent card size
taniki Jun 12, 2019
ed52638
fix reuses card size on dataset page
taniki Jun 12, 2019
b4183e6
changelog
taniki Jun 12, 2019
2b1b3d1
Merge branch 'master' into fix/responsive
taniki Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions udata/templates/dataset/display.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,12 @@ <h3 id="community-reuses">{{ _('Reuses') }}</h3>
<div class="card-list card-list--columned">
{% for reuse in reuses %}
{% set features = ['preview'] %}
<div class="col-sm-6">
<div class="col-md-4 col-sm-6 col-xs-12">
{% include theme('reuse/card.html') %}
</div>
{% endfor %}

<div class="col-sm-6">
<div class="col-md-4 col-sm-6 col-xs-12">
{% include theme('dataset/add-reuse-card.html') %}
</div>

Expand Down
8 changes: 4 additions & 4 deletions udata/templates/organization/display.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h1>
<ul class="card-list card-list--columned">

{% for dataset in datasets %}
<li class="col-sm-6">
<li class="col-md-4 col-sm-6 col-xs-12">
{% include theme('dataset/card.html') %}
</li>
{% endfor %}
Expand Down Expand Up @@ -123,7 +123,7 @@ <h1>
<ul class="card-list card-list--columned">

{% for reuse in reuses %}
<li class="col-md-4 col-sm-6">
<li class="col-md-4 col-sm-6 col-xs-12">
{% include theme('reuse/card.html') %}
</li>
{% endfor %}
Expand All @@ -147,7 +147,7 @@ <h1>
<tab id="members" header="{{ ngettext('%(num)d member', '%(num)d members', org.members | length) }}">
<div class="card-list card-list--columned">
{% for member in org.members %}
<div class="col-md-4">
<div class="col-md-4 col-sm-6 col-xs-12">
{% include theme('organization/member-card.html') %}
</div>
{% endfor %}
Expand All @@ -159,7 +159,7 @@ <h1>
<tab id="followers" header="{{ ngettext('%(num)d follower', '%(num)d followers', followers | length) }}">
<div class="card-list card-list--columned">
{% for follow in followers %}
<div class="col-md-4" {% if loop.index > 15 %}:class="{hidden: !followersVisible}"{% endif %}">
<div class="col-md-4 col-sm-6 col-xs-12" {% if loop.index > 15 %}:class="{hidden: !followersVisible}"{% endif %}">
{% include theme('follow/follower-card.html') %}
</div>
{% endfor %}
Expand Down
10 changes: 5 additions & 5 deletions udata/templates/post/display.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,24 +164,24 @@ <h3>{{ ngettext('Associated dataset', 'Associated datasets', post.datasets|lengt
<section class="content nav-section">
<div class="container">
<div class="row">
<div class="col-sm-4">
<div class="col-xs-2 col-sm-4">
{% if previous_post %}
<a href="{{ previous_post.display_url }}" title="{{ _('Previous post') }}" class="btn btn-primary">
<span class="fa fa-chevron-left"></span>
{{ _('Previous post') }}
<span class="hidden-xs">{{ _('Previous post') }}</span>
</a>
{% endif %}
</div>
<div class="col-sm-4 text-center">
<div class="col-xs-8 col-sm-4 text-center">
<a href="{{ url_for('posts.list') }}" class="btn btn-primary">
<span class="fa fa-fw fa-list"></span>
{{ _('All posts') }}
</a>
</div>
<div class="col-sm-4 text-right">
<div class="col-xs-2 col-sm-4 text-right">
{% if next_post %}
<a href="{{ next_post.display_url }}" title="{{ _('Next post') }}" class="btn btn-primary">
{{ _('Next post') }}
<span class="hidden-xs">{{ _('Next post') }}</span>
<span class="fa fa-chevron-right"></span>
</a>
{% endif %}
Expand Down