Quellcode durchsuchen

Design of the slider

See https://github.com/marienfressinaud/FreshRSS/issues/646
Marien Fressinaud vor 11 Jahren
Ursprung
Commit
405f23050b
3 geänderte Dateien mit 36 neuen und 7 gelöschten Zeilen
  1. 3 2
      app/views/subscription/index.phtml
  2. 10 4
      p/scripts/main.js
  3. 23 1
      p/themes/base-theme/template.css

+ 3 - 2
app/views/subscription/index.phtml

@@ -134,9 +134,10 @@
 	<?php } ?>
 	<?php } ?>
 </div>
 </div>
 
 
-<div id="slider">
+<a id="close-slider"></a>
+<div id="slider"<?php echo isset($this->feed) ? ' class="active"' : ''; ?>>
 <?php
 <?php
-	if (isset($this->feed) && $this->feed) {
+	if (isset($this->feed)) {
 		$this->renderHelper('feed/update');
 		$this->renderHelper('feed/update');
 	}
 	}
 ?>
 ?>

+ 10 - 4
p/scripts/main.js

@@ -1241,7 +1241,8 @@ function faviconNbUnread(n) {
 }
 }
 
 
 function init_slider_observers() {
 function init_slider_observers() {
-	var slider = $('#slider');
+	var slider = $('#slider'),
+	    closer = $('#close-slider');
 	if (slider.length < 1) {
 	if (slider.length < 1) {
 		return;
 		return;
 	}
 	}
@@ -1252,7 +1253,6 @@ function init_slider_observers() {
 		}
 		}
 
 
 		ajax_loading = true;
 		ajax_loading = true;
-
 		var url_slide = $(this).attr('href');
 		var url_slide = $(this).attr('href');
 
 
 		$.ajax({
 		$.ajax({
@@ -1261,12 +1261,18 @@ function init_slider_observers() {
 			data : { ajax: true }
 			data : { ajax: true }
 		}).done(function (data) {
 		}).done(function (data) {
 			slider.html(data);
 			slider.html(data);
-			slider.show();
+			closer.addClass('active');
+			slider.addClass('active');
 			ajax_loading = false;
 			ajax_loading = false;
 		});
 		});
 
 
 		return false;
 		return false;
-	})
+	});
+
+	closer.on('click', function() {
+		closer.removeClass('active');
+		slider.removeClass('active');
+	});
 }
 }
 
 
 function init_all() {
 function init_all() {

+ 23 - 1
p/themes/base-theme/template.css

@@ -647,7 +647,29 @@ br + br + br {
 
 
 /*=== Slider */
 /*=== Slider */
 #slider {
 #slider {
-	min-height: 50px;
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 100%; right: 0;
+	overflow: auto;
+	background: #fff;
+	border-left: 1px solid #aaa;
+	transition: left 200ms linear;
+	-moz-transition: left 200ms linear;
+	-webkit-transition: left 200ms linear;
+	-o-transition: left 200ms linear;
+	-ms-transition: left 200ms linear;
+}
+#slider.active {
+	left: 40%;
+}
+#close-slider {
+	position: fixed;
+	top: 0; bottom: 0;
+	left: 100%; right: 0;
+	cursor: pointer;
+}
+#close-slider.active {
+	left: 0;
 }
 }
 
 
 /*=== DIVERS */
 /*=== DIVERS */