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

Fix header color

Browse Source
This commit is contained in:
Unknown 2017-06-03 17:34:15 +02:00
parent 0a7718bea8
commit 4d3faad864
5 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Resources/assets/style/colors.scss
View File

@ -146,4 +146,10 @@ $colors: (
.text.color-#{$number} { .text.color-#{$number} {
color: $color; color: $color;
} }
.segment.color-#{$number} {
padding-left: 0.7em !important;
margin-left: -1em !important;
border-left: $color 0.3em solid !important;
}
} }

14
app/Resources/views/set/tabs/colors.html.twig
View File

@ -8,16 +8,16 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
<div class="ui segment clearing noborder vertical"> <div class="ui segment clearing basic vertical">
<a class="ui primary right floated button" href="{{ path('set_zip', {id: set.id, sorted: true }) }}" download><i class="download icon"></i> {{ 'set.download.multicolor.button' | trans}}</a> <a class="ui primary right floated button" href="{{ path('set_zip', {id: set.id, sorted: true }) }}" download><i class="download icon"></i> {{ 'set.download.multicolor.button' | trans}}</a>
</div> </div>
{% if colors|length > 0 %} {% if colors|length > 0 %}
<div class="ui segment vertical noborder"> <div class="ui segment vertical basic">
<h3 class="ui horizontal divider header">Models</h3> <h2 class="ui dividing header">{{ 'set.inventory.models' | trans }}</h2>
{% for color in colors %} {% for color in colors %}
<div class="ui segment vertical noborder"> <div class="ui segment vertical basic side color-{{ color['color'].id }}">
<h5 class="ui dividing header text color-{{ color['color'].id }}"> <h5 class="ui header">
{{ color['color'].name }} ({{ color['quantity'] }}) {{ color['color'].name }} ({{ color['quantity'] }})
</h5> </h5>
<div class="ui grid doubling ten column row parts"> <div class="ui grid doubling ten column row parts">
@ -31,8 +31,8 @@
{% endif %} {% endif %}
{% if missing|length > 0 %} {% if missing|length > 0 %}
<div class="ui segment vertical noborder"> <div class="ui vertical segment basic">
<h3 class="ui horizontal divider header">Missing</h3> <h2 class="ui dividing header">{{ 'set.inventory.parts' | trans }}</h2>
<div class="ui grid doubling ten column row parts"> <div class="ui grid doubling ten column row parts">
{% for part in missing %} {% for part in missing %}
{{ blocks.part(part['part'],part['quantity']) }} {{ blocks.part(part['part'],part['quantity']) }}

64
app/Resources/views/set/tabs/inventory.html.twig
View File

@ -3,44 +3,44 @@
{% block content %} {% block content %}
<div class="ui segment vertical"> <div class="ui segment vertical">
{% for label, flashes in app.session.flashbag.all %} {% for label, flashes in app.session.flashbag.all %}
{% for flash in flashes %} {% for flash in flashes %}
{{ elements.flash(label,flash) }} {{ elements.flash(label,flash) }}
{% endfor %}
{% endfor %} {% endfor %}
{% endfor %}
{% if inventorySets %} {% if inventorySets %}
<h3 class="ui horizontal divider header">Sets</h3> <h3 class="ui horizontal divider header">Sets</h3>
<div class="ui eight column doubling grid sets"> <div class="ui eight column doubling grid sets">
{% for inventorySet in inventorySets %} {% for inventorySet in inventorySets %}
{{ blocks.set(inventorySet.set, inventorySet.quantity) }} {{ blocks.set(inventorySet.set, inventorySet.quantity) }}
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
{% if missingCount > 0 %} {% if missingCount > 0 %}
<div class="ui warning icon message"> <div class="ui warning icon message">
<i class="warning icon"></i> <i class="warning icon"></i>
<div class="content"> <div class="content">
<div class="header"> <div class="header">
{{ 'set.download.warning.title' | trans }} {{ 'set.download.warning.title' | trans }}
</div>
<p> {{ 'set.download.warning.text' | trans({'%percent%':((1 - missingCount/partCount)*100)|number_format(2, '.', ','), '%total%':partCount, '%missing%': missingCount, '%unique%': missing|length}) | raw | nl2br }}</p>
</div> </div>
<p> {{ 'set.download.warning.text' | trans({'%percent%':((1 - missingCount/partCount)*100)|number_format(2, '.', ','), '%total%':partCount, '%missing%': missingCount, '%unique%': missing|length}) | raw | nl2br }}</p>
</div> </div>
{% endif %}
<div class="ui top attached tabular menu submenu">
<a class="ui item {% if not app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/unicolor"><i class="grid layout icon"></i> Uni-Color</a>
<a class="ui item {% if app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/multicolor"><i class="list layout icon"></i> Multi-Color</a>
</div>
<div class="ui bottom attached tab {% if not app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/unicolor">
{{ render(path('set_models', {id: set.id})) }}
</div>
<div class="ui bottom attached tab {% if app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/multicolor">
{{ render(path('set_colors', {id: set.id})) }}
</div> </div>
{% endif %} {% endif %}
<div class="ui top attached tabular menu submenu">
<a class="ui item {% if not app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/unicolor"><i class="grid layout icon"></i> Uni-Color</a>
<a class="ui item {% if app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/multicolor"><i class="list layout icon"></i> Multi-Color</a>
</div>
<div class="ui bottom attached tab {% if not app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/unicolor">
{{ render(path('set_models', {id: set.id})) }}
</div>
<div class="ui bottom attached tab {% if app.session.get('multicolor') %}active{% endif %}" data-tab="inventory/multicolor">
{{ render(path('set_colors', {id: set.id})) }}
</div>
{% endif %}
</div> </div>
<div class="ui segment vertical"> <div class="ui segment vertical">
<p class="ui text right">{{ 'set.rebrickable.credit' | trans | raw }}</p> <p class="ui text right">{{ 'set.rebrickable.credit' | trans | raw }}</p>

4
app/Resources/views/set/tabs/models.html.twig
View File

@ -14,7 +14,7 @@
{% if models|length > 0 %} {% if models|length > 0 %}
<div class="ui segment vertical basic"> <div class="ui segment vertical basic">
<h3 class="ui horizontal divider header">Models</h3> <h2 class="ui dividing header">{{ 'set.inventory.models' | trans }}</h2>
<div class="ui grid doubling ten column row parts"> <div class="ui grid doubling ten column row parts">
{% for model in models %} {% for model in models %}
{{ blocks.model(model['model'],model['quantity']) }} {{ blocks.model(model['model'],model['quantity']) }}
@ -24,7 +24,7 @@
{% endif %} {% endif %}
{% if missing|length > 0 %} {% if missing|length > 0 %}
<div class="ui segment vertical basic"> <div class="ui segment vertical basic">
<h3 class="ui horizontal divider header">Missing</h3> <h2 class="ui dividing header">{{ 'set.inventory.parts' | trans }}</h2>
<div class="ui grid doubling ten column row parts"> <div class="ui grid doubling ten column row parts">
{% for part in missing %} {% for part in missing %}
{{ blocks.part(part['part'],part['quantity']) }} {{ blocks.part(part['part'],part['quantity']) }}

2
src/AppBundle/Entity/LDraw/Model.php
View File

@ -27,7 +27,7 @@ class Model
/** /**
* @var Category * @var Category
* *
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Category", inversedBy="models", cascade={"persist"}) * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Category", inversedBy="models", fetch="EAGER", cascade={"persist"})
*/ */
private $category; private $category;