diff --git a/src/common/common.css b/src/common/common.css index b9d98bb..6b0cb43 100644 --- a/src/common/common.css +++ b/src/common/common.css @@ -422,21 +422,20 @@ temporary rendered events). /* Global Event Styles --------------------------------------------------------------------------------------------------*/ -.fc-event { /* always an tag */ +.fc-event, +.fc-event:hover, /* extra precedents over other tag hover styling */ +.ui-widget .fc-event { /* extra precedence over jqui theme tag styling */ + position: relative; /* for resize handle and other inner positioning */ display: block; /* make the 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 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 has an href */ + font-weight: normal; /* undo jqui */ } .fc-event[href], diff --git a/src/main.css b/src/main.css index 39ce4a5..781ba94 100644 --- a/src/main.css +++ b/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;