From 69bda25bbb3af59062b993b964acb113b0b0f521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sat, 4 Aug 2018 14:00:46 +0200 Subject: [PATCH] cleaning sass --- .../assets/js/components/ColumnEditor.vue | 7 +++---- resources/assets/sass/_fa-utils.scss | 18 +++++++++--------- resources/assets/sass/app.scss | 2 +- .../sass/bootstrap-customizations/_card.scss | 4 ++-- .../sass/bootstrap-customizations/_navbar.scss | 3 ++- .../bootstrap-customizations/_variables.scss | 16 ++-------------- resources/views/table/create.blade.php | 3 ++- 7 files changed, 21 insertions(+), 32 deletions(-) diff --git a/resources/assets/js/components/ColumnEditor.vue b/resources/assets/js/components/ColumnEditor.vue index 2f49319..96ea5e7 100644 --- a/resources/assets/js/components/ColumnEditor.vue +++ b/resources/assets/js/components/ColumnEditor.vue @@ -50,10 +50,10 @@ td, th { @include pr(1); + @include py(1); } td .btn { - @include py(1); @include mr(1); } @@ -77,11 +77,10 @@ export default { this.columns.splice(n, 1) }, addCol() { - let nth = this.columns.length+1 this.columns.push({ - name: `column-${nth}`, + name: '', type: 'string', - title: `Column ${nth}`, + title: '', }) } } diff --git a/resources/assets/sass/_fa-utils.scss b/resources/assets/sass/_fa-utils.scss index ae3661e..bdf1a35 100644 --- a/resources/assets/sass/_fa-utils.scss +++ b/resources/assets/sass/_fa-utils.scss @@ -1,30 +1,30 @@ // padding right for icons (must not use space next to it!) .fa-pr::before { - margin-right: $sp1; + margin-right: dist(2); } .fa-pl::before { - margin-left: $sp1; + margin-left: dist(2); } .fa-pr2::before { - margin-right: $sp2; + margin-right: dist(4); } .fa-pl2::before { - margin-left: $sp2; + margin-left: dist(4); } .fa-px::before { - margin-left: $sp1; - margin-right: $sp1; + margin-left: dist(2); + margin-right: dist(2); } .fa-px2::before { - margin-left: $sp2; - margin-right: $sp2; + margin-left: dist(4); + margin-right: dist(4); } .fa-large.fa-pr::before { - margin-right: $sp2; + margin-right: dist(4); } .fa-large { diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index e93ce8f..1b0a595 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -23,6 +23,6 @@ html { .bio-table { td { - padding-top: $sp1; + padding-top: dist(2); } } diff --git a/resources/assets/sass/bootstrap-customizations/_card.scss b/resources/assets/sass/bootstrap-customizations/_card.scss index 56ddeb1..7587e02 100644 --- a/resources/assets/sass/bootstrap-customizations/_card.scss +++ b/resources/assets/sass/bootstrap-customizations/_card.scss @@ -34,8 +34,8 @@ } .card-body .close { - margin-top:-$sp1; - margin-right:-$sp1; + margin-top: dist(-2); + margin-right: dist(-2); min-width: 1.5rem; text-align:center; } diff --git a/resources/assets/sass/bootstrap-customizations/_navbar.scss b/resources/assets/sass/bootstrap-customizations/_navbar.scss index a070142..622dbe2 100644 --- a/resources/assets/sass/bootstrap-customizations/_navbar.scss +++ b/resources/assets/sass/bootstrap-customizations/_navbar.scss @@ -9,7 +9,8 @@ } .nav-link { - padding: $sp1 $sp3; + @include py(2); + @include px(6); display: inline-block; } diff --git a/resources/assets/sass/bootstrap-customizations/_variables.scss b/resources/assets/sass/bootstrap-customizations/_variables.scss index 49fd85a..91eb3c8 100644 --- a/resources/assets/sass/bootstrap-customizations/_variables.scss +++ b/resources/assets/sass/bootstrap-customizations/_variables.scss @@ -1,15 +1,3 @@ -$sp0: 0; -$sp1_2: $spacer*.25; - -$sp1_4: $spacer*.125; -$sp2_4: $sp1_2; -$sp3_4: $spacer*.75; - -$sp1: $spacer*.5; -$sp2: $spacer*1; -$sp3: $spacer*1.5; -$sp4: $spacer*2; - // Body $body-bg: white; @@ -35,5 +23,5 @@ $tooltip-max-width: 300px; $tooltip-bg: darken($primary, 20%); $tooltip-arrow-color: $tooltip-bg; -$pagination-padding-y-sm: $sp1_2; -$pagination-padding-x-sm: $sp3_4; +$pagination-padding-y-sm: dist(1); +$pagination-padding-x-sm: dist(3); diff --git a/resources/views/table/create.blade.php b/resources/views/table/create.blade.php index 9eb9602..743603f 100644 --- a/resources/views/table/create.blade.php +++ b/resources/views/table/create.blade.php @@ -71,7 +71,8 @@ {!! Widget::textarea('data', 'Initial data')->value($exampleData)->height('12em') ->help(' Initial table data in CSV format, columns corresponding to the - specification you entered above.') !!} + specification you entered above. This is optional; you can fill the table + later, e.g. by uploading a CSV file.') !!}