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 pull request #49 from jem08002/master 
Pull Request for New Variable Changes
  • Loading branch information
@amb00010
amb00010 committed Feb 11, 2015
2 parents 982998d + 46dc4e7 commit c6c987b
Show file tree
Hide file tree
Showing 11 changed files with 2,184 additions and 1,502 deletions.
748 changes: 445 additions & 303 deletions css/sherman-black.css
View file

Large diffs are not rendered by default.

754 changes: 441 additions & 313 deletions css/sherman-blue.css
View file

Large diffs are not rendered by default.

768 changes: 448 additions & 320 deletions css/sherman-grey.css
View file

Large diffs are not rendered by default.

754 changes: 448 additions & 306 deletions css/sherman-red.css
View file

Large diffs are not rendered by default.

153 changes: 69 additions & 84 deletions sass/sherman-common.scss
View file
Expand Up @@ -31,7 +31,7 @@ body{
/* Masthead
====================================
*/
#masthead{ //To be replaced with Gradient Mixin soon
#masthead{
background: $sh-masthead-start;
background: -moz-linear-gradient(top, $sh-masthead-start 0%, $sh-masthead-end 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$sh-masthead-start), color-stop(100%,$sh-masthead-end));
Expand All @@ -52,6 +52,7 @@ body{
color:$title_parentHover;
}
}

