Skip to content
This repository has been archived by the owner on Oct 31, 2018. It is now read-only.

Commit

Permalink
Merge pull request #359 from owncloud/redesign
Browse files Browse the repository at this point in the history
Merging redesign calendar app
  • Loading branch information
jbtbnl committed Mar 27, 2014
2 parents e8e8c32 + 18f2c06 commit 940510c
Show file tree
Hide file tree
Showing 16 changed files with 2,927 additions and 1,777 deletions.
50 changes: 50 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# just sane ignores
.*.sw[po]
*.bak
*.BAK
*~
*.orig
*.class
.cvsignore
Thumbs.db
*.py[co]
_darcs/*
CVS/*
.svn/*
RCS/*
*.backup*

# kdevelop
.kdev
*.kdev4
*.kate-swp

# kate editor
.kateproject*

# Lokalize
*lokalize*

# eclipse
.project
.settings

# netbeans
nbproject

# phpStorm
.idea
*.iml

# geany
*.geany

# Cloud9IDE
.settings.xml
.c9revisions

# vim ex mode
.vimrc

# Mac OS
.DS_Store
31 changes: 23 additions & 8 deletions 3rdparty/fullcalendar/css/fullcalendar.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* FullCalendar v1.6.1 Stylesheet
* FullCalendar v1.6.4 Stylesheet
* Docs & License: http://arshaw.com/fullcalendar/
* (c) 2013 Adam Shaw
*/
Expand Down Expand Up @@ -102,10 +102,11 @@ html .fc,

.fc-content {
clear: both;
zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */
}

.fc-view {
width: 100%; /* needed for view switching (when view is absolute) */
width: 100%;
overflow: hidden;
}

Expand All @@ -120,7 +121,7 @@ html .fc,
}

.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
background: #ffa;
background: #fcf8e3;
}

.fc-cell-overlay { /* semi-transparent rectangle while dragging */
Expand Down Expand Up @@ -250,6 +251,15 @@ html .fc,

/* Global Event Styles
------------------------------------------------------------------------*/

.fc-event-container > * {
z-index: 8;
}

.fc-event-container > .ui-draggable-dragging,
.fc-event-container > .ui-resizable-resizing {
z-index: 9;
}

.fc-event {
border: 1px solid #3a87ad; /* default BORDER color */
Expand All @@ -263,10 +273,7 @@ a.fc-event {
text-decoration: none;
}

a.fc-event,
.fc-event-draggable {
cursor: pointer;
}


.fc-rtl .fc-event {
text-align: right;
Expand All @@ -281,7 +288,15 @@ a.fc-event,
.fc-event-time,
.fc-event-title {
padding: 0 1px;
}
cursor: pointer;
}



.fc-event-time:hover,
.fc-event-title:hover {
text-decoration: underline;
}

.fc .ui-resizable-handle {
display: block;
Expand Down
Loading

0 comments on commit 940510c

Please sign in to comment.