diff --git a/package-lock.json b/package-lock.json index ab49423..e962b0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "pedi2", + "name": "www", "lockfileVersion": 2, "requires": true, "packages": { @@ -7,6 +7,7 @@ "dependencies": { "animate.css": "^4.1.1", "bulma": "^0.9.4", + "bulma-switch": "^2.0.4", "bulma-toast": "^2.4.1" }, "devDependencies": { @@ -3006,6 +3007,11 @@ "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" }, + "node_modules/bulma-switch": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bulma-switch/-/bulma-switch-2.0.4.tgz", + "integrity": "sha512-kMu4H0Pr0VjvfsnT6viRDCgptUq0Rvy7y7PX6q+IHg1xUynsjszPjhAdal5ysAlCG5HNO+5YXxeiu92qYGQolw==" + }, "node_modules/bulma-toast": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/bulma-toast/-/bulma-toast-2.4.1.tgz", @@ -15942,6 +15948,11 @@ "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" }, + "bulma-switch": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/bulma-switch/-/bulma-switch-2.0.4.tgz", + "integrity": "sha512-kMu4H0Pr0VjvfsnT6viRDCgptUq0Rvy7y7PX6q+IHg1xUynsjszPjhAdal5ysAlCG5HNO+5YXxeiu92qYGQolw==" + }, "bulma-toast": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/bulma-toast/-/bulma-toast-2.4.1.tgz", diff --git a/package.json b/package.json index 546179d..ca11d30 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "dependencies": { "animate.css": "^4.1.1", "bulma": "^0.9.4", + "bulma-switch": "^2.0.4", "bulma-toast": "^2.4.1" } } diff --git a/resources/js/components/SubpedidoRow.vue b/resources/js/components/SubpedidoRow.vue index e5a14c6..8bfe718 100644 --- a/resources/js/components/SubpedidoRow.vue +++ b/resources/js/components/SubpedidoRow.vue @@ -21,7 +21,6 @@ export default { }, mounted() { Event.$on('sync-aprobacion', (unSubpedido) => { - console.log(unSubpedido); if (this.pedido.id === unSubpedido.id) { this.pedido = unSubpedido } diff --git a/resources/js/components/SubpedidoRowBotonAdmin.vue b/resources/js/components/SubpedidoRowBotonAdmin.vue index 0b4c310..10f7483 100644 --- a/resources/js/components/SubpedidoRowBotonAdmin.vue +++ b/resources/js/components/SubpedidoRowBotonAdmin.vue @@ -1,10 +1,8 @@ - diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 99c6539..53ed8c1 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -4,6 +4,9 @@ // Variables @import 'variables'; +@import 'bulma'; +@import '~bulma-switch'; + main.has-top-padding { padding-top: 4.5rem !important; } @@ -33,4 +36,28 @@ main.chisma-abierta { .container { max-height: 100% !important; } - \ No newline at end of file + +/* + Author: Aseem Lalfakawma + This SCSS mixin will allow sizing of table columns in Bulma CSS Framework. + The Bulma framework does not support this yet, this small code snippet fixes this. + + USAGE: + * Should be applied on TH element, it controls all the columns under it * + The class should be "is-#", + is-1 will give the first widthamount, is-2 will give the second. + Eg. The code below shows the widthAmounts as (1, 2.5, 3, 4 , 5, 6, 7) + When typing , the width will be 2.5em, as the second value in widthAmounts array is 2.5 +*/ + +$widthAmounts: (15); // Just add the numbers here, you can use points too. +$widthUnit: "em"; // Add the unit here (rem|em|px|%) + +@each $width in $widthAmounts { + $i: index($widthAmounts, $width); + @media only screen and (min-width: 768px) { + .table thead th.is-#{$i} { + width: #{$width}#{$widthUnit} !important; + } + } +} \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 48e28bf..012770d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -12,7 +12,6 @@ - @yield('stylesheets')