From 717555da4f13ab4158276ad63c7e00b62aff2684 Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Mon, 15 Jun 2015 11:36:10 -0400 Subject: [PATCH] Button Update --- css/ece.css | 64 ++++++++++++++++++++--------- sass/_buttons-min.scss | 37 +++++++++++++++++ sass/_buttons.scss | 92 ------------------------------------------ sass/_variables.scss | 18 ++++++++- sass/ece.scss | 60 +++++++++++++++++++++++---- 5 files changed, 153 insertions(+), 118 deletions(-) create mode 100644 sass/_buttons-min.scss delete mode 100644 sass/_buttons.scss diff --git a/css/ece.css b/css/ece.css index 6433715..9533eea 100644 --- a/css/ece.css +++ b/css/ece.css @@ -1,5 +1,8 @@ /* ----------- _variables.scss ----------- */ /* Theme Colors */ +/* ----------- _buttons.scss ----------- */ +/* Gradient Start */ +/* Gradient End */ /* ----------- _fonts.scss ----------- */ @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,700,700italic); @font-face { @@ -30,9 +33,6 @@ font-weight: normal; font-style: normal; } -/* ----------- _buttons.scss ----------- */ -/* Gradient Start */ -/* Gradient End */ /* ---------- Gradient ---------- */ a.btn-purple { background: #9944a9; @@ -42,9 +42,8 @@ a.btn-purple { background: -o-linear-gradient(top, #9944a9 0%, #893d97 100%); background: -ms-linear-gradient(top, #9944a9 0%, #893d97 100%); background: linear-gradient(to bottom, #9944a9 0%, #893d97 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$start-purple', endColorstr='$end-purple',GradientType=0 ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9944a9', endColorstr='#893d97',GradientType=0 ); } - a.btn-purple:hover { color: white !important; background: #753481 !important; @@ -58,9 +57,8 @@ a.btn-teal { background: -o-linear-gradient(top, #00a8b1 0%, #009098 100%); background: -ms-linear-gradient(top, #00a8b1 0%, #009098 100%); background: linear-gradient(to bottom, #00a8b1 0%, #009098 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$start-teal', endColorstr='$end-teal',GradientType=0 ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00a8b1', endColorstr='#009098',GradientType=0 ); } - a.btn-teal:hover { color: white !important; background: #007379 !important; @@ -74,9 +72,8 @@ a.btn-orange { background: -o-linear-gradient(top, #f78a11 0%, #e77d08 100%); background: -ms-linear-gradient(top, #f78a11 0%, #e77d08 100%); background: linear-gradient(to bottom, #f78a11 0%, #e77d08 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$start-orange', endColorstr='$end-orange',GradientType=0 ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f78a11', endColorstr='#e77d08',GradientType=0 ); } - a.btn-orange:hover { color: white !important; background: #c96d07 !important; @@ -90,15 +87,14 @@ a.btn-red { background: -o-linear-gradient(top, #c5112e 0%, #ae0f29 100%); background: -ms-linear-gradient(top, #c5112e 0%, #ae0f29 100%); background: linear-gradient(to bottom, #c5112e 0%, #ae0f29 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$start-red', endColorstr='$end-red',GradientType=0 ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c5112e', endColorstr='#ae0f29',GradientType=0 ); } - a.btn-red:hover { color: white !important; background: #910d22 !important; } -a.btn-green { +a.btn-red { background: #41b23c; background: -moz-linear-gradient(top, #41b23c 0%, #3a9f36 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #41b23c), color-stop(100%, #3a9f36)); @@ -106,10 +102,9 @@ a.btn-green { background: -o-linear-gradient(top, #41b23c 0%, #3a9f36 100%); background: -ms-linear-gradient(top, #41b23c 0%, #3a9f36 100%); background: linear-gradient(to bottom, #41b23c 0%, #3a9f36 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$start-green', endColorstr='$end-green',GradientType=0 ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#41b23c', endColorstr='#3a9f36',GradientType=0 ); } - -a.btn-green:hover { +a.btn-red:hover { color: white !important; background: #32882e !important; } @@ -8982,6 +8977,7 @@ h1, .h1, h2, .h2, h3, .h3 { color: #00a8b1 !important; } +/* ----------------------------- UC-Cal ----------------------------- */ uc-cal { padding: 0 !important; } @@ -9036,6 +9032,7 @@ ol.uc-cal-list { min-height: 50px; } +/* ----------------------------- Content ----------------------------- */ #content .widget { border-radius: 0px; background-color: #FAFAFA; @@ -9139,7 +9136,7 @@ ol.uc-cal-list { .metaslider .caption-wrap { opacity: 1 !important; - background-color: rgba(65, 178, 60, 0.7) !important; + background-color: rgba(65, 178, 60, 0.8) !important; } .metaslider .caption-wrap .caption { padding: 7px 12px; @@ -9148,9 +9145,13 @@ ol.uc-cal-list { line-height: 1.3em; } +.ie8 .metaslider .caption-wrap { + background-color: #41b23c; +} + /* ---------------------------- Home Page Specific Styles ------------------------------- */ body.home .entry-content { - padding-right: 10px !important; + padding-right: 0px !important; } body.home .panel-grid:nth-child(2) .panel-grid-cell:nth-child(1) p { margin-bottom: 5px !important; @@ -9195,6 +9196,7 @@ body.home .metaslider .caption-wrap h1 { } body.home .metaslider .caption-wrap p { line-height: 1.5em; + font-size: 15px; } body.home .metaslider .caption-wrap a.btn { margin-top: 20px !important; @@ -9208,6 +9210,7 @@ body.home .hentry { margin: 0; } +/* ----------------------------- Default Page Styles ----------------------------- */ #page-page, #page-blank, #page-userlist, #page-user-profile .col-sm-9, #page-single, #page-archive { background-color: #FAFAFA; border: 1px solid #EBEBEB; @@ -9236,6 +9239,7 @@ body.home .hentry { font-size: 20px; } +/* ----------------------------- Page Blank ----------------------------- */ #page-blank { background-color: #FAFAFA; } @@ -9289,6 +9293,7 @@ body.home .hentry { } } +/* ----------------------------- Page Page ----------------------------- */ #page-page .entry-content { padding-right: 0; } @@ -9301,6 +9306,7 @@ body.home .hentry { margin-bottom: 20px; } +/* ----------------------------- Archive/Blog ----------------------------- */ #page-single .widget, #page-archive .widget { padding: 0px !important; border: none; @@ -9338,6 +9344,28 @@ body.home .hentry { display: none; } +/* ----------------------------- Metaslider Colors ----------------------------- */ +.slider-red .caption-wrap { + background-color: rgba(197, 17, 46, 0.8) !important; +} + +.slider-purple .caption-wrap { + background-color: rgba(128, 0, 128, 0.8) !important; +} + +.slider-teal .caption-wrap { + background-color: rgba(0, 168, 177, 0.8) !important; +} + +.slider-orange .caption-wrap { + background-color: rgba(247, 138, 17, 0.8) !important; +} + +.slider-right .caption-wrap { + right: 0; + left: auto !important; +} + /* ----------------------------- UUP ----------------------------- */ .uup-title { font-style: italic; @@ -9348,7 +9376,7 @@ body.home .hentry { width: 50%; } -/* ----------------------------- FOOTER ----------------------------- */ +/* ----------------------------- Footer ----------------------------- */ .footer-img { margin-top: 20px; height: 90px; diff --git a/sass/_buttons-min.scss b/sass/_buttons-min.scss new file mode 100644 index 0000000..44339a2 --- /dev/null +++ b/sass/_buttons-min.scss @@ -0,0 +1,37 @@ +/* ---------- Gradient ---------- */ +@mixin gradient($start-gradient, $end-gradient) { + + background: $start-gradient; + background: -moz-linear-gradient(top, $start-gradient 0%, $end-gradient 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$start-gradient), color-stop(100%,$end-gradient)); + background: -webkit-linear-gradient(top, $start-gradient 0%,$end-gradient 100%); + background: -o-linear-gradient(top, $start-gradient 0%,$end-gradient 100%); + background: -ms-linear-gradient(top, $start-gradient 0%,$end-gradient 100%); + background: linear-gradient(to bottom, $start-gradient 0%,$end-gradient 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#{$start-gradient}', endColorstr='#{$end-gradient}',GradientType=0 ); + + &:hover { + color:white !important; + background:darken($start-gradient,11%) !important; + } +} + +a.btn-purple { + @include gradient($start-purple, $end-purple) +} + +a.btn-teal { + @include gradient($start-teal, $end-teal) +} + +a.btn-orange { + @include gradient($start-orange, $end-orange) +} + +a.btn-red { + @include gradient($start-red, $end-red) +} + +a.btn-red { + @include gradient($start-green, $end-green) +} diff --git a/sass/_buttons.scss b/sass/_buttons.scss deleted file mode 100644 index c9b798b..0000000 --- a/sass/_buttons.scss +++ /dev/null @@ -1,92 +0,0 @@ -/* ----------- _buttons.scss ----------- */ - -/* Gradient Start */ -$start-purple: $purple !default; -$start-teal: $teal !default; -$start-orange: $orange !default; -$start-red: $red !default; -$start-green: $green !default; - -/* Gradient End */ -$end-purple: darken($purple, 5%) !default; -$end-teal: darken($teal, 5%) !default; -$end-orange: darken($orange, 5%) !default; -$end-red: darken($red, 5%) !default; -$end-green: darken($green, 5%) !default; - -/* ---------- Gradient ---------- */ - -a.btn-purple { - background: $start-purple; - background: -moz-linear-gradient(top, $start-purple 0%, $end-purple 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$start-purple), color-stop(100%,$end-purple)); - background: -webkit-linear-gradient(top, $start-purple 0%,$end-purple 100%); - background: -o-linear-gradient(top, $start-purple 0%,$end-purple 100%); - background: -ms-linear-gradient(top, $start-purple 0%,$end-purple 100%); - background: linear-gradient(to bottom, $start-purple 0%,$end-purple 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start-purple', endColorstr='$end-purple',GradientType=0 ); -} - a.btn-purple:hover { - color:white !important; - background:darken($start-purple,11%) !important; - } - -a.btn-teal { - background: $start-teal; - background: -moz-linear-gradient(top, $start-teal 0%, $end-teal 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$start-teal), color-stop(100%,$end-teal)); - background: -webkit-linear-gradient(top, $start-teal 0%,$end-teal 100%); - background: -o-linear-gradient(top, $start-teal 0%,$end-teal 100%); - background: -ms-linear-gradient(top, $start-teal 0%,$end-teal 100%); - background: linear-gradient(to bottom, $start-teal 0%,$end-teal 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start-teal', endColorstr='$end-teal',GradientType=0 ); -} - a.btn-teal:hover { - color:white !important; - background:darken($start-teal,11%) !important; - } - -a.btn-orange { - background: $start-orange; - background: -moz-linear-gradient(top, $start-orange 0%, $end-orange 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$start-orange), color-stop(100%,$end-orange)); - background: -webkit-linear-gradient(top, $start-orange 0%,$end-orange 100%); - background: -o-linear-gradient(top, $start-orange 0%,$end-orange 100%); - background: -ms-linear-gradient(top, $start-orange 0%,$end-orange 100%); - background: linear-gradient(to bottom, $start-orange 0%,$end-orange 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start-orange', endColorstr='$end-orange',GradientType=0 ); -} - a.btn-orange:hover { - color:white !important; - background:darken($start-orange,11%) !important; - } - -a.btn-red { - background: $start-red; - background: -moz-linear-gradient(top, $start-red 0%, $end-red 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$start-red), color-stop(100%,$end-red)); - background: -webkit-linear-gradient(top, $start-red 0%,$end-red 100%); - background: -o-linear-gradient(top, $start-red 0%,$end-red 100%); - background: -ms-linear-gradient(top, $start-red 0%,$end-red 100%); - background: linear-gradient(to bottom, $start-red 0%,$end-red 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start-red', endColorstr='$end-red',GradientType=0 ); -} - a.btn-red:hover { - color:white !important; - background:darken($start-red,11%) !important; - } - -a.btn-green { - background: $start-green; - background: -moz-linear-gradient(top, $start-green 0%, $end-green 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$start-green), color-stop(100%,$end-green)); - background: -webkit-linear-gradient(top, $start-green 0%,$end-green 100%); - background: -o-linear-gradient(top, $start-green 0%,$end-green 100%); - background: -ms-linear-gradient(top, $start-green 0%,$end-green 100%); - background: linear-gradient(to bottom, $start-green 0%,$end-green 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start-green', endColorstr='$end-green',GradientType=0 ); -} - a.btn-green:hover { - color:white !important; - background:darken($start-green,11%) !important; - } \ No newline at end of file diff --git a/sass/_variables.scss b/sass/_variables.scss index 3fadf85..6536991 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -7,4 +7,20 @@ $purple: #9944A9 !default; $teal: #00A8B1 !default; $orange: #F78A11 !default; $red: #C5112E !default; -$green: #41B23C !default; \ No newline at end of file +$green: #41B23C !default; + +/* ----------- _buttons.scss ----------- */ + +/* Gradient Start */ +$start-purple: $purple !default; +$start-teal: $teal !default; +$start-orange: $orange !default; +$start-red: $red !default; +$start-green: $green !default; + +/* Gradient End */ +$end-purple: darken($purple, 5%) !default; +$end-teal: darken($teal, 5%) !default; +$end-orange: darken($orange, 5%) !default; +$end-red: darken($red, 5%) !default; +$end-green: darken($green, 5%) !default; \ No newline at end of file diff --git a/sass/ece.scss b/sass/ece.scss index 0a8fac3..a028049 100644 --- a/sass/ece.scss +++ b/sass/ece.scss @@ -2,7 +2,7 @@ @import "_variables.scss"; @import "_fonts.scss"; -@import "_buttons.scss"; +@import "_buttons-min.scss"; @import "../../cornerstone/style.scss"; // Begin ECE code. @@ -189,6 +189,8 @@ h1, .h1, h2, .h2, h3, .h3 { } +/* ----------------------------- UC-Cal ----------------------------- */ + uc-cal { padding:0 !important; } @@ -254,7 +256,7 @@ ol.uc-cal-list { } - +/* ----------------------------- Content ----------------------------- */ #content { @@ -382,7 +384,7 @@ ol.uc-cal-list { .metaslider .caption-wrap { opacity:1 !important; - background-color:rgba(65, 178, 60,0.7) !important; + background-color:rgba(65, 178, 60,0.8) !important; .caption { padding:7px 12px; @@ -392,12 +394,16 @@ ol.uc-cal-list { } } +.ie8 .metaslider .caption-wrap { + background-color:$green; +} + /* ---------------------------- Home Page Specific Styles ------------------------------- */ body.home { .entry-content { - padding-right:10px !important; + padding-right:0px !important; } .panel-grid:nth-child(2) { .panel-grid-cell:nth-child(1) { @@ -445,6 +451,7 @@ body.home { p { line-height: 1.5em; + font-size:15px; } a.btn { @@ -461,7 +468,7 @@ body.home { } } - +/* ----------------------------- Default Page Styles ----------------------------- */ #page-page, #page-blank, #page-userlist, #page-user-profile .col-sm-9, #page-single, #page-archive { @@ -496,6 +503,8 @@ body.home { } } +/* ----------------------------- Page Blank ----------------------------- */ + #page-blank { background-color:#FAFAFA; @@ -557,6 +566,8 @@ body.home { } +/* ----------------------------- Page Page ----------------------------- */ + #page-page { .entry-content { padding-right:0; @@ -573,6 +584,8 @@ body.home { } } +/* ----------------------------- Archive/Blog ----------------------------- */ + #page-single, #page-archive { .widget { padding:0px !important; @@ -613,13 +626,46 @@ body.home { display: none; } #meta { - display: none; + display: none; } } } +/* ----------------------------- Metaslider Colors ----------------------------- */ + +.slider-red { + .caption-wrap { + background-color:rgba(197, 17, 46, 0.8) !important; + } +} + +.slider-purple { + .caption-wrap { + background-color:rgba(128, 0, 128, 0.8) !important; + } +} + +.slider-teal { + .caption-wrap { + background-color:rgba(0, 168, 177, 0.8) !important; + } +} + +.slider-orange { + .caption-wrap { + background-color:rgba(247, 138, 17, 0.8) !important; + } +} + +.slider-right { + .caption-wrap { + right:0; + left:auto !important; + } +} + /* ----------------------------- UUP ----------------------------- */ .uup-title { @@ -632,7 +678,7 @@ body.home { } -/* ----------------------------- FOOTER ----------------------------- */ +/* ----------------------------- Footer ----------------------------- */ .footer-img { margin-top:20px;