Переглянути джерело

make new css play nice with twitter bootstrap. issue 2234

Adam Shaw 11 роки тому
батько
коміт
0643880511
2 змінених файлів з 19 додано та 10 видалено
  1. 9 10
      src/common/common.css
  2. 10 0
      src/main.css

+ 9 - 10
src/common/common.css

@@ -422,21 +422,20 @@ temporary rendered events).
 /* Global Event Styles
 --------------------------------------------------------------------------------------------------*/
 
-.fc-event { /* always an <a> tag */
+.fc-event,
+.fc-event:hover, /* extra precedents over other <a> tag hover styling */
+.ui-widget .fc-event { /* extra precedence over jqui theme <a> tag styling */
+
 	position: relative; /* for resize handle and other inner positioning */
 	display: block; /* make the <a> tag block */
-	border: 1px solid #3a87ad; /* default BORDER color */
-	background-color: #3a87ad; /* default BACKGROUND color */
-	color: #fff;               /* default TEXT color */
 	font-size: .85em;
 	line-height: 1.3;
 	border-radius: 3px;
-	text-decoration: none; /* if it has an href */
-}
-
-.ui-widget .fc-event { /* undo jqui's styles on <a> tags */
-	color: #fff;
-	font-weight: normal;
+	border: 1px solid #3a87ad; /* default BORDER color */
+	background-color: #3a87ad; /* default BACKGROUND color */
+	color: #fff;               /* default TEXT color */
+	text-decoration: none;     /* if <a> has an href */
+	font-weight: normal;       /* undo jqui */
 }
 
 .fc-event[href],

+ 10 - 0
src/main.css

@@ -64,6 +64,16 @@
 /* View Structure
 --------------------------------------------------------------------------------------------------*/
 
+/* undo twitter bootstrap's box-sizing rules. normalizes positioning techniques */
+/* don't do this for the toolbar because we'll want bootstrap to style those buttons as some pt */
+.fc-view-container *,
+.fc-view-container *:before,
+.fc-view-container *:after {
+	-webkit-box-sizing: content-box;
+	   -moz-box-sizing: content-box;
+	        box-sizing: content-box;
+}
+
 .fc-view, /* scope positioning and z-index's for everything within the view */
 .fc-view > table { /* so dragged elements can be above the view's main element */
 	position: relative;