v/PrintABrick
1
0
Fork 0
mirror of https://github.com/ToxicCrack/PrintABrick.git synced 2025-05-17 21:00:09 -07:00
Code Issues Projects Releases Wiki Activity

Update style

Browse Source
This commit is contained in:
Unknown 2017-05-23 01:50:32 +02:00
parent 82968016bf
commit 0fca94c64a
11 changed files with 99 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Resources/assets/style/main.scss
View File

@ -1,8 +1,7 @@
.default-theme { .default-theme {
.ui.main { .ui.main {
padding-top: 10px; padding-top: 50px;
margin-top: 40px;
min-height: calc(100% - 67px); min-height: calc(100% - 67px);
} }
@ -105,8 +104,29 @@
font-weight: 700; font-weight: 700;
} }
.image {
width: 4em;
height: 4em;
}
padding: 0.5em 1em !important; padding: 0.5em 1em !important;
} }
.spacing.top {
margin-top: 1em;
}
.show.all {
font-size: 1.5em;
&:after {
content: ' »';
}
}
.ajax-load > .loader, .empty{
margin-top: 100px !important;
margin-bottom: 100px !important;
}
} }
@each $i in 5 10 15 20 25 30 40 50 60 { @each $i in 5 10 15 20 25 30 40 50 60 {

10
app/Resources/relations/alias_model.yml
View File

@ -363,6 +363,16 @@ u9140p02c01: u9140p01c01
92243p02c01: 92243p01c01 92243p02c01: 92243p01c01
u9142p02c03: u9142p01c08
u9151p02c03: u9151p01c04
u9106p02c02: u9106p01c03
u595p02c04: u595p01c10
u9140p02c02: u9140p01c04
64022c01: 64022 64022c01: 64022
64022c02: 64022 64022c02: 64022

4
app/Resources/translations/messages.en.yml
View File

@ -79,3 +79,7 @@ homepage:
title: %count% sets title: %count% sets
text: text:
browse: Browse sets browse: Browse sets
view.all:
sets: View all matched sets
models: View all matched models

1
app/Resources/views/base.html.twig
View File

@ -1,6 +1,7 @@
{% extends 'html.html.twig' %} {% extends 'html.html.twig' %}
{% import 'macros/elements.html.twig' as elements %} {% import 'macros/elements.html.twig' as elements %}
{% import 'macros/blocks.html.twig' as blocks %}
{% block body %} {% block body %}
<div class="ui fixed inverted menu"> <div class="ui fixed inverted menu">

1
app/Resources/views/html.html.twig
View File

@ -14,7 +14,6 @@
{% endblock %} {% endblock %}
{% block javascripts %} {% block javascripts %}
<script type="text/javascript" src="{{ asset('resources/js/three.js') }}"></script> <script type="text/javascript" src="{{ asset('resources/js/three.js') }}"></script>
<script type="text/javascript" src="{{ asset('resources/js/OrbitControls.js') }}"></script> <script type="text/javascript" src="{{ asset('resources/js/OrbitControls.js') }}"></script>

7
app/Resources/views/macros/blocks.html.twig
View File

@ -5,6 +5,7 @@
{% else %} {% else %}
{% set placeholder = asset("resources/images/transparent_min.png") %} {% set placeholder = asset("resources/images/transparent_min.png") %}
{% endif %} {% endif %}
<img src="{{ placeholder }}" data-src="{{ asset(color~'/'~number~'.png') | imagine_filter(filter)}}"> <img src="{{ placeholder }}" data-src="{{ asset(color~'/'~number~'.png') | imagine_filter(filter)}}">
</div> </div>
{% endmacro %} {% endmacro %}
@ -64,7 +65,7 @@
{{ blocks.setImage(set.id,'set_min') }} {{ blocks.setImage(set.id,'set_min') }}
<div class="content"> <div class="content">
<h3 title="{{ set.name }}" class="header truncate"> <h3 title="{{ set.name }}" class="header truncate">
{{ set.name }} {{ set.name }}
</h3> </h3>
<div class="meta"> <div class="meta">
<span class="left floated">{{ set.id }}</span> <span class="left floated">{{ set.id }}</span>
@ -83,7 +84,9 @@
{% endmacro %} {% endmacro %}
{% macro empty(message) %} {% macro empty(message) %}
<p class="ui center aligned icon header"><i class="circular frown icon"></i>{{ message }}</p> <div class="ui center aligned icon header empty">
<p><i class="circular frown icon"></i>{{ message }}</p>
</div>
{% endmacro %} {% endmacro %}
{% macro ccal2_license(title,author) %} {% macro ccal2_license(title,author) %}

6
app/Resources/views/model/detail.html.twig
View File

@ -75,7 +75,7 @@
<div class="ui vertical segment"> <div class="ui vertical segment">
<div class="ui tab active" data-tab="subparts"> <div class="ui tab active" data-tab="subparts">
<div class="ui eight column grid"> <div class="ui eight column grid parts">
{% for subpart in subparts %} {% for subpart in subparts %}
{{ blocks.model(subpart['model'], subpart['quantity']) }} {{ blocks.model(subpart['model'], subpart['quantity']) }}
{% endfor %} {% endfor %}
@ -83,7 +83,7 @@
</div> </div>
<div class="ui tab" data-tab="related"> <div class="ui tab" data-tab="related">
<div class="ui eight column grid"> <div class="ui eight column grid parts">
{% for subpart in related %} {% for subpart in related %}
<div class="column"> <div class="column">
{{ blocks.model(subpart) }} {{ blocks.model(subpart) }}
@ -93,7 +93,7 @@
</div> </div>
<div class="ui tab" data-tab="parents"> <div class="ui tab" data-tab="parents">
<div class="ui eight column grid"> <div class="ui eight column grid parts">
{% for subpart in model.parents %} {% for subpart in model.parents %}
<div class="column"> <div class="column">
{{ blocks.model(subpart.parent) }} {{ blocks.model(subpart.parent) }}

10
app/Resources/views/model/index.html.twig
View File

@ -11,15 +11,13 @@
<div class="row"> <div class="row">
<div class="column four wide"> <div class="column four wide">
<h3>{{ 'model.filter.title' | trans }}</h3> <h3>{{ 'model.filter.title' | trans }}</h3>
{#<form method="get" action="" class="ui form">#}
{{ form_start(form) }} {{ form_start(form) }}
{{ form_row(form.query) }}
{{ form_rest(form) }} {{ form_row(form.category) }}
<div class="field"> <div class="field">
<input class="ui fluid submit button" type="submit" value="Filter"/> <input class="ui fluid submit button" type="submit" value="Filter"/>
</div> </div>
{{ form_end(form) }} {{ form_end(form) }}
{#</form>#}
</div> </div>
<div class="column twelve wide"> <div class="column twelve wide">
<div class="ui header vertical noborder"> <div class="ui header vertical noborder">
@ -28,14 +26,14 @@
{{ knp_pagination_sortable(models, 'Number', 'm.id') }} {{ knp_pagination_sortable(models, 'Number', 'm.id') }}
{{ knp_pagination_sortable(models, 'Name', 'm.name') }} {{ knp_pagination_sortable(models, 'Name', 'm.name') }}
</div> </div>
<div class="found-count ui text menu"> <div class="found-count ui text menu">
<div class="header item">Showing</div> <div class="header item">Showing</div>
<span class="item">{{ models.getTotalItemCount }}</span> <span class="item">{{ models.getTotalItemCount }}</span>
</div> </div>
</div> </div>
<div class="ui segment vertical noborder"> <div class="ui segment vertical noborder">
<div class="ui six column doubling grid"> <div class="ui six column doubling grid parts">
{% for model in models %} {% for model in models %}
{{ blocks.model(model) }} {{ blocks.model(model) }}
{% else %} {% else %}

15
app/Resources/views/search/index.html.twig
View File

@ -7,26 +7,27 @@
{% block header %}{{ 'page.search' | trans({'%query%':query}) }}{% endblock %} {% block header %}{{ 'page.search' | trans({'%query%':query}) }}{% endblock %}
{% block content %} {% block content %}
<div class="ui vertical segment noborder"> <div class="ui vertical segment noborder">
<h3 class="ui dividing header">Sets</h3> <h2 class="ui dividing header">Sets</h2>
<div class="ui eight column doubling grid sets"> <div class="ui eight column doubling grid sets">
{% for set in sets %} {% for set in sets %}
{{ blocks.set(set) }} {{ blocks.set(set) }}
{% endfor %} {% endfor %}
</div> </div>
<a href="{{ path('set_index',{'s[query]':query}) }}">Show more</a> <div class="spacing top">
<a class="show all" href="{{ path('set_index',{'s[query]':query}) }}">{{ 'view.all.sets' | trans }}</a>
</div>
</div> </div>
<div class="ui vertical segment noborder"> <div class="ui vertical segment noborder">
<h3 class="ui dividing header">Models</h3> <h2 class="ui dividing header">Models</h2>
<div class="ui eight column doubling grid parts"> <div class="ui eight column doubling grid parts">
{% for model in models %} {% for model in models %}
{{ blocks.model(model) }} {{ blocks.model(model) }}
{% endfor %} {% endfor %}
</div> </div>
<a href="{{ path('model_index',{'m[query]':query}) }}">Show more</a> <div class="spacing top">
<a class="show all" href="{{ path('model_index',{'m[query]':query}) }}">{{ 'view.all.models' | trans }}</a>
</div>
</div> </div>
{% endblock %} {% endblock %}

4
app/Resources/views/set/detail.html.twig
View File

@ -9,9 +9,9 @@
{% block content %} {% block content %}
<div class="ui stackable grid"> <div class="ui stackable grid">
<div class="column nine wide"> <div class="column nine wide">
<div class="ui bordered fluid image"> <a class="ui bordered fluid image" href="{{ asset(set.id~'.jpg')|imagine_filter('set_large') }}" data-lightbox="setImages">
{{ blocks.setImage(set.id,'set_large') }} {{ blocks.setImage(set.id,'set_large') }}
</div> </a>
</div> </div>
<div class="column seven wide"> <div class="column seven wide">
<div class="item-info ui"> <div class="item-info ui">

77
app/Resources/views/set/index.html.twig
View File

@ -8,51 +8,52 @@
{% block content %} {% block content %}
<div class="ui container divided stackable grid"> <div class="ui container divided stackable grid">
<div class="row"> <div class="row">
<div class="column four wide"> <div class="column four wide">
<h3>{{ 'set.filter.title' | trans }}</h3> <h3>{{ 'set.filter.title' | trans }}</h3>
{{ form_start(form) }} {{ form_start(form) }}
{{ form_row(form.query) }} {{ form_row(form.query) }}
{{ form_row(form.theme) }} {{ form_row(form.theme) }}
{{ form_row(form.year) }} {{ form_row(form.year) }}
{{ form_row(form.partCount) }} {{ form_row(form.partCount) }}
{{ form_rest(form) }} {{ form_rest(form) }}
<div class="field">
<input class="ui fluid submit button" type="submit" value="Filter"/>
</div>
{{ form_end(form) }}
</div>
<div class="column twelve wide">
<div class="ui header vertical noborder">
<div class="ui text menu right floated">
<div class="header item">Sort By</div>
{{ knp_pagination_sortable(sets, 'Number', ['s.id']) }}
{{ knp_pagination_sortable(sets, 'Year', ['s.year']) }}
{{ knp_pagination_sortable(sets, 'Name', ['s.name']) }}
{{ knp_pagination_sortable(sets, 'Parts', ['s.partCount']) }}
<div class="field">
<input class="ui fluid submit button" type="submit" value="Filter"/>
</div> </div>
<div class="found-count ui text menu"> {{ form_end(form) }}
<div class="header item">Showing</div>
<span class="item">{{ sets.getTotalItemCount }}</span>
</div>
</div> </div>
<div class="column twelve wide">
<div class="ui header vertical noborder">
<div class="ui text menu right floated">
<div class="header item">Sort By</div>
<div class="ui segment vertical noborder"> {{ knp_pagination_sortable(sets, 'Number', ['s.id']) }}
<div class="ui four column doubling grid sets"> {{ knp_pagination_sortable(sets, 'Year', ['s.year']) }}
{% for set in sets %} {{ knp_pagination_sortable(sets, 'Name', ['s.name']) }}
{{ blocks.set(set) }} {{ knp_pagination_sortable(sets, 'Parts', ['s.partCount']) }}
{% else %} </div>
{{ blocks.empty('empty.sets') }}
{% endfor %} <div class="found-count ui text menu">
<div class="header item">Showing</div>
<span class="item">{{ sets.getTotalItemCount }}</span>
</div>
</div>
<div class="ui segment vertical noborder">
<div class="ui four column doubling grid sets">
{% for set in sets %}
{{ blocks.set(set) }}
{% else %}
{{ blocks.empty('empty.sets') }}
{% endfor %}
</div>
</div>
<div class="ui segment vertical noborder">
{{ knp_pagination_render(sets) }}
</div> </div>
</div>
<div class="ui segment vertical noborder">
{{ knp_pagination_render(sets) }}
</div> </div>
</div> </div>
</div> </div>