Commit 7f2bc8a8 authored by Taisiya Glushko's avatar Taisiya Glushko
Browse files

country-page-map-fixes

parent e579ca22
......@@ -2051,18 +2051,21 @@ $light-font-family: 'Roboto-Light';
.country-info-wrapper {
position: relative;
}
.map-container {
padding-right: 0;
& > div {
padding-left: 0;
padding-right: 0;
}
}
#map {
height: 307px;
height: 308px;
}
.country-info {
font-size: 14px;
font-family: $default-font-family;
padding: 0;
position: absolute;
top: 0;
left: 0;
z-index: 2;
padding-left: 15px;
padding-right: 0;
padding-left: 20px;
.row > div:first-child {
color: #4d4c46;
}
......@@ -2082,6 +2085,11 @@ $light-font-family: 'Roboto-Light';
&:first-child {
border-right: 2px solid #c4c0b6;
}
&:nth-child(2) {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
}
.row:first-child > div:nth-child(2){
......@@ -2089,16 +2097,6 @@ $light-font-family: 'Roboto-Light';
font-size: 10px;
}
}
.row:nth-of-type(2) > div:nth-child(2){
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.row:nth-of-type(5) > div:nth-child(2){
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
a {
display: inline;
}
......@@ -2497,18 +2495,6 @@ $light-font-family: 'Roboto-Light';
}
}
@media (max-width: 1691px) {
//country page {
.country-page {
.map-wrapper {
height: 350px;
}
#map {
height: 330px;
}
}
}
@media (max-width: 1450px) {
.explore-page .nav-header nav:not(.pull-right) .pagination {
margin: 10px 0;
......@@ -2592,18 +2578,6 @@ $light-font-family: 'Roboto-Light';
}
}
@media (max-width: 1425px) {
//country page
.country-page {
.map-wrapper {
height: 370px;
}
#map {
height: 350px;
}
}
}
@media (max-width: 1198px) {
//accession-page
.accession-page {
......@@ -2625,17 +2599,20 @@ $light-font-family: 'Roboto-Light';
//country page
.country-page {
.map-wrapper {
height: 430px;
height: auto;
}
#map {
height: 410px;
height: 324px;
}
.country-info-wrapper {
margin-bottom: 0;
}
.country-info .buttons-container {
display: none;
}
.country-info .row.buttons-wrapper {
display: block;
padding: 10px 5px;
padding: 10px 0;
a {
display: inline-block;
}
......@@ -2643,6 +2620,15 @@ $light-font-family: 'Roboto-Light';
}
}
@media (max-width: 1146px) {
//country page
.country-page {
#map {
height: 344px;
}
}
}
@media (max-width: 990px) {
//accession-page
.accession-page {
......@@ -3444,7 +3430,10 @@ $light-font-family: 'Roboto-Light';
//country page
.country-page {
.map-wrapper {
height: 765px;
height: 722px;
}
.country-info-wrapper {
margin: 0;
}
.country-info {
position: relative;
......@@ -3468,6 +3457,8 @@ $light-font-family: 'Roboto-Light';
.map-container {
margin-left: 0;
margin-right: 0;
width: 100%;
padding: 0;
& > div {
padding-left: 0;
padding-right: 0;
......
......@@ -20,7 +20,7 @@
<div class="row map-wrapper dark-background">
<div class="country-info-wrapper clearfix">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 country-info collect-info">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 country-info">
<h1><c:out value="${country.getName(pageContext.response.locale)}" /></h1>
<div class="row">
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-4"><p><spring:message code="geo.country" /></p></div>
......@@ -62,7 +62,7 @@
</c:if>
</c:forEach>
<c:if test="${showMap!=null && showMap}">
<div class="row map-container" style="">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 map-container" style="">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div id="map" class="gis-map"></div>
</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