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

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jem08002-master'
  • Loading branch information
andrewmbacon committed Feb 18, 2015
2 parents f1722d6 + 890f301 commit be0ea5f
Show file tree
Hide file tree
Showing 13 changed files with 278 additions and 187 deletions.
75 changes: 45 additions & 30 deletions css/sherman-black.css
View file
Expand Up @@ -7014,7 +7014,7 @@ button.close {
#content .widget .widget-head h2 {
margin: 0;
font-size: 150%;
color: #9a0405;
color: #0b1860;
}
#content .widget form {
margin: 1em;
Expand Down Expand Up @@ -8344,15 +8344,16 @@ body {
#masthead #site-title .searchform .btn {
background: none;
filter: none;
background-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
color: rgba(255, 255, 255, 0.5);
border: none;
padding: 6px 12px;
border-radius: 0px;
opacity: 1;
}
#masthead #site-title .searchform .btn:hover {
color: #fff;
background-color: rgba(217, 217, 217, 0.3);
background-color: rgba(217, 217, 217, 0.2);
}
#masthead #nav-wrapper #site-navigation {
border-bottom: none;
Expand Down Expand Up @@ -8497,55 +8498,64 @@ body {
/* Widgets - With Color Variables
====================================
*/
.widget {
#content .widget {
margin: 0 0 10px;
}
.widget .widget-head .widget-title {
#content .widget .widget-head .widget-title {
font-weight: normal;
}
.widget .searchform .form-control {
#content .widget.widget_search .searchform .form-control {
background-color: rgba(0, 0, 0, 0.1);
color: rgba(0, 0, 0, 0.8);
color: rgba(0, 0, 0, 0.7);
border-radius: 0;
border: none;
height: auto;
}
.widget .searchform .form-control::-webkit-input-placeholder {
#content .widget.widget_search .searchform .form-control::-webkit-input-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .form-control:-moz-placeholder {
#content .widget.widget_search .searchform .form-control:-moz-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .form-control::-moz-placeholder {
#content .widget.widget_search .searchform .form-control::-moz-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .form-control:-ms-input-placeholder {
#content .widget.widget_search .searchform .form-control:-ms-input-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .btn {
#content .widget.widget_search .searchform .btn {
background: none;
filter: none;
background-color: #0b2347;
color: rgba(255, 255, 255, 0.2);
background-color: rgba(0, 0, 0, 0.1);
color: rgba(0, 0, 0, 0.5);
border: none;
padding: 6px 12px;
border-radius: 0px;
opacity: 1;
}
.widget .searchform .btn:hover {
#content .widget.widget_search .searchform .btn:hover {
color: #fff;
background-color: #010205;
background-color: rgba(0, 0, 0, 0.1);
}
#content .widget.widget_search fieldset {
border: 1px solid #ccc;
}
.widget.uc-ecw .uc-cal .uc-cal-event-month {
#content .widget.widget_search fieldset .form-control {
box-shadow: none;
webkit-box-shadow: none;
moz-box-shadow: none;
}
#content .widget.uc-ecw .uc-cal .uc-cal-event-month {
padding-bottom: 0 !important;
padding-top: 0.6em !important;
}
.widget.uc-ecw .uc-cal .uc-cal-event-day {
#content .widget.uc-ecw .uc-cal .uc-cal-event-day {
padding-top: 0.3em !important;
}
.widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
#content .widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
border: 1px solid #e5e5e5 !important;
}
.widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
#content .widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
padding-bottom: 0.2em !important;
margin-top: -3px !important;
color: #777777 !important;
Expand Down Expand Up @@ -8622,37 +8632,38 @@ body {
/* Footer
====================================
*/
#footers .searchform .form-control {
#footers #mega-footer .widget.widget_search .searchform .form-control {
background-color: rgba(255, 255, 255, 0.2);
color: white;
border-radius: 0;
border: none;
height: auto;
}
#footers .searchform .form-control::-webkit-input-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control::-webkit-input-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .form-control:-moz-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control:-moz-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .form-control::-moz-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control::-moz-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .form-control:-ms-input-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control:-ms-input-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .btn {
#footers #mega-footer .widget.widget_search .searchform .btn {
background: none;
filter: none;
background-color: #0b2347;
color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.2);
color: rgba(255, 255, 255, 0.5);
border: none;
padding: 6px 12px;
border-radius: 0px;
opacity: 1;
}
#footers .searchform .btn:hover {
#footers #mega-footer .widget.widget_search .searchform .btn:hover {
color: #fff;
background-color: #010205;
background-color: rgba(217, 217, 217, 0.2);
}
@media (max-width: 767px) {
#footers #mega-footer .btn {
Expand Down Expand Up @@ -8852,6 +8863,10 @@ table .external .glyphicon-new-window {
width: auto;
}

#events-table #events-toolbar {
margin-bottom: 1.55em !important;
}

