ソースを参照

remove fc-touch fc-cursor

Adam Shaw 9 年 前
コミット
d53707be15
3 ファイル変更21 行追加30 行削除
  1. 1 5
      src/Calendar.js
  2. 3 3
      src/agenda/agenda.css
  3. 17 22
      src/common/common.css

+ 1 - 5
src/Calendar.js

@@ -516,10 +516,6 @@ function Calendar_constructor(element, overrides) {
 		tm = options.theme ? 'ui' : 'fc';
 		element.addClass('fc');
 
-		element.addClass(
-			t.isTouch ? 'fc-touch' : 'fc-cursor'
-		);
-
 		if (options.isRTL) {
 			element.addClass('fc-rtl');
 		}
@@ -562,7 +558,7 @@ function Calendar_constructor(element, overrides) {
 
 		header.removeElement();
 		content.remove();
-		element.removeClass('fc fc-touch fc-cursor fc-ltr fc-rtl fc-unthemed ui-widget');
+		element.removeClass('fc fc-ltr fc-rtl fc-unthemed ui-widget');
 
 		if (windowResizeProxy) {
 			$(window).unbind('resize', windowResizeProxy);

+ 3 - 3
src/agenda/agenda.css

@@ -257,7 +257,7 @@ be a descendant of the grid when it is being dragged.
 
 /* resizer (cursor device) */
 
-.fc-cursor .fc-time-grid-event .fc-resizer {
+.fc-time-grid-event:hover .fc-resizer {
 	left: 0;
 	right: 0;
 	bottom: 0;
@@ -270,13 +270,13 @@ be a descendant of the grid when it is being dragged.
 	cursor: s-resize;
 }
 
-.fc-cursor .fc-time-grid-event .fc-resizer:after {
+.fc-time-grid-event:hover .fc-resizer:after {
 	content: "=";
 }
 
 /* resizer (touch device) */
 
-.fc-touch .fc-time-grid-event .fc-resizer {
+.fc-time-grid-event.fc-selected .fc-resizer {
 	/* 10x10 dot */
 	border-radius: 5px;
 	border-width: 1px;

+ 17 - 22
src/common/common.css

@@ -551,24 +551,19 @@ temporary rendered events).
 
 /* resizer (touch devices) */
 
-.fc-touch .fc-event .fc-resizer {
-	display: none; /* only show when selected */
+.fc-event .fc-resizer {
+	display: none;
 }
 
-.fc-touch .fc-event.fc-selected .fc-resizer {
+.fc-event:hover .fc-resizer,
+.fc-event.fc-selected .fc-resizer {
+	/* only show when hovering or selected (with touch) */
 	display: block;
 }
 
+/* hit area */
 
-/* Hit Area (for events and expander)
---------------------------------------------------------------------------------------------------*/
-
-.fc-expander { /* fc-event is already position:relative */
-	position: relative;
-}
-
-.fc-touch .fc-expander:before,
-.fc-touch .fc-event .fc-resizer:before {
+.fc-event.fc-selected .fc-resizer:before {
 	/* 40x40 touch area */
 	content: "";
 	position: absolute;
@@ -647,7 +642,7 @@ temporary rendered events).
 
 /* resizer (cursor devices) */
 
-.fc-cursor .fc-h-event .fc-resizer {
+.fc-h-event:hover .fc-resizer {
 	width: 7px;
 	top: -1px; /* overcome top border */
 	bottom: -1px; /* overcome bottom border */
@@ -655,7 +650,7 @@ temporary rendered events).
 
 /* resizer (touch devices) */
 
-.fc-touch .fc-h-event .fc-resizer {
+.fc-h-event.fc-selected .fc-resizer {
 	/* 8x8 little dot */
 	border-radius: 4px;
 	border-width: 1px;
@@ -670,14 +665,14 @@ temporary rendered events).
 }
 
 /* left resizer  */
-.fc-touch.fc-ltr .fc-h-event .fc-start-resizer,
-.fc-touch.fc-rtl .fc-h-event .fc-end-resizer {
+.fc-ltr .fc-h-event.fc-selected .fc-start-resizer,
+.fc-rtl .fc-h-event.fc-selected .fc-end-resizer {
 	margin-left: -4px; /* centers the 8x8 dot on the left edge */
 }
 
 /* right resizer */
-.fc-touch.fc-ltr .fc-h-event .fc-end-resizer,
-.fc-touch.fc-rtl .fc-h-event .fc-start-resizer {
+.fc-ltr .fc-h-event.fc-selected .fc-end-resizer,
+.fc-rtl .fc-h-event.fc-selected .fc-start-resizer {
 	margin-right: -4px; /* centers the 8x8 dot on the right edge */
 }
 
@@ -720,14 +715,14 @@ be a descendant of the grid when it is being dragged.
 /* resizer (cursor devices) */
 
 /* left resizer  */
-.fc-cursor.fc-ltr .fc-day-grid-event .fc-start-resizer,
-.fc-cursor.fc-rtl .fc-day-grid-event .fc-end-resizer {
+.fc-ltr .fc-day-grid-event:hover .fc-start-resizer,
+.fc-rtl .fc-day-grid-event:hover .fc-end-resizer {
 	margin-left: -2px; /* to the day cell's edge */
 }
 
 /* right resizer */
-.fc-cursor.fc-ltr .fc-day-grid-event .fc-end-resizer,
-.fc-cursor.fc-rtl .fc-day-grid-event .fc-start-resizer {
+.fc-ltr .fc-day-grid-event:hover .fc-end-resizer,
+.fc-rtl .fc-day-grid-event:hover .fc-start-resizer {
 	margin-right: -2px; /* to the day cell's edge */
 }