MDL-44364 theme_bootstrapbase: Clean up calendar variables

There are a few reasons why I am cleaning up the calendar.less file.

1/ The variables were too specific, and unlikely to be overridden. If
   you are going to change the colour of the background, surely you will
   change the border to match the background. And if you want to do
   more advanced things, you will override the selectors anyway.

2/ If you wanted to re-use the color of the event, but not as a
   background or border, you would have to use a variable that
   was specific to the background or the border, a generic
   variable for the event colour seems required.

3/ The colour @redDarker should not be defined there, and its purpose
   is so limited that I do not think we need it at all. Also,
   this variable is unlikely to be re-used ever, better not
   introducing it.

4/ I removed the calendarHeadingsColor because those headings should
   really match the rest of the headings throughout the site. I
   removed it from the overlay, but used the standard Bootstrap
   one for the one in the page.

There are still a few things that would need improvement, like the
usage of @white for the background of the event, which will not really
look good on a dark background.
This commit is contained in:
Frederic Massart 2014-03-21 11:38:20 +08:00
parent e514c72229
commit 53bbd369c0
2 changed files with 16 additions and 34 deletions

View File

@ -1,35 +1,23 @@
/* calendar.less */
// Calendar colour variables defined.
@redDarker: #a00; // Dark red.
@calendarEventCourseBackgroundColor: #ffd3bd; // Pale red.
@calendarEventGlobalBackgroundColor: #d6f8cd; // Pale green.
@calendarEventGroupBackgroundColor: #fee7ae; // Pale yellow.
@calendarEventUserBackgroundColor: #dce7ec; // Pale blue.
@calendarEventCourseBorderColor: @calendarEventCourseBackgroundColor;
@calendarEventGlobalBorderColor: @calendarEventGlobalBackgroundColor;
@calendarEventGroupBorderColor: @calendarEventGroupBackgroundColor;
@calendarEventUserBorderColor: @calendarEventUserBackgroundColor;
@calendarEventHeadings: @gray;
@calendarWeekendTextColor: @redDarker;
@calendarEventCourseColor: #ffd3bd; // Pale red.
@calendarEventGlobalColor: #d6f8cd; // Pale green.
@calendarEventGroupColor: #fee7ae; // Pale yellow.
@calendarEventUserColor: #dce7ec; // Pale blue.
// Calendar event background colours defined.
.calendar_event_course {
background-color: @calendarEventCourseBackgroundColor;
background-color: @calendarEventCourseColor;
}
.calendar_event_global {
background-color: @calendarEventGlobalBackgroundColor;
background-color: @calendarEventGlobalColor;
}
.calendar_event_group {
background-color: @calendarEventGroupBackgroundColor;
background-color: @calendarEventGroupColor;
}
.calendar_event_user {
background-color: @calendarEventUserBackgroundColor;
background-color: @calendarEventUserColor;
}
// Calendar restyling.
@ -122,16 +110,16 @@
border-style: solid;
}
.calendar_event_course {
border-color: @calendarEventCourseBorderColor;
border-color: @calendarEventCourseColor;
}
.calendar_event_global {
border-color: @calendarEventGlobalBorderColor;
border-color: @calendarEventGlobalColor;
}
.calendar_event_group {
border-color: @calendarEventGroupBorderColor;
border-color: @calendarEventGroupColor;
}
.calendar_event_user {
border-color: @calendarEventUserBorderColor;
border-color: @calendarEventUserColor;
}
.calendar-event-panel {
background-color: @grayLighter;
@ -142,18 +130,13 @@
border: 1px solid darken(@wellBackground, 7%);
.border-radius(@baseBorderRadius);
.box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05));
h2 {
&.eventtitle {
color: @calendarEventHeadings;
}
}
}
}
.calendar-controls {
.current {
font-family: @headingsFontFamily;
font-weight: @headingsFontWeight;
color: @calendarEventHeadings;
color: @headingsColor;
font-size: 25px;
line-height: 1.2;
}
@ -314,7 +297,7 @@
}
td {
&.weekend {
color: @calendarWeekendTextColor;
.muted;
}
}
}
@ -329,7 +312,6 @@
.box-shadow(inset 0 1px 1px rgba(0 ,0 ,0 , .05));
h2 {
&.eventtitle {
color: @calendarEventHeadings;
line-height: 1.2;
font-size: 18px;
}

File diff suppressed because one or more lines are too long