Commit d48af775 authored by Michal Lupecka's avatar Michal Lupecka

Merge branch 'pakon-dot-js' into 'speedup'

# Conflicts:
#   src/templates/pakon/_results.tpl
parents 510de936 1ca1c3b1
#pakon-results td, #pakon-results th {
padding: 0.3em 0.8em;
border-bottom: 1px solid #fff;
white-space: nowrap;
}
#pakon-results tr:first-child td {
padding-top: 0.5em;
......@@ -22,22 +23,14 @@ tbody td:nth-child(2), tbody td:nth-child(6), tbody td:nth-child(7) {
}
td[style] {
background-image: linear-gradient(to top, red, red);
background-image: linear-gradient(to top, #eee, #eee);
background-repeat: no-repeat;
background-position: left bottom;
background-size: 0% 0.2em;
}
tbody td:nth-child(4) {
position: relative;
padding-left: 2.5em;
}
tbody td:nth-child(4) span:not(.clickable) {
position: absolute;
left: 0.8em;
display: inline-block;
width: 1em;
height: 1em;
display: none;
}
.chart span {
......@@ -60,13 +53,18 @@ tbody td:nth-child(4) span:not(.clickable) {
.tags > span {
position: relative;
border: 1px solid blue;
background: #ddd;
border-radius: 1em;
padding: 0.3em 0.5em;
margin-right: 1em;
}
.tags > span::after {
content: "x";
text-align: right;
background: red;
background: #aaa;
color: #fff;
border-radius: 0.5em;
text-align: center;
border: 1px solid red;
position: absolute;
display: inline-block;
width: 0.9em;
......@@ -75,7 +73,9 @@ tbody td:nth-child(4) span:not(.clickable) {
}
div[contenteditable] {
border: 1px outset #aaa;
border: 1px inset #aaa;
padding: 0.5em;
min-height: 1.6em;
}
tbody td:nth-child(3), tbody td:nth-child(8), tbody td:nth-child(9) {
......@@ -83,9 +83,12 @@ tbody td:nth-child(3), tbody td:nth-child(8), tbody td:nth-child(9) {
}
.chart {
display: inline-block;
padding-left: 0;
list-style-type: none;
font-size: 0;
width: 400px;
max-width: 400px;
}
.chart > li {
background: #aaa;
......@@ -94,6 +97,15 @@ tbody td:nth-child(3), tbody td:nth-child(8), tbody td:nth-child(9) {
white-space: nowrap;
}
.clickable.filter {
position: relative;
display: inline-block;
font-size: 0;
width: 0.8rem;
height: 0.8rem;
background: url(../img/filter-add.svg);
}
/***** */
.bc-background-500px, .bc-background-500px-1 {
background-color: #0099e5;
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 480.71 480.71" style="enable-background:new 0 0 480.71 480.71;" xml:space="preserve">
<g>
<path d="M478.538,9.653C475.642,3.861,469.85,0,462.128,0H19.064C11.342,0,5.55,3.861,2.654,9.653s-0.965,12.549,3.861,18.34
l161.202,174.716c1.931,1.931,2.896,6.757,2.896,8.688v196.917c0,9.653,6.757,20.271,15.445,25.097l96.528,45.368
c2.896,0.965,5.792,1.931,8.688,1.931c2.896,0,6.757-0.965,9.653-2.896c4.826-2.896,7.722-8.688,7.722-15.444V211.396
c0-1.931,1.931-6.757,2.896-8.688L472.746,27.993C479.503,22.201,480.468,15.444,478.538,9.653z M285.482,452.717l-87.841-41.507
c-0.965,0-1.931-1.931-1.931-2.896V211.396c0-0.965,0-1.931,0-1.931h89.771c0,0.965,0,1.931,0,1.931V452.717z M297.065,184.369
H185.092L37.404,24.132h407.348L297.065,184.369z"/>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="402.577px" height="402.577px" viewBox="0 0 402.577 402.577" style="enable-background:new 0 0 402.577 402.577;"
xml:space="preserve">
<g>
<path d="M400.858,11.427c-3.241-7.421-8.85-11.132-16.854-11.136H18.564c-7.993,0-13.61,3.715-16.846,11.136
c-3.234,7.801-1.903,14.467,3.999,19.985l140.757,140.753v138.755c0,4.955,1.809,9.232,5.424,12.854l73.085,73.083
c3.429,3.614,7.71,5.428,12.851,5.428c2.282,0,4.66-0.479,7.135-1.43c7.426-3.238,11.14-8.851,11.14-16.845V172.166L396.861,31.413
C402.765,25.895,404.093,19.231,400.858,11.427z"/>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
......@@ -2,6 +2,7 @@
td, th
padding: 0.3em 0.8em
border-bottom: 1px solid #fff
white-space: nowrap
tr:first-child td
padding-top: 0.5em
tbody tr
......@@ -19,20 +20,13 @@ tbody td
text-align: right
td[style]
background-image: linear-gradient(to top, red, red)
background-image: linear-gradient(to top, #eee, #eee)
background-repeat: no-repeat
background-position: left bottom
background-size: 0% 0.2em
tbody td:nth-child(4)
position: relative
padding-left: 2.5em
span:not(.clickable)
position: absolute
left: 0.8em
display: inline-block
width: 1em
height: 1em
tbody td:nth-child(4) span:not(.clickable)
display: none
.chart span
font-size: 0.8em
......@@ -50,12 +44,17 @@ tbody td:nth-child(4)
.tags > span
position: relative
border: 1px solid blue
background: #ddd
border-radius: 1em
padding: 0.3em 0.5em
margin-right: 1em
&::after
content: 'x'
text-align: right
background: red
content: "x"
background: #aaa
color: #fff
border-radius: 0.5em
text-align: center
border: 1px solid red
position: absolute
display: inline-block
width: 0.9em
......@@ -63,23 +62,51 @@ tbody td:nth-child(4)
cursor: pointer
div[contenteditable]
border: 1px outset #aaa
border: 1px inset #aaa
padding: 0.5em
min-height: 1.6em
tbody td
&:nth-child(3), &:nth-child(8), &:nth-child(9)
text-align: right
.chart
display: inline-block
padding-left: 0
list-style-type: none
font-size: 0
width: 400px
max-width: 400px
> li
background: #aaa
font-size: 1rem
overflow: visible
white-space: nowrap
<<<<<<< HEAD
.clickable.filter
position: relative
display: inline-block
font-size: 0
width: 0.8rem
height: 0.8rem
background: url(../img/filter-add.svg)
/*****
||||||| merged common ancestors
/******/
=======
.clickable.filter
position: relative
display: inline-block
font-size: 0
top: -0.8rem
width: 0.8rem
height: 0.8rem
background: url(filter-add.svg)
/*****
>>>>>>> 2fb5382a1843d2a4e67afea21a0b4ec0eeb5ca21
.bc-background-500px, .bc-background-500px-1
background-color: #0099e5
......@@ -10903,4 +10930,4 @@ tbody td
background-color: #ff9d3b
.bc-color-zopim, .bc-color-zopim-1
color: #ff9d3b
color: #ff9d3b
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
<div id="pakon-results">
<table id="pakon-results-table"></table>
%if reversed(results):
<table id="pakon-results-table" class="sortable"></table>
%else:
<p>{{ trans("No results found.") }}</p>
%end
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment