tykayn/caisse-bliss
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

more style split

Browse Source
This commit is contained in:
Kayn Ty 2018-04-20 13:57:10 +02:00
parent 77f0b9c73a
commit 45b37390a9
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Resources/views/logged/dashboard.html.twig
View File

@ -26,12 +26,14 @@
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> <div class="input-group">
<input type="text" ng-model="sellingComment" placeholder="nom ou commentaire"> <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> <i class="fa fa-times"></i>
</button> </button>
</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>#}

3
app/config/config.yml
View File

@ -69,7 +69,8 @@ swiftmailer:
username: '%mailer_user%' username: '%mailer_user%'
password: '%mailer_password%' password: '%mailer_password%'
spool: { type: memory } spool: { type: memory }
encryption: '%mailer_encryption%'
port: '%mailer_port%'
#fos user bundle #fos user bundle
fos_user: fos_user:
db_driver: orm # other valid values are 'mongodb' and 'couchdb' db_driver: orm # other valid values are 'mongodb' and 'couchdb'

2
app/config/parameters.yml.dist
View File

@ -14,6 +14,8 @@ parameters:
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
mailer_user: root mailer_user: root
mailer_password: ~ mailer_password: ~
mailer_encryption: tls
mailer_port: 465
# A secret key that's used to generate certain security-related tokens # A secret key that's used to generate certain security-related tokens
secret: ThisTokenIsNotSoSecretChangeIt secret: ThisTokenIsNotSoSecretChangeIt

1
assets/css/app.scss
View File

@ -1,4 +1,5 @@
@import 'pages/libs'; @import 'pages/libs';
@import 'split/override_libs';
@import 'split/custom_vars'; @import 'split/custom_vars';
@import 'split/formulaires'; @import 'split/formulaires';
@import 'split/typo'; @import 'split/typo';

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

@ -12,21 +12,10 @@ body {
min-height: 80vh; min-height: 80vh;
} }
h1, .h1, h2, .h2, h3, .h3 {
margin-top: 5px;
margin-bottom: 0.5em;
}
.bg-img { .bg-img {
background-image: url('bg.jpg'); background-image: url('bg.jpg');
background-size: cover; background-size: cover;
//opacity: 0.2;
//filter: alpha(opacity=20);
//width: 100vw;
//height: 100vh;
//position: fixed;
overflow: hidden; overflow: hidden;
//z-index: -1;
} }
.logo-main { .logo-main {

0
assets/css/pages/main_screen.scss Normal file
View File

0
assets/css/split/override_libs.scss Normal file
View File

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

@ -1,3 +1,8 @@
h2, h3, h4, h5, h6 { h2, h3, h4, h5, h6 {
color: mix($dark, $all-text-color); color: mix($dark, $all-text-color);
} }
h1, .h1, h2, .h2, h3, .h3 {
margin-top: 5px;
margin-bottom: 0.5em;
}