diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-11 16:07:08 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-11 16:07:08 +0100 |
| commit | 3b88a41b64b5ddcfe07b18856333200921c9b2d2 (patch) | |
| tree | adda20c80dd10d70875106433f86c91d4473a6b9 | |
| parent | cede16f5a2d9d774aef911177a1c23c129dbb7f1 (diff) | |
| download | gitlab-ce-xlsx-renderer.tar.gz | |
Fixed testsxlsx-renderer
Improve design
| -rw-r--r-- | app/assets/javascripts/blob/xlsx/components/table.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/xlsx.scss | 27 | ||||
| -rw-r--r-- | config/dependency_decisions.yml | 12 |
3 files changed, 40 insertions, 3 deletions
diff --git a/app/assets/javascripts/blob/xlsx/components/table.vue b/app/assets/javascripts/blob/xlsx/components/table.vue index 256d3fa9f26..81227fefaea 100644 --- a/app/assets/javascripts/blob/xlsx/components/table.vue +++ b/app/assets/javascripts/blob/xlsx/components/table.vue @@ -1,7 +1,7 @@ <template> <div class="table-responsive"> <table - class="table"> + class="table table-striped table-bordered xlsx-table"> <thead> <tr> <th></th> @@ -16,7 +16,7 @@ v-for="(row, index) in sheet.rows" :id="index + 1" :class="{ hll: currentLineNumber === index + 1 }"> - <td> + <td class="text-right"> <a :href="linePath(index)" @click="updateCurrentLineNumber(index)"> diff --git a/app/assets/stylesheets/pages/xlsx.scss b/app/assets/stylesheets/pages/xlsx.scss index 83b3759825e..d34a001e3f0 100644 --- a/app/assets/stylesheets/pages/xlsx.scss +++ b/app/assets/stylesheets/pages/xlsx.scss @@ -1,5 +1,30 @@ +$hll-bg: #f8eec7; + .hll { > td { - background-color: #f8eec7; + background-color: $hll-bg; + } +} + +.xlsx-table { + border: 0; + + > thead > tr > th { + &:first-of-type { + border-left: 0; + } + + &:last-of-type { + border-right: 0; + } + } + + > tbody > tr > td { + &:first-of-type { + background-color: $gray-light; + border-top: 0; + border-bottom: 0; + vertical-align: middle; + } } } diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 59c7050a14d..a21463f4679 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -398,3 +398,15 @@ :why: https://github.com/remy/undefsafe/blob/master/LICENSE :versions: [] :when: 2017-04-10 06:30:00.002555000 Z +- - :approve + - printj + - :who: Phil Hughes + :why: https://github.com/SheetJS/printj/blob/master/LICENSE + :versions: [] + :when: 2017-04-11 15:04:29.316170000 Z +- - :approve + - voc + - :who: Phil Hughes + :why: https://github.com/SheetJS/voc/blob/master/LICENSE + :versions: [] + :when: 2017-04-11 15:05:17.527393000 Z |