#uc-site-title a {
color:$title_txt;
&:hover {
Expand All @@ -60,7 +61,8 @@ body{
}
}
}
@include searchform();
@include searchform($sh-masthead-search-btn-bg, $sh-masthead-search-btn-color, $sh-masthead-search-input-bg, $sh-masthead-search-input-color, $sh-masthead-search-input-placeholder-color);

}
#nav-wrapper{
#site-navigation{
Expand Down Expand Up @@ -96,7 +98,6 @@ body{
padding-right:15px;
}
.nav{
@include searchform();
&> li.open:after {
content:'';
display: block;
Expand Down Expand Up @@ -160,7 +161,9 @@ body{
padding: 10px 15px 2px !important;
margin: 8px -15px 0px !important;
}

}

}
.searchform .btn{
@media (max-width: 767px){
Expand Down Expand Up @@ -201,55 +204,45 @@ body{
}
}



/* Widgets - With Color Variables
====================================
*/
.widget {
margin:0 0 10px;
.widget-head {
.widget-title {
font-weight:normal;
.widget {
margin:0 0 10px;
.widget-head {
.widget-title {
font-weight:normal;
}
}
}
// Search Bar
&.widget_search{
.btn.btn-default{
background-color: $body-search-bg-color;
color: $body-search-text-color;
border: 1px solid $body-search-bg-color;
border-left:none;
// Search Bar
@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);
// Uconn Calendar
&.uc-ecw{
.uc-cal {
.uc-cal-event-month {
padding-bottom:0!important;
padding-top:.6em!important;
}
.uc-cal-event-day {
padding-top:.3em!important;
}
.uc-cal-list a.uc-cal-event .uc-cal-event-date {
border:1px solid #e5e5e5 !important;
.uc-cal-event-day {
padding-bottom:0.2em !important;
margin-top:-3px !important;
color:#777777 !important;
font-weight: 200 !important;
}
}
}
}
}
// Uconn Calendar
.uc-cal {
/*
.uc-cal-event-month {
padding-bottom:0!important;
padding-top:.6em!important;
}
.uc-cal-event-day {
padding-top:.3em!important;
}
.uc-cal-list a.uc-cal-event .uc-cal-event-date {
border:1px solid #e5e5e5 !important;
// Flexible Post Widgets
&.widget_dpe_fp_widget{

.uc-cal-event-day {
font-size:1.7em !important;
padding-bottom:0.2em !important;
margin-top:-3px !important;
color:#777777 !important;
font-weight: 200 !important;
}
}
*/
}
// Flexible Post Widgets
&.widget_dpe_fp_widget{

}
}


/* Main Content
====================================
Expand Down Expand Up @@ -329,29 +322,47 @@ body{
====================================
*/
#footers{


/* #mega-footer+#footer {
border-top:none;
}
*/
@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);
#mega-footer{
.widget{

&.widget_search{
.btn.btn-default{
background-color: $search-bg-color;
color: $search-text-color;
border: 1px solid $search-bg-color;
border-left: none;
}
}
}
.btn {
@media (max-width: 767px) {
float:left;
}
}
.btn{
&.btn-default{
@include button($brand-default);
}
&.btn-primary{
@include button($brand-primary);
}
&.btn-success{
@include button($brand-success);
}
&.btn-info{
@include button($brand-info);
color:$brand-primary;
}
&.btn-warning{
@include button($brand-warning);
color:$brand-primary;
}
&.btn-danger{
@include button($brand-danger);
}
&.btn-link{
@include button($brand-default);
}
&.active{
-moz-box-shadow: inset 0 0 3px $brand-default;
-webkit-box-shadow: inset 0 0 3px $brand-default;
box-shadow: inset 0 0 3px $brand-default;
}
}
.form-inline .form-control {
@media (max-width: 767px) {
float:left;
Expand All @@ -374,6 +385,7 @@ body{
}
}



/* Table ###
====================================
Expand Down Expand Up @@ -452,36 +464,9 @@ table .external .glyphicon-new-window {
float:none;
}


/* Mixin Button - Colors
====================================
*/

@mixin button($color){
background: $color;
background: -moz-linear-gradient(top, lighten($color, 5%) 0%, $color 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, lighten($color, 5%)), color-stop(100%,$color));
background: -webkit-linear-gradient(top, lighten($color, 5%) 0%,$color 100%);
background: -o-linear-gradient(top, lighten($color, 5%) 0%,$color 100%);
background: -ms-linear-gradient(top, lighten($color, 5%) 0%,$color 100%);
background: linear-gradient(to bottom, lighten($color, 5%) 0%,$color 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 );
color:$sh-secondary-text-color;
border-color: darken($color, 8%);
opacity:0.9;
&:hover{
opacity:0.75;
}
&:focus{
outline-color: $color;
opacity:1;
}
}

/* Button With Mixin
====================================
*/
//Button Styles
.btn{
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
Expand Down
94 changes: 71 additions & 23 deletions sass/sherman-variables-black.scss
View file
Expand Up @@ -38,28 +38,67 @@ $dropdown-link-active-bg: #d0d0d0 ;
$widget-border-color: #eaeaea;
$widget-head-color: #9A0405;

// Calendar
$uc-ecw-month-bg: #f5f5f5;
$uc-ecw-month-color: #9A0405;
$uc-ecw-day-bg: #f5f5f5;
$uc-ecw-day-color: #6b6b6b;
$uc-ecw-title-color: #113B7C;
$uc-ecw-title-hover: darken($uc-ecw-title-color, 15%);
$uc-ecw-time-color: #113B7C;
$uc-ecw-time-hover: darken($uc-ecw-time-color, 15%);

$link-color: #717073;
$link-hover-color: darken($link-color, 15%) !default;

// Calendar
$ecw-icon-month-bg: #f5f5f5;
$ecw-icon-month-color: #9A0405;
$ecw-icon-day-bg: #f5f5f5;
$ecw-icon-day-color: #6b6b6b;

$ecw-title-color: #6b6b6b;
$ecw-time-color: #9A0405;

// MEGA FOOTER
$megafooter-widget-border-color: transparent;
$megafooter-widget-border-width: 0px;
$megafooter-widget-bg: transparent;
$megafooter-widget-color: #aaa;
$megafooter-widget-link-color: #fff;
$megafooter-widget-link-hover: $link-color;

$megafooter-widget-head-bg: $megafooter-widget-bg;
$megafooter-widget-head-color: $megafooter-widget-color;
$megafooter-widget-head-border-width: $megafooter-widget-border-width;
$megafooter-widget-head-border-color: $megafooter-widget-border-color;

// SHARED
$megafooter-ecw-title-color: rgba(255,255,255,.7);
$megafooter-ecw-title-color-hover: rgba(255,255,255, 1);

// LIST VIEW
$megafooter-ecw-list-date-color: $ecw-icon-month-color;
$megafooter-ecw-list-date-color-hover: lighten($ecw-icon-month-color, 15%);

// ICON VIEW
$megafooter-ecw-icon-month-color: $ecw-icon-month-color;
$megafooter-ecw-icon-month-color-hover: lighten($ecw-icon-month-color, 15%);
$megafooter-ecw-icon-month-bg: rgba(0,0,0, .6);
$megafooter-ecw-icon-month-bg-hover: lighten($megafooter-ecw-icon-month-bg, 5%);
$megafooter-ecw-icon-month-border-color: $megafooter-widget-border-color !default;
$megafooter-ecw-icon-month-border-color-hover: $megafooter-widget-border-color !default;

$megafooter-ecw-icon-day-color: rgba(255,255,255,.7);
$megafooter-ecw-icon-day-color-hover: rgba(255,255,255, 1);
$megafooter-ecw-icon-day-bg: rgba(0,0,0, .6);
$megafooter-ecw-icon-day-bg-hover: lighten($megafooter-ecw-icon-month-bg, 5%);

$megafooter-ecw-icon-day-border-color: $megafooter-widget-border-color !default;
$megafooter-ecw-icon-day-border-color-hover: $megafooter-widget-border-color !default;

$megafooter-ecw-time-color: $ecw-time-color;
$megafooter-ecw-time-color-hover: lighten($ecw-time-color, 15%);
$megafooter-ecw-list-date-color: $ecw-title-color;
$megafooter-ecw-list-date-color-hover: lighten($ecw-title-color, 15%);

//Footers
$footers-bg: #292929;
$footers-link-color: rgba(255,255,255,.7);
$footers-link-hover: rgba(255,255,255,1);

$footers-border-color: #414141;

$megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #ffffff !important;

/* Primary Colors (Bootstrap) */
$brand-primary: #676767 !default;
$brand-success: #48c239 !default;
Expand Down Expand Up @@ -112,16 +151,25 @@ $sh-mega-footer-border-color: #414141;

$sh-header1-color: #343434;

// SEARCH
// Header
$sh-masthead-search-btn-bg: rgba(255, 255, 255, .3);
$sh-masthead-search-btn-color: rgba(255, 255, 255, .5);
$sh-masthead-search-input-bg: rgba(255, 255, 255, .2);
$sh-masthead-search-input-color: rgba(255, 255, 255, 1);
$sh-masthead-search-input-placeholder-color: rgba(255, 255, 255, .5);
// Content
$sh-content-search-btn-bg: $brand-default;
$sh-content-search-btn-color: rgba(255, 255, 255, .2);
$sh-content-search-input-bg: rgba(255, 255, 255, .2);
$sh-content-search-input-color: rgba(0, 0, 0, .8);
$sh-content-search-input-placeholder-color: rgba(0, 0, 0, .5);
// Footers
$sh-footers-search-btn-bg: $brand-default;
$sh-footers-search-btn-color: rgba(255, 255, 255, .2);
$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);

/* Main Search Form */
$searchText: #fff;
$searchPlacehoderText: rgba($searchText, .5);
$searchBackground: rgba(255, 255, 255, .15);

/* Body Search Form */
$body-search-bg-color: rgba(0, 0, 0, .12);
$body-search-text-color: #363636;

/* Widget Search Form */
$search-bg-color: #878787;
$search-text-color: #ffffff;

0 comments on commit c6c987b

Please sign in to comment.