one line product
This commit is contained in:
parent
96817ba994
commit
bacf61f976
@ -5,7 +5,7 @@
|
|||||||
<div class="login-choices">
|
<div class="login-choices">
|
||||||
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
|
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-10">
|
<div class="col-xs-9">
|
||||||
<div id="menu-dashboard">
|
<div id="menu-dashboard">
|
||||||
<ul class="nav nav-pills">
|
<ul class="nav nav-pills">
|
||||||
<li>
|
<li>
|
||||||
@ -94,7 +94,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-2 text-right">
|
<div class="col-xs-3 text-right">
|
||||||
Bonjour
|
Bonjour
|
||||||
<a href="{{ path('fos_user_profile_edit') }}">
|
<a href="{{ path('fos_user_profile_edit') }}">
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
class="product-box"
|
class="product-box"
|
||||||
ng-class="{ 'btn-primary' : activeItemsSold.indexOf(p.id) !==-1}"
|
ng-class="{ 'btn-primary' : activeItemsSold.indexOf(p.id) !==-1}"
|
||||||
>
|
>
|
||||||
<button ng-click="addProduct( p )">
|
<button class="product-button" ng-click="addProduct( p )">
|
||||||
<img class="product-image" src="{{p.image}}" alt="image" ng-if="p.image.length">
|
<img class="product-image" src="{{p.image}}" alt="image" ng-if="p.image.length">
|
||||||
<span class="product-name">
|
<span class="product-name">
|
||||||
{{ p.name }}
|
{{ p.name }}
|
||||||
@ -21,7 +21,7 @@
|
|||||||
{{ p.stockCount }}
|
{{ p.stockCount }}
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
<button ng-if="expressSelling" ng-click="expressSell(p)">
|
<button class="express-button" ng-if="expressSelling" ng-click="expressSell(p)" title="achat express sans compléter les infos du client">
|
||||||
<i class="fa fa-shopping-cart"></i>
|
<i class="fa fa-shopping-cart"></i>
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
|
{% verbatim %}
|
||||||
|
<button>tooltip example</button>
|
||||||
{% verbatim %}
|
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</button>
|
||||||
|
|
||||||
<div id="not_loaded" ng-if="!initLoadDone">
|
<div id="not_loaded" ng-if="!initLoadDone">
|
||||||
<div class="well">
|
<div class="well">
|
||||||
<i class="fa fa-refresh fa-spin fa-3x"></i> Chargement en cours de vos produits
|
<i class="fa fa-refresh fa-spin fa-3x"></i> Chargement en cours de vos produits
|
||||||
|
@ -25,15 +25,15 @@
|
|||||||
<i class="fa fa-user"></i>
|
<i class="fa fa-user"></i>
|
||||||
Client actuel:
|
Client actuel:
|
||||||
{% verbatim %}
|
{% verbatim %}
|
||||||
{{ activeSelling.length }} produit<span ng-if="activeSelling.length!=1">s</span>
|
{{ activeSelling.length }} produit<span ng-if="activeSelling.length!=1">s</span>
|
||||||
<div class="input-group">
|
<div class="input-group pull-right">
|
||||||
<input class="input form-control input-group" type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
|
<input class="input form-control pull-right " type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
|
||||||
|
|
||||||
<button type="button" class="btn btn-default input-group-addon" ng-click="sellingComment = ''">
|
<button type="button" class="pull-right deleter" ng-click="sellingComment = ''">
|
||||||
<i class="fa fa-times"></i>
|
<i class="fa fa-times"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{% endverbatim %}
|
{% endverbatim %}
|
||||||
{#<button class="btn btn-default" ng-click="sellingComment = 'boobbbbbb'">#}
|
{#<button class="btn btn-default" ng-click="sellingComment = 'boobbbbbb'">#}
|
||||||
{#<i class="fa fa-arrow-right"></i>#}
|
{#<i class="fa fa-arrow-right"></i>#}
|
||||||
|
@ -7,5 +7,6 @@
|
|||||||
@import 'pages/global';
|
@import 'pages/global';
|
||||||
//@import 'pages/demo';
|
//@import 'pages/demo';
|
||||||
@import 'pages/home';
|
@import 'pages/home';
|
||||||
|
@import 'pages/dashboard';
|
||||||
@import 'pages/special';
|
@import 'pages/special';
|
||||||
@import 'pages/responsive';
|
@import 'pages/responsive';
|
||||||
|
37
assets/css/pages/_dashboard.scss
Normal file
37
assets/css/pages/_dashboard.scss
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
#caisse-now {
|
||||||
|
.product-box {
|
||||||
|
display: inline-block;
|
||||||
|
margin-right: 1rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.product-button {
|
||||||
|
min-width: 90%;
|
||||||
|
}
|
||||||
|
.listing-products {
|
||||||
|
.btn, button {
|
||||||
|
font-size: 2rem;
|
||||||
|
background: white;
|
||||||
|
padding: 1.5rem;
|
||||||
|
-webkit-border-radius: 1rem;
|
||||||
|
-moz-border-radius: 1rem;
|
||||||
|
border-radius: 1rem;
|
||||||
|
border-color: $all-text-color;
|
||||||
|
box-shadow: 5px 3px 26px 2px #ddd;
|
||||||
|
border-width: 0;
|
||||||
|
&.btn-primary {
|
||||||
|
background-color: $deepblue;
|
||||||
|
}
|
||||||
|
&:hover {
|
||||||
|
background: $lightblue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.badge-default {
|
||||||
|
background: $lightblue;
|
||||||
|
}
|
||||||
|
.badge-success {
|
||||||
|
background: mix(green, $lightblue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
body {
|
body {
|
||||||
color: $all-text-color;
|
color: $all-text-color;
|
||||||
|
font-family: "Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-inverse {
|
.navbar-inverse {
|
||||||
|
@ -176,4 +176,7 @@ angular
|
|||||||
$scope.fetchProductsFromDB();
|
$scope.fetchProductsFromDB();
|
||||||
})();
|
})();
|
||||||
}]);
|
}]);
|
||||||
|
console.log('jQuery', jQuery);
|
||||||
|
jQuery(function () {
|
||||||
|
$('[data-toggle="tooltip"]').tooltip()
|
||||||
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user