tykayn
/
caisse-bliss
mirror of https://forge.chapril.org/tykayn/caisse-bliss.git
1
0
Fork 0
Code Issues Releases Activity

style general

This commit is contained in:
Kayn Ty 2018-04-20 10:04:29 +02:00
parent 4e1cf2e348
commit d555484769
8 changed files with 72 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Resources/views/default/description-app.html.twig
View File

@ -1,4 +1,4 @@
<div class="product-values">
<div class="product-values marged-v">
<div class="row">
<div class="col-xs-4 text-center">
<i class="fa fa-check-circle fa-3x"></i>
@ -35,7 +35,12 @@
<div class="col-xs-4 text-center">
<i class="fa fa-pie-chart fa-3x"></i>
<h2>Statistiques</h2>
<p>Données statistiques et brutes exportables et importables librement.</p>
<p>Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes.</p>
</div>
<div class="col-xs-4 text-center">
<i class="fa fa-heart-o fa-3x"></i>
<h2>Data Love</h2>
<p>Données exportables et importables en masse librement.</p>
</div>
</div>
</div>

2
app/Resources/views/default/footer.html.twig
View File

@ -1,4 +1,4 @@
<footer class="big-footer text-center">
<footer class="big-footer text-center container">
<sub class="footer-note text-center"> développé par Tykayn /
<a href="http://www.cipherbliss.com">
Cipher Bliss

23
app/Resources/views/default/header.html.twig
View File

@ -1,22 +1,11 @@
<div class="header-block">
<div class="header-block container">
<div class="row">
{% if usersCount is defined %}
<div class="col-xs-9">
{% include 'default/login-choices.html.twig' %}
</div>
<div class="col-xs-3">
<i class="fa fa-users"></i> {{ usersCount *389 }} utilisateurs
</div>
{% else %}
<div class="col-xs-12">
{% include 'default/login-choices.html.twig' %}
</div>
{% endif %}
<div class="col-xs-12">
{% include 'default/login-choices.html.twig' %}
</div>
</div>
<div class="row">
<div class="col">
<div class="row-fluid">
<div class="col-xs-12">
{% if app.request.hasPreviousSession %}
{% for type, messages in app.session.flashBag.all %}

22
app/Resources/views/default/login-choices.html.twig
View File

@ -1,7 +1,7 @@
{% trans_default_domain 'FOSUserBundle' %}
{% block loginchoices %}
<div class="loginland">
<div class="well">
<div class="loginland ">
<div class="bg-img padded">
<div class="login-choices">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<div class="row">
@ -15,7 +15,6 @@
btn-default
{% endif %}" href="{{ path('homepage') }}" title="accueil Caisse">
<i class="fa fa-circle-o-notch "></i>
{#(route actuelle: {{ app.request.attributes.get('_route') }})#}
</a>
<li>
<li>
@ -106,15 +105,14 @@
{% else %}
{#<a class="btn btn-default btn-block btn-twitter" href="{{ hwi_oauth_login_url('google') }}">#}
{#<i class="fa fa-google"></i>#}
{#Via {{ 'google' | trans({}, 'HWIOAuthBundle') }}#}
{#</a>#}
<br>
<a class="btn btn-primary"
href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans }}</a>
<a class="btn btn-default"
href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans }}</a>
<h1 class="text-right">
<a class="btn btn-primary"
href="{{ path('fos_user_security_login') }}">
<i class="fa fa-key"></i>
{{ 'layout.login'|trans }}</a>
<a class="btn btn-default"
href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans }}</a>
</h1>
{% endif %}
</div>
</div>

13
app/Resources/views/default/main-screen.html.twig
View File

@ -11,6 +11,10 @@
<a class="btn btn-primary" href="{{ path('fos_user_security_login') }}" class="btn btn-primary">Essayez dès
maintenant
</a>
<p>
Démonstration en vous connectant avec le login: <strong>demo</strong> et le mot de passe
<strong>demo</strong>.
</p>
</div>
</div>
{% include 'default/description-app.html.twig' %}
@ -28,14 +32,15 @@
</p>
</div>
<div class="col-xs-6">
<a class="btn btn-default" href="{{ path('fos_user_security_login') }}">
<i class="fa fa-key"></i>
Se connecter
</a>
<a class="btn btn-primary" href="{{ path('fos_user_registration_register') }}">
<i class="fa fa-user"></i>
Créer un compte
</a>
<a class="btn btn-default" href="{{ path('fos_user_security_login') }}">
<i class="fa fa-user"></i>
Se connecter
</a>
</div>
</div>
</fieldset>

6
app/Resources/views/logged/angular/listing-products.html.twig
View File

@ -9,8 +9,8 @@ class="btn" ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSel
<h2>
{{ c.name }}
</h2>
<div ng-repeat="p in c.products track by p.id"
class="btn btn-default"
<span ng-repeat="p in c.products track by p.id"
class="product-box"
ng-class="{ 'btn-primary' : activeItemsSold.indexOf(p.id) !==-1}"
>
<button ng-click="addProduct( p )">
@ -28,7 +28,7 @@ class="btn" ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSel
<button ng-if="expressSelling" ng-click="expressSell(p)">
<i class="fa fa-shopping-cart"></i>
</button>
</div>
</span>
</div>
{% endverbatim %}

39
assets/css/pages/global.scss
View File

@ -4,24 +4,29 @@ body {
color: $all-text-color;
}
#bodyland {
padding-top: 1em;
#wrapper {
min-height: 100vh;
}
.main-screen {
min-height: 80vh;
}
h1, .h1, h2, .h2, h3, .h3 {
margin-top: 5px;
margin-bottom: 0.5em;
}
.bg-img {
background-image: url('bg.jpg');
background-size: cover;
opacity: 0.2;
filter: alpha(opacity=20);
width: 100vw;
height: 100vh;
position: fixed;
//opacity: 0.2;
//filter: alpha(opacity=20);
//width: 100vw;
//height: 100vh;
//position: fixed;
overflow: hidden;
z-index: -1;
//z-index: -1;
}
.logo-main {
@ -55,3 +60,21 @@ label {
margin: 0 auto;
text-align: center;
}
.padded {
padding: 1rem;
&-v {
padding: 0;
padding-top: 1rem;
padding-bottom: 1rem;
}
}
.marged {
margin: 1rem;
&-v {
margin: 0;
margin-top: 1rem;
margin-bottom: 1rem;
}
}

5
assets/css/split/formulaires.scss
View File

@ -11,3 +11,8 @@ table {
.btn-primary {
background: $all-text-color;
}
.product-box {
margin-right: 0.5em;
margin-bottom: 0.5em;
}