Skip to content
Permalink
Browse files

Calendar: Fixed application of colours to other themes (fixes #5531)

  • Loading branch information...
pjackson28 committed Jun 4, 2014
1 parent 3cd3144 commit 517f5f2099e9087e8499ef7ef5fdc05e77867034
Showing with 71 additions and 89 deletions.
  1. +9 −0 src/_variables.scss
  2. +62 −6 src/plugins/calendar/_base.scss
  3. +0 −82 theme/calendar/_base.scss
  4. +0 −1 theme/theme.scss
@@ -14,6 +14,15 @@ $clrMedium: #ccc;
$clrDark: #555;
$text-muted: #767676;

// Calendar colours
$cal-text-head: #fff;
$cal-text-body: #000;
$cal-dark: #333;
$cal-medium: #555;
$cal-active: #ccc;
$cal-days-link: #111;


// Font scales
$font-scale-xxxl: 2.125;
$font-scale-xxl: 1.625;
@@ -11,6 +11,22 @@
margin: 10px 5px;
}

%cal-text-head {
color: $cal-text-head;
}

%cal-text-head-important {
color: $cal-text-head !important;
}

%cal-text-body {
color: $cal-text-body;
}

%cal-bg-dark {
background: $cal-dark;
}

.cal-cnt {
background: #fff;
text-shadow: none;
@@ -21,6 +37,9 @@
}

.cal-hd {
@extend %cal-bg-dark;
@extend %cal-text-head;
font-weight: 700;
overflow: hidden;
padding: 0.5em 4px;
position: relative;
@@ -38,11 +57,13 @@
.cal-goto-mnth {
@extend %cal-goto-btns;
@extend %cal-position-relative;
@extend %cal-text-body;
}

.cal-goto-yr {
@extend %cal-goto-btns;
@extend %cal-position-relative;
@extend %cal-text-body;
}

.cal-goto-btn {
@@ -55,6 +76,10 @@
}
}

.cal-goto-lnk {
@extend %cal-text-head-important;
}

td {
border: 1px solid #aaa;
padding: 0;
@@ -78,25 +103,56 @@
&[disabled] {
opacity: 0.2;
}

&.active {
color: $cal-active;

&:hover,
&:focus {
@extend %cal-text-head;
}
}
}

.cal-wd {
border: 1px solid #333;
background: $cal-medium;
border: 1px solid $cal-dark;
color: #fff;
padding: 0.5em 0;
text-align: center;
}

%cal-days-a-div {
display: block;
height: 100%;
padding: 0.5em 0;
width: 100%;
}

.cal-days {
a,
a {
@extend %cal-days-a-div;
color: $cal-days-link;

&:hover,
&:focus {
@extend %cal-bg-dark;
@extend %cal-text-head-important;
}
}

div {
display: block;
height: 100%;
padding: 0.5em 0;
width: 100%;
@extend %cal-days-a-div;
}

.cal-currday {
@extend %cal-text-head;
@extend %cal-bg-dark;
font-weight: bolder;

a {
@extend %cal-text-head-important;
@extend %cal-bg-dark;
}
}
}

This file was deleted.

Oops, something went wrong.
@@ -11,7 +11,6 @@

@import "banner/base";
@import "breadcrumb/base";
@import "calendar/base";
@import "footer/base";
@import "language-bar/base";
@import "main/base";

0 comments on commit 517f5f2

Please sign in to comment.
You can’t perform that action at this time.