Skip to content

Commit c644ecc

Browse files
committed
fix value vertical-align
add qmlls configguration file to .gitignore
1 parent fd3918b commit c644ecc

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,7 @@ QMLComponents/utilities/appdirs.h
8686

8787
# Bundle related
8888
Tools/ModuleBundleBuildDir
89-
Modules/local
89+
Modules/local
90+
91+
# User configurations
92+
.qmlls.ini

Desktop/html/css/jasp.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,12 @@ th[colspan="2"] {
102102
}
103103

104104
td {
105-
padding-left: 2em;
105+
text-align: right;
106+
vertical-align: bottom;
107+
padding-left: 1em;
106108
padding-right: 1em;
107-
text-align: right ;
108-
vertical-align: top ;
109+
/* padding-top: .25em; because algin to buttom then seems visual balanced */
110+
padding-bottom: .25em;
109111
}
110112

111113
thead tr:nth-child(2) th:not(.separator) {
@@ -129,6 +131,8 @@ thead th {
129131
white-space: nowrap;
130132
padding-top: .25em ;
131133
padding-bottom: .25em ;
134+
padding-left: 1em;
135+
padding-right: 1em;
132136
}
133137

134138
tbody th {
@@ -189,7 +193,7 @@ tbody tr td.new-sub-group-row {
189193

190194
tbody tr td.new-group-row,
191195
tbody tr:first-child td {
192-
196+
vertical-align: top; /* align to top for first group rows */
193197
padding-top: .9em ;
194198
}
195199

Desktop/html/js/jaspwidgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ JASPWidgets.Exporter = {
250250
},
251251

252252
getTableContentStyles: function (element, exportParams) {
253-
return JASPWidgets.Exporter.getStyles(element, ["border-collapse", "border-top-width", "border-bottom-width", "border-left-width", "border-right-width", "border-color", "border-style", "padding", "text-align", "margin", "display", "float", "font-size", "font-weight", "font", "color"]);
253+
return JASPWidgets.Exporter.getStyles(element, ["border-collapse", "border-top-width", "border-bottom-width", "border-left-width", "border-right-width", "border-color", "border-style", "padding", "text-align", "margin", "display", "float", "font-size", "font-weight", "font", "color", "background", "background-color"]);
254254
},
255255

256256
getErrorStyles: function (element, component) {

Desktop/html/js/table.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
556556

557557
chunks.push('<thead>')
558558
chunks.push('<tr>')
559-
chunks.push('<th colspan="' + columnCount + '"><div class="toolbar"></div></div>')
559+
chunks.push('<th colspan="' + columnCount + '"><div class="toolbar"></div>')
560560

561561
if (optError && optError.errorMessage) {
562562

@@ -705,8 +705,8 @@ JASPWidgets.tablePrimitive = JASPWidgets.View.extend({
705705
cellHtml += '>'
706706
cellHtml += (typeof cell.content != "undefined" ? cell.content : '')
707707

708-
if (typeof cell.footnotes != "undefined" && cell.footnotes.length > 0)
709-
cellHtml += '<sup>' + cell.footnotes.join('') + '</sup>'
708+
if (typeof cell.footnotes != "undefined")
709+
cellHtml += cell.footnotes.join(' ')
710710

711711
cellHtml += (cell.header ? '</th>' : '</td>')
712712

0 commit comments

Comments
 (0)