Merge pull request #492 from HamutalCohen3/scroll-fix

only one scrollbar in info-window
data-for-change · Nov 23, 2015 · ccc0352 · ccc0352
2 parents 07dd486 + 2e79b82
commit ccc0352
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/static/css/accordion.css b/static/css/accordion.css
@@ -1,5 +1,5 @@
 .accordion-container{
-	width: 300px;
+	width: 100%;
 	margin: 30px 2px 0px 0px;
 }
 
@@ -111,7 +111,7 @@
 
 .accordion-container input:checked ~ .ac-extra-large{
 	max-height: 800px;
-	overflow-y: scroll;
+	overflow-y: auto;
 }
 
 .accordion-container .fontIcon{

diff --git a/static/css/style.css b/static/css/style.css
@@ -628,18 +628,18 @@ textarea.form-control-wide {
 }
 
 .marker-info-window{
-    overflow-y: auto;
-    overflow-x: hidden;
+    overflow-y: hidden;
+    overflow-x: hidden;/*
     height: 370px;
-    width: 340px;
+    width: 340px;*/
 }
 
-.marker-info-window::-webkit-scrollbar{
+.gm-style-iw > div::-webkit-scrollbar{
     -webkit-appearance: none;
     width: 7px;
 }
 
-.marker-info-window::-webkit-scrollbar-thumb{
+.gm-style-iw > div::-webkit-scrollbar-thumb{
     border-radius: 4px;
     background-color: rgba(0, 0, 0, .5);
     -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5);