more style split
This commit is contained in:
parent
77f0b9c73a
commit
45b37390a9
|
@ -26,12 +26,14 @@
|
|||
Client actuel:
|
||||
{% verbatim %}
|
||||
{{ activeSelling.length }} produit<span ng-if="activeSelling.length!=1">s</span>
|
||||
<div>
|
||||
<input type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
|
||||
<div class="input-group">
|
||||
<input class="input form-control input-group" type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
|
||||
|
||||
<button class="btn btn-default" ng-click="sellingComment = ''">
|
||||
<button type="button" class="btn btn-default input-group-addon" ng-click="sellingComment = ''">
|
||||
<i class="fa fa-times"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div>
|
||||
{% endverbatim %}
|
||||
{#<button class="btn btn-default" ng-click="sellingComment = 'boobbbbbb'">#}
|
||||
{#<i class="fa fa-arrow-right"></i>#}
|
||||
|
|
|
@ -69,7 +69,8 @@ swiftmailer:
|
|||
username: '%mailer_user%'
|
||||
password: '%mailer_password%'
|
||||
spool: { type: memory }
|
||||
|
||||
encryption: '%mailer_encryption%'
|
||||
port: '%mailer_port%'
|
||||
#fos user bundle
|
||||
fos_user:
|
||||
db_driver: orm # other valid values are 'mongodb' and 'couchdb'
|
||||
|
|
|
@ -14,6 +14,8 @@ parameters:
|
|||
mailer_host: 127.0.0.1
|
||||
mailer_user: root
|
||||
mailer_password: ~
|
||||
mailer_encryption: tls
|
||||
mailer_port: 465
|
||||
|
||||
# A secret key that's used to generate certain security-related tokens
|
||||
secret: ThisTokenIsNotSoSecretChangeIt
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
@import 'pages/libs';
|
||||
@import 'split/override_libs';
|
||||
@import 'split/custom_vars';
|
||||
@import 'split/formulaires';
|
||||
@import 'split/typo';
|
||||
|
|
|
@ -12,21 +12,10 @@ body {
|
|||
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;
|
||||
overflow: hidden;
|
||||
//z-index: -1;
|
||||
}
|
||||
|
||||
.logo-main {
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
h2, h3, h4, h5, h6 {
|
||||
color: mix($dark, $all-text-color);
|
||||
}
|
||||
|
||||
h1, .h1, h2, .h2, h3, .h3 {
|
||||
margin-top: 5px;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue