Mercurial > hg > MPIWGWeb

changeset 112:3b0955d8a87e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more sliders.
author casties
date Tue, 28 May 2013 14:07:55 +0200
parents 7f651bf040c4
children bba951ea7479
files css/mpiwg.css js/mpiwg.js
diffstat 2 files changed, 26 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/css/mpiwg.css	Tue May 28 10:45:56 2013 +0200
+++ b/css/mpiwg.css	Tue May 28 14:07:55 2013 +0200
@@ -64,11 +64,6 @@
     padding-left: 23px;
 }
 
-/* old blue mail link */
-a.maillink {
-    color: #3b4186 !important;
-}
-
 h1 {
     color: #3b4186;
     font-size: 20px;
@@ -142,14 +137,15 @@
     display: table-row;
 }
 
-div.row>div.col {
+div.row > div.col {
     display: table-cell;
     vertical-align: top;
 }
 
-div.row>div.col:first-child {
+div.row > div.col:first-child {
     /* first block has no left margin */
-    padding-left: 0 !important;
+    padding-left: 0;
+    /* padding-left: 0 !important; */
 }
 
 /* 
@@ -363,7 +359,10 @@
     /* col default padding */
     padding-left: 20px;
 }
-
+div.main div.row>div.col:first-child {
+    /* first col has no left-padding */
+    padding-left: 0;
+}
 div.main div.center {
     /* make sure center does not collapse */
     min-width: 460px;
@@ -389,7 +388,10 @@
     width: 286px;
     padding-left: 21px;
 }
-
+div.main.home div.row.triple>div.col:first-child {
+    /* first col has no left-padding */
+    padding-left: 0;
+}
 div.box h2,
 h2.line {
     /* more-links in title are right */
@@ -751,7 +753,7 @@
 
 div.slider.row.quintuple > div.col {
 	/* slider needs space for buttons */
-	padding-left: 16px;
+	padding-left: 10px;
 }
 
 div.row.quintuple > div.col > div.mini div.thumb img {
@@ -848,7 +850,7 @@
 
 div.slider.row > div.col:first-child {
     /* space for slidebuttons */
-    padding-left: 20px !important;
+    padding-left: 20px;
 }
 
 /* 
--- a/js/mpiwg.js	Tue May 28 10:45:56 2013 +0200
+++ b/js/mpiwg.js	Tue May 28 14:07:55 2013 +0200
@@ -1,22 +1,30 @@
 /*
  * Javascript for MPIWG website
+ * (C) 2013 MPIWG Berlin
  */
 
+/* 
+ * AjaxSlider plugin.
+ */
 (function ($) {
 	$.fn.AjaxSlider = function (opts) {
 		var settings = $.extend({
 			dataUrl : null,
 			dataSel : '',
-			contentSel : '',
+			windowSel : 'div.slidewindow',
+			contentSel : 'div.row',
+			buttonWidth : '20px',
 			scrollBy: '100px',
 		}, opts);
 		var url = settings.dataUrl + ' ' + settings.dataSel;
 		var $slider = this;
-		var sliderW = this.width();
+		var sliderW = this.width() - 2 * settings.buttonWidth;
 		var sliderH = this.height();
 		this.load(url, function () {
-			// fix width and height and hide overflow
-			$slider.css({'width':sliderW, 'height':sliderH, 'overflow':'hidden', 'position':'relative'});
+			var $window = $slider.find(settings.windowSel);
+			// fix window width and height and hide overflow
+			$window.css({'width':sliderW, 'height':sliderH, 'margin':'0 '+settings.buttonWidth,  
+						 'overflow':'hidden', 'position':'relative'});
 			// content will be moved
 			var $content = $slider.find(settings.contentSel);
 			$content.css({'position':'absolute', 'left':'0'});