From 877fe927758d77ede37338599423d84bca4c815a Mon Sep 17 00:00:00 2001 From: Jessika Mika Caldera Date: Wed, 18 Feb 2015 13:34:13 -0500 Subject: [PATCH] Changes Per Brian's Request Box Shadow fix Border fix Light Grey header search bar fix --- css/sherman-black.css | 34 +++++++++++++--------- css/sherman-blue.css | 34 +++++++++++++--------- css/sherman-grey.css | 49 +++++++++++++++++++++----------- css/sherman-red.css | 34 +++++++++++++--------- sass/sherman-common.scss | 15 +++++++++- sass/sherman-variables-grey.scss | 17 +++++++++-- 6 files changed, 125 insertions(+), 58 deletions(-) diff --git a/css/sherman-black.css b/css/sherman-black.css index b275a10..4192fe2 100644 --- a/css/sherman-black.css +++ b/css/sherman-black.css @@ -8491,32 +8491,32 @@ 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.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: rgba(0, 0, 0, 0.1); @@ -8526,21 +8526,29 @@ body { border-radius: 0px; opacity: 1; } -.widget .searchform .btn:hover { +#content .widget.widget_search .searchform .btn:hover { color: #fff; 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; diff --git a/css/sherman-blue.css b/css/sherman-blue.css index a9a7d47..b398b8f 100644 --- a/css/sherman-blue.css +++ b/css/sherman-blue.css @@ -8491,32 +8491,32 @@ 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.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: rgba(0, 0, 0, 0.1); @@ -8526,21 +8526,29 @@ body { border-radius: 0px; opacity: 1; } -.widget .searchform .btn:hover { +#content .widget.widget_search .searchform .btn:hover { color: #fff; 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; diff --git a/css/sherman-grey.css b/css/sherman-grey.css index 5e84b73..cc4487a 100644 --- a/css/sherman-grey.css +++ b/css/sherman-grey.css @@ -15,6 +15,15 @@ /* Primary Colors (Bootstrap) */ /* Buttons, define text, background and border color. */ /* Sherman Only Variables */ +#masthead #site-title fieldset { + border: 1px solid #ccc; +} +#masthead #site-title fieldset .form-control { + box-shadow: none; + webkit-box-shadow: none; + moz-box-shadow: none; +} + /* Theme Name: Cornerstone Author: UConn Web Development Lab @@ -8316,7 +8325,7 @@ body { color: #03071b; } #masthead #site-title .searchform .form-control { - background-color: rgba(255, 255, 255, 0.2); + background-color: rgba(255, 255, 255, 0.5); color: rgba(0, 0, 0, 0.5); border-radius: 0; border: none; @@ -8337,7 +8346,7 @@ body { #masthead #site-title .searchform .btn { background: none; filter: none; - background-color: rgba(255, 255, 255, 0.2); + background-color: rgba(255, 255, 255, 0.5); color: rgba(0, 0, 0, 0.3); border: none; padding: 6px 12px; @@ -8346,7 +8355,7 @@ body { } #masthead #site-title .searchform .btn:hover { color: #fff; - background-color: rgba(217, 217, 217, 0.2); + background-color: rgba(217, 217, 217, 0.5); } #masthead #nav-wrapper #site-navigation { border-bottom: none; @@ -8491,32 +8500,32 @@ 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.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: rgba(0, 0, 0, 0.1); @@ -8526,21 +8535,29 @@ body { border-radius: 0px; opacity: 1; } -.widget .searchform .btn:hover { +#content .widget.widget_search .searchform .btn:hover { color: #fff; 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; diff --git a/css/sherman-red.css b/css/sherman-red.css index 440b49b..10a8665 100644 --- a/css/sherman-red.css +++ b/css/sherman-red.css @@ -8491,32 +8491,32 @@ 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.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: rgba(0, 0, 0, 0.1); @@ -8526,21 +8526,29 @@ body { border-radius: 0px; opacity: 1; } -.widget .searchform .btn:hover { +#content .widget.widget_search .searchform .btn:hover { color: #fff; 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; diff --git a/sass/sherman-common.scss b/sass/sherman-common.scss index 7df8657..743b365 100644 --- a/sass/sherman-common.scss +++ b/sass/sherman-common.scss @@ -207,6 +207,7 @@ body{ /* Widgets - With Color Variables ==================================== */ +#content{ .widget { margin:0 0 10px; .widget-head { @@ -215,7 +216,17 @@ body{ } } // Search Bar + &.widget_search{ @include searchform($sh-content-search-btn-bg, $sh-content-search-btn-color, $sh-content-search-input-bg, $sh-content-search-input-color, $sh-content-search-input-placeholder-color); + fieldset{ + border: 1px solid #ccc; + .form-control{ + box-shadow:none; + webkit-box-shadow:none; + moz-box-shadow:none; + } + } + } // Uconn Calendar &.uc-ecw{ .uc-cal { @@ -242,6 +253,7 @@ body{ } } +} /* Main Content @@ -328,7 +340,8 @@ body{ #mega-footer{ .widget{ &.widget_search{ - @include searchform($sh-footers-search-btn-bg, $sh-footers-search-btn-color, $sh-footers-search-input-bg, $sh-footers-search-input-color, $sh-footers-search-input-placeholder-color); } + @include searchform($sh-footers-search-btn-bg, $sh-footers-search-btn-color, $sh-footers-search-input-bg, $sh-footers-search-input-color, $sh-footers-search-input-placeholder-color); + } } .btn { @media (max-width: 767px) { diff --git a/sass/sherman-variables-grey.scss b/sass/sherman-variables-grey.scss index 4cbb961..c59b83d 100644 --- a/sass/sherman-variables-grey.scss +++ b/sass/sherman-variables-grey.scss @@ -152,9 +152,9 @@ $sh-header1-color: #ac0000; // SEARCH // Header -$sh-masthead-search-btn-bg: rgba(255, 255, 255, .2); +$sh-masthead-search-btn-bg: rgba(255, 255, 255, .5); $sh-masthead-search-btn-color: rgba(0, 0, 0, .3); -$sh-masthead-search-input-bg: rgba(255, 255, 255, .2); +$sh-masthead-search-input-bg: rgba(255, 255, 255, .5); $sh-masthead-search-input-color: rgba(0, 0, 0, .5); $sh-masthead-search-input-placeholder-color: rgba(0, 0, 0, .3); // Content @@ -170,4 +170,17 @@ $sh-footers-search-input-bg: rgba(255, 255, 255, .2); $sh-footers-search-input-color: rgba(255, 255, 255, 1); $sh-footers-search-input-placeholder-color: rgba(255, 255, 255, .5); +#masthead{ + #site-title{ + fieldset{ + border: 1px solid #ccc; + .form-control{ + box-shadow:none; + webkit-box-shadow:none; + moz-box-shadow:none; + } + } + } +} +