Commit a1d284d0 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '14-long-text-filters' into 'master'

Resolve "Filters with long-text are ilegible"

Closes #14

See merge request !4
parents 6ef59493 ca1fc486
......@@ -32,6 +32,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.TreeMap;
import javax.imageio.ImageIO;
import javax.servlet.http.Cookie;
......@@ -456,7 +457,7 @@ public class ExplorerController extends BaseController implements InitializingBe
}
private Map<String, Map<String, Integer> > getCrops(AppliedFilters appliedFilters) throws SearchException {
Map<String, Map<String, Integer>> crops = new HashMap<>();
Map<String, Map<String, Integer>> crops = new TreeMap<>(String::compareTo);
appliedFilters.removeIf(appliedFilter -> appliedFilter.getKey().equals(FilterConstants.CROPS));
for (Term term : elasticService.termStatisticsAuto(appliedFilters, FilterConstants.CROPS, 30).getTerms()) {
......
......@@ -78,7 +78,7 @@ $light-font-family: 'Roboto-Light';
&::-webkit-input-placeholder {@content}
&:-moz-placeholder {@content}
&::-moz-placeholder {@content}
&:-ms-input-placeholder {@content}
&:-ms-input-placeholder {@content}
}
......@@ -118,7 +118,7 @@ $light-font-family: 'Roboto-Light';
font-size: 14px;
}
}
.btn-primary {
font-size: 16px;
padding: 6px 12px;
......@@ -143,14 +143,14 @@ $light-font-family: 'Roboto-Light';
text-align: right;
a {
color: $white-color;
&:hover {
background: #4d4c46;
}
}
}
}
.navbar-toggle {
margin-top: 22px;
margin-right: 5px;
......@@ -255,7 +255,7 @@ $light-font-family: 'Roboto-Light';
border-bottom: 1px solid $light-grey;
font-size: 15px;
font-family: $emphasis-font-family;
}
}
}
}
}
......@@ -341,7 +341,7 @@ $light-font-family: 'Roboto-Light';
height: 100%;
line-height: 52px;
pointer-events: none;
}
}
}
}
}
......@@ -876,7 +876,7 @@ $light-font-family: 'Roboto-Light';
background-size: cover;
min-height: 231px;
}
.green-bg {
background: $btn-bg;
}
......@@ -1063,7 +1063,7 @@ $light-font-family: 'Roboto-Light';
padding: 5px 8px 4px;
text-transform: uppercase;
border-radius: 0;
&:before {
display: inline-block;
......@@ -1071,7 +1071,7 @@ $light-font-family: 'Roboto-Light';
width: 14px;
height: 18px;
/*margin-right: 6px;*/
}
&.list-map-view:before {
......@@ -1133,7 +1133,7 @@ $light-font-family: 'Roboto-Light';
}
}
}
#letter-top, #letter-bottom {
padding-top: 16px;
......@@ -1155,7 +1155,7 @@ $light-font-family: 'Roboto-Light';
padding-top: 20px;
margin-bottom: 9px;
}
.hoofdleter {
font-family: $heading-font-family;
font-size: 24px;
......@@ -1219,7 +1219,7 @@ $light-font-family: 'Roboto-Light';
background-image: -webkit-repeating-linear-gradient(-90deg, #f8f7f4, #f8f7f4 40px, #e7e5df 40px, #e7e5df 45px, #f4f3ee 45px, #f4f3ee 85px, #e7e5df 85px, #e7e5df 90px);
background-size: 100% 90px;
height: auto;
li {
/*padding: 12px 0px 13px 10px;*/
display: inline-block;
......@@ -1464,7 +1464,7 @@ h2.short {
margin: 0;
input:checked {
content: "\f00c";
font-family: 'FontAwesome';
font-family: 'FontAwesome';
}
}*/
a {
......@@ -1557,13 +1557,13 @@ h2.short {
}
div > .row > div {
margin: 0;
border-bottom: 5px solid #ffffff;
border-bottom: 5px solid #ffffff;
}
.row:nth-child(odd) > div > p {
background: transparent;
background: transparent;
}
.row:nth-child(even) > div > p {
background: transparent;
background: transparent;
}
.row {
background-color: #f3f2ee;
......@@ -1718,7 +1718,7 @@ h2.short {
line-height: 30px;
margin: 0 0 30px 0;
}
-webkit-column-count: 3;
-moz-column-count: 2;
column-count: 2;
......@@ -1733,7 +1733,7 @@ h2.short {
.statistics {
.row > div:first-child {
margin-bottom: 21px;
}
p {
font-size: 14px;
......@@ -1789,7 +1789,7 @@ h2.short {
margin: 0 auto;
img {
width: 100%;
}
}
}
}
.tax-rules {
......@@ -1843,7 +1843,7 @@ h2.short {
.fullwidth {
width: 100% !important;
float: left !important;
html[dir="rtl"] & {
float: right !important;
}
......@@ -2046,12 +2046,14 @@ h2.short {
}
.panel-default > .panel-heading {
background-color: transparent;
position: relative;
a {
color: #2b2924;
font-family: $heading-font-family;
display: inline-block;
padding: 0 15px;
padding: 0 20px 0 0;
width: 100%;
line-height: normal;
}
}
.panel-heading .panel-title {
......@@ -2061,7 +2063,7 @@ h2.short {
#collapseFilters .panel-group .panel .panel-heading {
/*padding: 15px 0 15px 0;*/
padding: 0;
height: 40px;
// height: 40px;
}
#collapseFilters .panel-group .panel {
&:first-child .panel-heading {
......@@ -2071,8 +2073,8 @@ h2.short {
#collapseFilters .panel-title {
font-size: 14px;
font-family: $heading-font-family;
padding: 0;
line-height: 40px;
padding: 10px 0;
// line-height: 40px;
}
#collapseFilters #panel_art15 {
.panel-heading {
......@@ -2101,10 +2103,14 @@ h2.short {
}
.panel-heading a:after {
html[dir="ltr"] & {
float: right;
position: absolute;
right: 6px;
top: 11px;
}
html[dir="rtl"] & {
float: left;
position: absolute;
left: 6px;
top: 11px;
}
font-family: 'FontAwesome';
content: "\f077";
......@@ -3895,7 +3901,7 @@ table.accessions {
.filters .panel-heading .panel-title {
padding: 13.5px 0;
#collapseFilters .panel-title {
padding: 0;
padding: 10px 0;
}
}
.filters #collapseFilters > .panel-body {
......
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