css fixes for 2.5 and 2.6 Re #161 #168

DeuxHuitHuit · Apr 29, 2015 · efef3a9 · efef3a9
1 parent ef68728
commit efef3a9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/assets/calendar.publish.css b/assets/calendar.publish.css
@@ -4,7 +4,7 @@
  * @author: Nils Hörrmann, post@nilshoerrmann.de
  * @source: http://github.com/nilshoerrmann/calendar
  */
- 
+
 div.dt-calendar {
 	z-index: 2000;
 	position: relative;
@@ -193,7 +193,7 @@ div.dt-calendar table {
 div.dt-calendar td {
 	background: transparent /*#323230*/;
 	border: 1px solid #41403f;
-	border-style-bottom: none;
+	border-bottom-style: none;
 	color: #fff;
 	cursor: pointer;
 	height: 30px;
@@ -265,18 +265,16 @@ div.dt-calendar tbody td:hover {
 @media screen and (min-width: 1000px) {
 
 	fieldset.primary div.dt-calendar {
-		height: 254px;
 		padding: 18px 38px 18px 18px;
 	}
 
 	fieldset.primary div.dt-calendar div.date:not(:last-child) {
 		-webkit-box-sizing: border-box;
 		box-sizing: border-box;
-		width: 50%;
+		display: inline-block;
 		padding: 0 0 0 11px;
-		position: absolute;
-		top: 10px;
-		left: 0;
+		width: 50%;
+		vertical-align: top;
 	}
 
 	fieldset.primary div.dt-calendar div.date:not(:last-child) nav a:first-of-type {

diff --git a/assets/calendar.publish.js b/assets/calendar.publish.js
@@ -219,15 +219,15 @@
 				$('<li />', {
 					'text': month_list[m],
 					'data-value': id
-				}).appendTo(months);				
+				}).appendTo(months);
 			}
 
 			// Set year
 			years.find('li').remove();
 			for(y = current.year - 5; y <= current.year + 6; y++) {
 				$('<li />', {
 					'text': y
-				}).appendTo(years);				
+				}).appendTo(years);
 			}
 
 			// Set calendar days
@@ -255,13 +255,13 @@
 				if((start <= days && days <= end) || start == days || end == days) {
 					cell.addClass('selected');
 				}
-								
+
 				// Next month
 				if(month == current.month + 1 || (current.month == 11 && month == 0)) {
 					cell.addClass('next');
 				}
 
-				// Check and set month context	
+				// Check and set month context
 				day++;
 				if(day > length[month]) {
 					day = 1;
@@ -274,9 +274,9 @@
 						month++;
 					}
 				}
-			});		
+			});
 		};
-				
+
 		// Choose date
 		var choose = function(calendar, selected, key) {
 			var current = calendar.data('range'),

diff --git a/assets/datetime.publish.css b/assets/datetime.publish.css
@@ -24,6 +24,10 @@ html {
 	width: 100%;
 }
 
+.field-datetime .collapsible .instance:not(.collapsed):not(.js-animate) {
+	overflow: visible;
+}
+
 .field-datetime .frame header {
 	padding: 4px 10px;
 	position: relative;

diff --git a/assets/datetime.publish.js b/assets/datetime.publish.js
@@ -91,7 +91,7 @@
 				datetime.find('.focus').removeClass('focus');
 				input.parent().addClass('focus');
 
-				// Expand	
+				// Expand
 				if(item.is('.collapsed')) {
 					item.trigger('expand.collapsible');
 				}

diff --git a/assets/timer.publish.css b/assets/timer.publish.css
@@ -242,11 +242,13 @@ div.range span.active {
 @media screen and (min-width: 1000px) {
 
 	fieldset.primary div.timer {
+		vertical-align: top;
 		-webkit-box-sizing: border-box;
 		box-sizing: border-box;
-		display: block;
-		margin: -17px 1px 0 50%;
-		padding: 0 0 0 14px;
+		display: inline-block;
+		width: 50%;
+		margin: 0;
+		padding: 0 0 0 28px;
 	}
 
 }