cleaning sass

pull/26/head
Ondřej Hruška 6 years ago
parent e5a6527d18
commit 69bda25bbb
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
  1. 7
      resources/assets/js/components/ColumnEditor.vue
  2. 18
      resources/assets/sass/_fa-utils.scss
  3. 2
      resources/assets/sass/app.scss
  4. 4
      resources/assets/sass/bootstrap-customizations/_card.scss
  5. 3
      resources/assets/sass/bootstrap-customizations/_navbar.scss
  6. 16
      resources/assets/sass/bootstrap-customizations/_variables.scss
  7. 3
      resources/views/table/create.blade.php

@ -50,10 +50,10 @@
td, th { td, th {
@include pr(1); @include pr(1);
@include py(1);
} }
td .btn { td .btn {
@include py(1);
@include mr(1); @include mr(1);
} }
</style> </style>
@ -77,11 +77,10 @@ export default {
this.columns.splice(n, 1) this.columns.splice(n, 1)
}, },
addCol() { addCol() {
let nth = this.columns.length+1
this.columns.push({ this.columns.push({
name: `column-${nth}`, name: '',
type: 'string', type: 'string',
title: `Column ${nth}`, title: '',
}) })
} }
} }

@ -1,30 +1,30 @@
// padding right for icons (must not use space next to it!) // padding right for icons (must not use space next to it!)
.fa-pr::before { .fa-pr::before {
margin-right: $sp1; margin-right: dist(2);
} }
.fa-pl::before { .fa-pl::before {
margin-left: $sp1; margin-left: dist(2);
} }
.fa-pr2::before { .fa-pr2::before {
margin-right: $sp2; margin-right: dist(4);
} }
.fa-pl2::before { .fa-pl2::before {
margin-left: $sp2; margin-left: dist(4);
} }
.fa-px::before { .fa-px::before {
margin-left: $sp1; margin-left: dist(2);
margin-right: $sp1; margin-right: dist(2);
} }
.fa-px2::before { .fa-px2::before {
margin-left: $sp2; margin-left: dist(4);
margin-right: $sp2; margin-right: dist(4);
} }
.fa-large.fa-pr::before { .fa-large.fa-pr::before {
margin-right: $sp2; margin-right: dist(4);
} }
.fa-large { .fa-large {

@ -23,6 +23,6 @@ html {
.bio-table { .bio-table {
td { td {
padding-top: $sp1; padding-top: dist(2);
} }
} }

@ -34,8 +34,8 @@
} }
.card-body .close { .card-body .close {
margin-top:-$sp1; margin-top: dist(-2);
margin-right:-$sp1; margin-right: dist(-2);
min-width: 1.5rem; min-width: 1.5rem;
text-align:center; text-align:center;
} }

@ -9,7 +9,8 @@
} }
.nav-link { .nav-link {
padding: $sp1 $sp3; @include py(2);
@include px(6);
display: inline-block; display: inline-block;
} }

@ -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
$body-bg: white; $body-bg: white;
@ -35,5 +23,5 @@ $tooltip-max-width: 300px;
$tooltip-bg: darken($primary, 20%); $tooltip-bg: darken($primary, 20%);
$tooltip-arrow-color: $tooltip-bg; $tooltip-arrow-color: $tooltip-bg;
$pagination-padding-y-sm: $sp1_2; $pagination-padding-y-sm: dist(1);
$pagination-padding-x-sm: $sp3_4; $pagination-padding-x-sm: dist(3);

@ -71,7 +71,8 @@
{!! Widget::textarea('data', 'Initial data')->value($exampleData)->height('12em') {!! Widget::textarea('data', 'Initial data')->value($exampleData)->height('12em')
->help(' ->help('
Initial table data in CSV format, columns corresponding to the 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.') !!}
<div class="row form-group"> <div class="row form-group">
<div class="col-md-7 offset-md-3"> <div class="col-md-7 offset-md-3">

Loading…
Cancel
Save