Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Merge branch 'Footer-Widgets'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Feb 3, 2015
2 parents 4f2a449 + 6665876 commit 329399c
Show file tree
Hide file tree
Showing 9 changed files with 1,307 additions and 943 deletions.
42 changes: 3 additions & 39 deletions css/widgets.css
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
/*--------------------------------------------------------------
9.0 Widgets
--------------------------------------------------------------*/
.widget {
border: 1px solid transparent;
border-width: 1px;
border-color: #cccccc;
border-radius: 0;
margin: 0 0 1.5em 0;
padding: none;
background-color: white;
color: black;
}
.widget a {
color: blue;
}
.widget a:hover {
color: red;
}
.widget .widget-head {
padding: 0.5em;
border: 1px solid transparent;
border-width: 0 0 1px 0;
border-color: #cccccc;
}
.widget .widget-head h2 {
font-size: 1em;
margin: 0;
}

/* Make sure select elements fit in widgets */
.widget select {
max-width: 100%;
}

/* Search widget */
.widget_search .search-submit {
display: none;
}
/* - - - - - - - - - - - - - - - - - - -
== Widgets
- - - - - - - - - - - - - - - - - - - */
99 changes: 0 additions & 99 deletions sass/cal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -118,103 +118,4 @@
}
}
}








/*
ul.btn-multi{
margin-bottom:.5em;
li{
ul{
padding: 0px 0px 0px 12px;
li{
&.month-arrow{
a.icon{
span.glyphicons{
padding: 0px 0px 0px 5px;
&:before{
color:#fff;
font-size: 14px;
display:block;
position: relative;
}
}
}
}
}
}
a.btn-toggle{
margin-left:10px;
font-size:14px;
color:#777;
text-align: center;
}
}
}
}
*/
/*
#events-grid.table {
tbody{
tr{
th{
width:14%;
text-align:right;
span{
font-weight:normal;
color:#777;
font-size:12px !important;
}
}
td{
border-left: 1px solid #eee;
border-right: 1px solid #eee;
border-bottom: 1px solid #eee;
background: #fff;
text-align:left;
height: 90px;
padding:1px;
ol.event-list{
li{
span.event-time{
font-size:11px !important;
padding: 0px 0px 0px 2px !important;
}
ol{
padding: 0px 2px 0px 2px !important;
li{
background: rgba(15,25,56, 0.1);
border:1px solid rgba(15,25,56, 0.2) !important;
padding: 0px 3px 0px 3px !important;
margin-bottom: 2px !important;
a.event-link{
strong{
font-weight:normal;
font-size:12px !important;
}
}
}
}
}
}
}
}
}
}
*/
}
7 changes: 6 additions & 1 deletion sass/content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
== Content
- - - - - - - - - - - - - - - - - - - */

#content {
@include widgets("#content");
}


img {
height: auto;
max-width: 100%;
Expand Down Expand Up @@ -34,7 +39,7 @@ code {
@include cs-word-break;
}
.page {
@include uc-cal;
//@include uc-cal;
}

/* POSTS
Expand Down
20 changes: 2 additions & 18 deletions sass/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,9 @@

#mega-footer {
padding-top:1em;
background-color:$megafooter-widget-bg;
background-color:$megafooter-bg;

.widget {
color: $megafooter-widget-color;
background-color: transparent;
border:none;

a {
color:$megafooter-widget-link-color;
&:hover {
color: $megafooter-widget-link-hover;
}
}
.widget-head {
background-color: $megafooter-widget-head-bg;
color: $megafooter-widget-head-color;
border:none;
}
}
@include widgets('#mega-footer');
}


Expand Down
100 changes: 100 additions & 0 deletions sass/test.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@


/*- - - - - */


/**/

// ICON VIEW
.uc-iconcal {
.uc-cal-list {
.uc-cal-item {
.uc-cal-event {

padding-left: #{($ecw-icon-dateWidth + $ecw-icon-gutter)}px !important;

.uc-cal-event-date {

left:-#{($ecw-icon-dateWidth + $ecw-icon-gutter)}px;
margin-right:-#{($ecw-icon-dateWidth)}px !important;
width:#{($ecw-icon-dateWidth)}px !important;

.uc-cal-event-month{
padding: $ecw-icon-month-padding !important;
border-width:$ecw-icon-month-border-width !important;
border-style:$ecw-icon-month-border-style !important;
text-align:center !important;
font-size:$ecw-icon-month-font-size !important;
text-transform:$ecw-icon-month-font-transform !important;
letter-spacing: $ecw-icon-month-font-letter-spacing !important;

@if $parent == '#megafooter' {
border-color: $megafooter-ecw-icon-month-border-color !important;
background-color:$megafooter-ecw-icon-month-bg !important;
color: $megafooter-ecw-icon-month-color!important;
} else {
border-color: $ecw-icon-month-border-color !important;
background-color:$ecw-icon-month-bg !important;
color: $ecw-icon-month-color!important;
}
}
.uc-cal-event-day {

padding: $ecw-icon-day-padding !important;
border-width:$ecw-icon-day-border-width !important;
border-style:$ecw-icon-day-border-style !important;
text-align:center !important;
font-size:$ecw-icon-day-font-size !important;

@if $parent == '#megafooter' {
border-color: $megafooter-ecw-icon-day-border-color !important;
background-color:$megafooter-ecw-icon-day-bg !important;
} else {
border-color: $ecw-icon-day-border-color !important;
background-color:$ecw-icon-day-bg !important;
}
}
}
.uc-cal-event-time {
@if $parent == '#megafooter' {
color: $megafooter-ecw-time-color !important;
} else {
color: $ecw-time-color !important;
}
}

// hover styles
&:hover {
.uc-cal-event-month{

}
.uc-cal-event-day {
}
.uc-cal-event-title {
}
.uc-cal-event-time {
}
}

} // cal-event


} //cal-item
} // cal-list


} //icon-VIEW

/**/

// LIST VIEW
.uc-listcal {

padding-left:$ecw-list-dateWidth !important;

.uc-cal-event-date {
width: $ecw-list-dateWidth !important;
left:-($ecw-list-dateWidth) !important;
margin-right:-($ecw-list-dateWidth) !important;
}
}
Loading

0 comments on commit 329399c

Please sign in to comment.