Merge b1eb7e9 into efb8378

nextcloud · Sep 21, 2016 · 106c06f · 106c06f
2 parents efb8378 + b1eb7e9
commit 106c06f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/css/app/calendarlist.css b/css/app/calendarlist.css
@@ -95,6 +95,10 @@
 	width: 80px;
 }
 
+#app-navigation .app-navigation-list {
+	width: 100%;
+}
+
 #app-navigation .app-navigation-list-item .calendarCheckbox {
 	position: absolute;
 	margin-left: 17px;
@@ -296,7 +300,12 @@
 
 /* scroll issues */
 #scrollable {
-	height: 80%;
+	overflow-y: auto;
+	overflow-x: hidden;
+	position: absolute;
+	top: 85px;
+	bottom: 44px;
+	width: 250px;
 }
 
 /* Spacing */

diff --git a/templates/main.php b/templates/main.php
@@ -57,6 +57,7 @@
 		<div ng-controller="DatePickerController" id="datepickercontainer">
 			<?php print_unescaped($this->inc('part.datepicker')); ?>
 			<?php print_unescaped($this->inc('part.buttonarea')); ?>
+			<div class="clear-both"></div>
 		</div>
 		<div ng-controller="CalendarListController" ng-cloak>
 			<div id="scrollable">