Commit b2b6864b authored by Michal Lupečka's avatar Michal Lupečka

merge changes

parents 3ee94c0d 2fb5382a
......@@ -83,6 +83,7 @@ tbody td
overflow: visible
white-space: nowrap
<<<<<<< HEAD
.clickable.filter
position: relative
display: inline-block
......@@ -92,6 +93,20 @@ tbody td
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
......@@ -10915,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
......@@ -2985,7 +2985,7 @@ const czNicTurrisPakon = class
}
applyFilters () // @ depricated … soon :)
applyFilters () // @ depricated … soon :)
{
if ( !this.settings.filterBy )
{
......
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