Skip to content

Commit

Permalink
Merge a4f9ccb into 7edf695
Browse files Browse the repository at this point in the history
  • Loading branch information
Luc Wollants committed Aug 30, 2018
2 parents 7edf695 + a4f9ccb commit 8c353a4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions assets/scss/components/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
height: auto;
max-height: 80px;
max-width: 150px;
margin-bottom: $global-margin;
margin: $global-margin/2 0;
}
}

Expand All @@ -24,7 +24,7 @@
img {
height: auto;
max-width: 100%;
margin-bottom: $global-margin/2;
margin: $global-margin/4 0;
}
}

Expand Down
4 changes: 2 additions & 2 deletions public/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/style.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions templates/questions/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@
<td>
<div class="btn-group-vertical">
<a role="button"
class="btn btn-sm btn-outline-primary"
class="btn btn-sm btn-outline-primary text-left"
href="{{ path('questions_view_edit', {'id': question.id.toString}) }}">
<span class="oi oi-pencil"></span>{% trans %}Button.edit{% endtrans %}
</a>
<a role="button"
class="btn btn-sm btn-outline-primary"
class="btn btn-sm btn-outline-primary text-left"
href="{{ path('questions_view_edit_image', {'id': question.id.toString}) }}">
<span class="oi oi-image"></span>{% trans %}Button.edit.picture{% endtrans %}
</a>
<a role="button"
class="btn btn-sm btn-outline-danger"
class="btn btn-sm btn-outline-danger text-left"
href="{{ path('questions_view_delete', {'id': question.id.toString}) }}">
<span class="oi oi-trash"></span>{% trans %}Button.remove{% endtrans %}
</a>
Expand Down

0 comments on commit 8c353a4

Please sign in to comment.