/* Profile Page
====================================
*/
Expand Down
75 changes: 45 additions & 30 deletions css/sherman-blue.css
View file
Expand Up @@ -8344,15 +8344,16 @@ body {
#masthead #site-title .searchform .btn {
background: none;
filter: none;
background-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
color: rgba(255, 255, 255, 0.5);
border: none;
padding: 6px 12px;
border-radius: 0px;
opacity: 1;
}
#masthead #site-title .searchform .btn:hover {
color: #fff;
background-color: rgba(217, 217, 217, 0.3);
background-color: rgba(217, 217, 217, 0.2);
}
#masthead #nav-wrapper #site-navigation {
border-bottom: none;
Expand Down Expand Up @@ -8497,55 +8498,64 @@ body {
/* Widgets - With Color Variables
====================================
*/
.widget {
#content .widget {
margin: 0 0 10px;
}
.widget .widget-head .widget-title {
#content .widget .widget-head .widget-title {
font-weight: normal;
}
.widget .searchform .form-control {
#content .widget.widget_search .searchform .form-control {
background-color: rgba(0, 0, 0, 0.1);
color: rgba(0, 0, 0, 0.8);
color: rgba(0, 0, 0, 0.7);
border-radius: 0;
border: none;
height: auto;
}
.widget .searchform .form-control::-webkit-input-placeholder {
#content .widget.widget_search .searchform .form-control::-webkit-input-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .form-control:-moz-placeholder {
#content .widget.widget_search .searchform .form-control:-moz-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .form-control::-moz-placeholder {
#content .widget.widget_search .searchform .form-control::-moz-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .form-control:-ms-input-placeholder {
#content .widget.widget_search .searchform .form-control:-ms-input-placeholder {
color: rgba(0, 0, 0, 0.5);
}
.widget .searchform .btn {
#content .widget.widget_search .searchform .btn {
background: none;
filter: none;
background-color: #0b2347;
color: rgba(255, 255, 255, 0.2);
background-color: rgba(0, 0, 0, 0.1);
color: rgba(0, 0, 0, 0.5);
border: none;
padding: 6px 12px;
border-radius: 0px;
opacity: 1;
}
.widget .searchform .btn:hover {
#content .widget.widget_search .searchform .btn:hover {
color: #fff;
background-color: #010205;
background-color: rgba(0, 0, 0, 0.1);
}
.widget.uc-ecw .uc-cal .uc-cal-event-month {
#content .widget.widget_search fieldset {
border: 1px solid #ccc;
}
#content .widget.widget_search fieldset .form-control {
box-shadow: none;
webkit-box-shadow: none;
moz-box-shadow: none;
}
#content .widget.uc-ecw .uc-cal .uc-cal-event-month {
padding-bottom: 0 !important;
padding-top: 0.6em !important;
}
.widget.uc-ecw .uc-cal .uc-cal-event-day {
#content .widget.uc-ecw .uc-cal .uc-cal-event-day {
padding-top: 0.3em !important;
}
.widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
#content .widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
border: 1px solid #e5e5e5 !important;
}
.widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
#content .widget.uc-ecw .uc-cal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
padding-bottom: 0.2em !important;
margin-top: -3px !important;
color: #777777 !important;
Expand Down Expand Up @@ -8622,37 +8632,38 @@ body {
/* Footer
====================================
*/
#footers .searchform .form-control {
#footers #mega-footer .widget.widget_search .searchform .form-control {
background-color: rgba(255, 255, 255, 0.2);
color: rgba(255, 255, 255, 0.8);
color: white;
border-radius: 0;
border: none;
height: auto;
}
#footers .searchform .form-control::-webkit-input-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control::-webkit-input-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .form-control:-moz-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control:-moz-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .form-control::-moz-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control::-moz-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .form-control:-ms-input-placeholder {
#footers #mega-footer .widget.widget_search .searchform .form-control:-ms-input-placeholder {
color: rgba(255, 255, 255, 0.5);
}
#footers .searchform .btn {
#footers #mega-footer .widget.widget_search .searchform .btn {
background: none;
filter: none;
background-color: #0b2347;
color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.2);
color: rgba(255, 255, 255, 0.5);
border: none;
padding: 6px 12px;
border-radius: 0px;
opacity: 1;
}
#footers .searchform .btn:hover {
#footers #mega-footer .widget.widget_search .searchform .btn:hover {
color: #fff;
background-color: #010205;
background-color: rgba(217, 217, 217, 0.2);
}
@media (max-width: 767px) {
#footers #mega-footer .btn {
Expand Down Expand Up @@ -8852,6 +8863,10 @@ table .external .glyphicon-new-window {
width: auto;
}

#events-table #events-toolbar {
margin-bottom: 1.55em !important;
}

/* Profile Page
====================================
*/
Expand Down

0 comments on commit be0ea5f

Please sign in to comment.