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

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@szk11001
szk11001 committed Nov 9, 2015
2 parents a33f8a3 + 95ca803 commit 01aa367
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 27 deletions.
4 changes: 4 additions & 0 deletions sass/_content.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ code {
background-color: $contentBg;
padding: $contentPadding;
}
.panel-grid .post {
background-color: transparent;
}


/*--------------------------------------------------------------
10.0 Content
Expand Down
24 changes: 20 additions & 4 deletions sass/_widgets.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
border-width: $megafooter-widget-head-border-width;
border-color: $megafooter-widget-head-border-color;
background-color: $megafooter-widget-head-bg;

} @else if $parent == "#maxmegamenu" {
padding: $maxmegamenu-widget-head-padding;
border-width: $maxmegamenu-widget-head-border-width;
Expand Down Expand Up @@ -265,7 +264,7 @@

/* === 3rd Party Widgets
*/
&.widget_black-studio-tinymce {
&.widget_black_studio_tinymce {
.textwidget {
@if $parent == "#mega-footer" {
margin:$megafooter-widget-content-margin;
Expand Down Expand Up @@ -423,8 +422,26 @@
/* === UCONN Widgets
*/
&.uc-contact-widget {

.table-responsive {
@if $parent == "#mega-footer" {
padding:1em;
} @else if $parent == "#maxmegamenu" {
padding:1em;
} @else if $parent == ".subpage" {
padding:1em;
}
}

th {
white-space:nowrap;
white-space:nowrap;
@if $parent == "#mega-footer" {
padding-left:0;
} @else if $parent == "#maxmegamenu" {
padding-left:0;
} @else if $parent == ".subpage" {
padding-left:0;
}
}
td{
&.uc-output-email{
Expand All @@ -433,7 +450,6 @@
&.uc-output-more{
word-break: break-all;
}

}
}

Expand Down
58 changes: 35 additions & 23 deletions style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5982,13 +5982,13 @@ button.close {
margin: 1em; }
.home #content .widget.widget_tag_cloud .tagcloud {
margin: 1em; }
.home #content .widget.widget_black-studio-tinymce .textwidget {
.home #content .widget.widget_black_studio_tinymce .textwidget {
margin: 1em; }
.home #content .widget.widget_black-studio-tinymce ul, .home #content .widget.widget_black-studio-tinymce ol {
.home #content .widget.widget_black_studio_tinymce ul, .home #content .widget.widget_black_studio_tinymce ol {
padding-left: 4em; }
.home #content .widget.widget_black-studio-tinymce ul li {
.home #content .widget.widget_black_studio_tinymce ul li {
list-style-type: disc; }
.home #content .widget.widget_black-studio-tinymce ol li {
.home #content .widget.widget_black_studio_tinymce ol li {
list-style-type: decimal; }
.home #content .widget.simple-social-icons ul {
margin: 0.5em !important; }
Expand Down Expand Up @@ -6256,13 +6256,13 @@ button.close {
margin: 0; }
.home #content .panel-grid .widget.widget_tag_cloud .tagcloud {
margin: 0; }
.home #content .panel-grid .widget.widget_black-studio-tinymce .textwidget {
.home #content .panel-grid .widget.widget_black_studio_tinymce .textwidget {
margin: 0; }
.home #content .panel-grid .widget.widget_black-studio-tinymce ul, .home #content .panel-grid .widget.widget_black-studio-tinymce ol {
.home #content .panel-grid .widget.widget_black_studio_tinymce ul, .home #content .panel-grid .widget.widget_black_studio_tinymce ol {
padding-left: 4em; }
.home #content .panel-grid .widget.widget_black-studio-tinymce ul li {
.home #content .panel-grid .widget.widget_black_studio_tinymce ul li {
list-style-type: disc; }
.home #content .panel-grid .widget.widget_black-studio-tinymce ol li {
.home #content .panel-grid .widget.widget_black_studio_tinymce ol li {
list-style-type: decimal; }
.home #content .panel-grid .widget.simple-social-icons ul {
margin: 0.5em !important; }
Expand Down Expand Up @@ -6343,8 +6343,11 @@ button.close {
width: 50%; }
.home #content .panel-grid .widget.widget_dpe_fp_widget .dpe-flexible-posts li.has-post-thumbnail a:hover .title {
text-decoration: underline; }
.home #content .panel-grid .widget.uc-contact-widget .table-responsive {
padding: 1em; }
.home #content .panel-grid .widget.uc-contact-widget th {
white-space: nowrap; }
white-space: nowrap;
padding-left: 0; }
.home #content .panel-grid .widget.uc-contact-widget td.uc-output-email {
word-break: break-all; }
.home #content .panel-grid .widget.uc-contact-widget td.uc-output-more {
Expand Down Expand Up @@ -6531,13 +6534,13 @@ button.close {
margin: 1em; }
#page-sidebar .widget.widget_tag_cloud .tagcloud {
margin: 1em; }
#page-sidebar .widget.widget_black-studio-tinymce .textwidget {
#page-sidebar .widget.widget_black_studio_tinymce .textwidget {
margin: 1em; }
#page-sidebar .widget.widget_black-studio-tinymce ul, #page-sidebar .widget.widget_black-studio-tinymce ol {
#page-sidebar .widget.widget_black_studio_tinymce ul, #page-sidebar .widget.widget_black_studio_tinymce ol {
padding-left: 4em; }
#page-sidebar .widget.widget_black-studio-tinymce ul li {
#page-sidebar .widget.widget_black_studio_tinymce ul li {
list-style-type: disc; }
#page-sidebar .widget.widget_black-studio-tinymce ol li {
#page-sidebar .widget.widget_black_studio_tinymce ol li {
list-style-type: decimal; }
#page-sidebar .widget.simple-social-icons ul {
margin: 0.5em !important; }
Expand Down Expand Up @@ -6806,13 +6809,13 @@ button.close {
margin: 0; }
.subpage .widget.widget_tag_cloud .tagcloud {
margin: 0; }
.subpage .widget.widget_black-studio-tinymce .textwidget {
.subpage .widget.widget_black_studio_tinymce .textwidget {
margin: 0; }
.subpage .widget.widget_black-studio-tinymce ul, .subpage .widget.widget_black-studio-tinymce ol {
.subpage .widget.widget_black_studio_tinymce ul, .subpage .widget.widget_black_studio_tinymce ol {
padding-left: 4em; }
.subpage .widget.widget_black-studio-tinymce ul li {
.subpage .widget.widget_black_studio_tinymce ul li {
list-style-type: disc; }
.subpage .widget.widget_black-studio-tinymce ol li {
.subpage .widget.widget_black_studio_tinymce ol li {
list-style-type: decimal; }
.subpage .widget.simple-social-icons ul {
margin: 0.5em !important; }
Expand Down Expand Up @@ -6893,8 +6896,11 @@ button.close {
width: 50%; }
.subpage .widget.widget_dpe_fp_widget .dpe-flexible-posts li.has-post-thumbnail a:hover .title {
text-decoration: underline; }
.subpage .widget.uc-contact-widget .table-responsive {
padding: 1em; }
.subpage .widget.uc-contact-widget th {
white-space: nowrap; }
white-space: nowrap;
padding-left: 0; }
.subpage .widget.uc-contact-widget td.uc-output-email {
word-break: break-all; }
.subpage .widget.uc-contact-widget td.uc-output-more {
Expand Down Expand Up @@ -7226,6 +7232,9 @@ input[type="button"]#page #content .widget.btn-block {
background-color: #fff;
padding: 1em; }

.panel-grid .post {
background-color: transparent; }

/*--------------------------------------------------------------
10.0 Content
--------------------------------------------------------------*/
Expand Down Expand Up @@ -7776,13 +7785,13 @@ body.sticky .ie8 #footers {
margin: 1em; }
#mega-footer .widget.widget_tag_cloud .tagcloud {
margin: 1em; }
#mega-footer .widget.widget_black-studio-tinymce .textwidget {
#mega-footer .widget.widget_black_studio_tinymce .textwidget {
margin: 1em; }
#mega-footer .widget.widget_black-studio-tinymce ul, #mega-footer .widget.widget_black-studio-tinymce ol {
#mega-footer .widget.widget_black_studio_tinymce ul, #mega-footer .widget.widget_black_studio_tinymce ol {
padding-left: 4em; }
#mega-footer .widget.widget_black-studio-tinymce ul li {
#mega-footer .widget.widget_black_studio_tinymce ul li {
list-style-type: disc; }
#mega-footer .widget.widget_black-studio-tinymce ol li {
#mega-footer .widget.widget_black_studio_tinymce ol li {
list-style-type: decimal; }
#mega-footer .widget.simple-social-icons ul {
margin: 0.5em !important; }
Expand Down Expand Up @@ -7863,8 +7872,11 @@ body.sticky .ie8 #footers {
width: 50%; }
#mega-footer .widget.widget_dpe_fp_widget .dpe-flexible-posts li.has-post-thumbnail a:hover .title {
text-decoration: underline; }
#mega-footer .widget.uc-contact-widget .table-responsive {
padding: 1em; }
#mega-footer .widget.uc-contact-widget th {
white-space: nowrap; }
white-space: nowrap;
padding-left: 0; }
#mega-footer .widget.uc-contact-widget td.uc-output-email {
word-break: break-all; }
#mega-footer .widget.uc-contact-widget td.uc-output-more {
Expand Down

0 comments on commit 01aa367

Please sign in to comment.