From 89d490cad7d7e03d8e0104defecf896e2cd49539 Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Mon, 29 Dec 2014 19:07:01 -0500 Subject: [PATCH] Winter SASS Cleaning Cleaning up all SASS files. Moving all color info into variables. New styles for calendar shortcodes. --- css/cal.css | 184 +++++++++++++++++++--------- css/table-stripper.css | 3 + sass/cal.scss | 106 ++++++++++++---- sass/content.scss | 5 +- sass/footer.scss | 60 +++++---- sass/in-page-menus.scss | 5 +- sass/nav.scss | 66 +--------- sass/table-stripper.scss | 3 + sass/titlebar.scss | 19 +-- sass/uup.scss | 3 +- sass/variables.scss | 62 ++++++---- style.css | 255 ++++++++++++++++++++++++--------------- style.scss | 43 +++---- 13 files changed, 481 insertions(+), 333 deletions(-) diff --git a/css/cal.css b/css/cal.css index e1a8b3b..ca38dd1 100644 --- a/css/cal.css +++ b/css/cal.css @@ -37,71 +37,139 @@ display: none; } -#events-table #vb.toolbar ul.btn-multi { - margin-bottom: .5em; -} -#events-table #vb.toolbar ul.btn-multi li ul { - padding: 0px 0px 0px 12px; +#events-table { + /* + ul.btn-multi{ + margin-bottom:.5em; + + li{ + + ul{ + + padding: 0px 0px 0px 12px; + + li{ + + &.month-arrow{ + + a.icon{ + + span.glyphicons{ + padding: 0px 0px 0px 5px; + + &:before{ + color:#fff; + font-size: 14px; + display:block; + position: relative; + } + } + } + } + } + } + a.btn-toggle{ + margin-left:10px; + font-size:14px; + color:#777; + text-align: center; + } + } + } + } + */ + /* + #events-grid.table { + tbody{ + tr{ + + th{ + width:14%; + text-align:right; + + span{ + font-weight:normal; + color:#777; + font-size:12px !important; + } + } + td{ + border-left: 1px solid #eee; + border-right: 1px solid #eee; + border-bottom: 1px solid #eee; + background: #fff; + text-align:left; + height: 90px; + padding:1px; + ol.event-list{ + li{ + span.event-time{ + font-size:11px !important; + padding: 0px 0px 0px 2px !important; + } + ol{ + padding: 0px 2px 0px 2px !important; + li{ + background: rgba(15,25,56, 0.1); + border:1px solid rgba(15,25,56, 0.2) !important; + padding: 0px 3px 0px 3px !important; + margin-bottom: 2px !important; + a.event-link{ + strong{ + font-weight:normal; + font-size:12px !important; + } + } + } + } + } + } + } + } + } + } + */ +} +#events-table #events-toolbar { + margin-bottom: 1em; } -#events-table #vb.toolbar ul.btn-multi li ul li.month-arrow a.icon span.glyphicons { - padding: 0px 0px 0px 5px; +#events-table #events-toolbar #events-month { + width: 10em; } -#events-table #vb.toolbar ul.btn-multi li ul li.month-arrow a.icon span.glyphicons:before { - color: #fff; - font-size: 14px; - display: block; - position: relative; +#events-table table { + font-size: 85%; } -#events-table #vb.toolbar ul.btn-multi li a.btn-toggle { - margin-left: 10px; - font-size: 14px; - color: #777; +#events-table table thead th { + width: 14%; text-align: center; } -#events-table #events-grid.table > tbody > tr > th { - border: 1px solid #fff !important; +#events-table table tbody th { + border-bottom-width: 0; + padding-bottom: 0; + padding-left: 0; + text-align: right; + font-weight: normal; + opacity: .7; } -#events-table #events-grid.table tbody tr.list-days th { - text-align: center; - border: 1px solid #eee !important; - background: #fff; +#events-table table tbody td { + border-top-width: 0; + padding-top: 0; } -#events-table #events-grid.table tbody tr th { - width: 14%; - border-top: 1px solid #eee !important; - border-left: 1px solid #eee; - border-right: 1px solid #eee; - background: #fff; - text-align: right; +#events-table table tbody td a { + text-decoration: none; } -#events-table #events-grid.table tbody tr th span { - font-weight: normal; - color: #777; - font-size: 12px !important; -} -#events-table #events-grid.table tbody tr td { - border-left: 1px solid #eee; - border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #fff; - text-align: left; - height: 90px; - padding: 1px; -} -#events-table #events-grid.table tbody tr td ol.event-list li span.event-time { - font-size: 11px !important; - padding: 0px 0px 0px 2px !important; -} -#events-table #events-grid.table tbody tr td ol.event-list li ol { - padding: 0px 2px 0px 2px !important; -} -#events-table #events-grid.table tbody tr td ol.event-list li ol li { - background: rgba(15, 25, 56, 0.1); - border: 1px solid rgba(15, 25, 56, 0.2) !important; - padding: 0px 3px 0px 3px !important; - margin-bottom: 2px !important; -} -#events-table #events-grid.table tbody tr td ol.event-list li ol li a.event-link strong { +#events-table table tbody td a:hover { + text-decoration: underline; +} +#events-table table tbody td a strong { font-weight: normal; - font-size: 12px !important; +} +#events-table table tbody td a .glyphicon { + display: none; +} +#events-table table tbody td .event-list + .event-list { + margin-top: 1em !important; +} +#events-table table tbody td .event-list li + li { + margin-top: .5em !important; } diff --git a/css/table-stripper.css b/css/table-stripper.css index 180e39d..d5e03f9 100644 --- a/css/table-stripper.css +++ b/css/table-stripper.css @@ -1,5 +1,8 @@ /* - - - - - - - - - - - - - - - - - - - == Table Stripper + + Our effort to combat the use of table-based layouts by site authors. + - - - - - - - - - - - - - - - - - - - */ table div, table span, table applet, table object, table iframe, table h1, table h2, table h3, table h4, table h5, table h6, table p, table blockquote, table pre, table diff --git a/sass/cal.scss b/sass/cal.scss index c184d92..b00fa89 100644 --- a/sass/cal.scss +++ b/sass/cal.scss @@ -54,20 +54,94 @@ // Style for Shortcode Calendar -#events-table{ - // Toolbar - #vb.toolbar{ - a{ - +#events-table { + + #events-toolbar { + margin-bottom:1em; + + // set a width so that the buttons don't shift between long-named months and short-named months. + #events-month { + width:10em; } + } + + table { + font-size:85%; + + thead { + th { + width:14%; + text-align:center; + } + } + tbody { + th { + border-bottom-width:0; + padding-bottom:0; + padding-left:0; + text-align:right; + font-weight:normal; + // opacity so it'll "grey" out whatever the main text color is set to in future themes. + opacity:.7; + } + td { + border-top-width:0; + padding-top:0; + + a { + text-decoration:none; + + &:hover { + text-decoration:underline; + } + + strong { + font-weight:normal; + } + + //every link is external, no need to fly lnk flags here. + .glyphicon { + display:none; + } + } + + .event-list { + &+.event-list { + margin-top:1em !important; + } + + li+li { + margin-top:.5em !important; + } + + } + } + } + } + + + + + + + + +/* ul.btn-multi{ margin-bottom:.5em; + li{ + ul{ + padding: 0px 0px 0px 12px; + li{ + &.month-arrow{ + a.icon{ + span.glyphicons{ padding: 0px 0px 0px 5px; @@ -91,31 +165,20 @@ } } } - // Calendar - #events-grid.table>tbody>tr>th{border: 1px solid #fff !important;} - #events-grid.table{ + */ + /* + #events-grid.table { tbody{ tr{ - &.list-days{ - th{ - text-align:center; - border:1px solid #eee !important; - background: #fff; - } - } + th{ width:14%; - border-top: 1px solid #eee !important; - border-left: 1px solid #eee; - border-right: 1px solid #eee; - background: #fff; text-align:right; + span{ font-weight:normal; color:#777; font-size:12px !important; - abbr{ - } } } td{ @@ -153,4 +216,5 @@ } } } + */ } \ No newline at end of file diff --git a/sass/content.scss b/sass/content.scss index 7a997e9..47987da 100644 --- a/sass/content.scss +++ b/sass/content.scss @@ -117,10 +117,11 @@ code { .comment { padding:$contentPadding; - border-top:1px solid #ccc; + border-top:1px solid transparent; + border-top-color:$comment-top-border; } .comment.thread-odd { - background-color:#f5f5f5; + background-color:$comment-thread-odd; } .comment-content a { diff --git a/sass/footer.scss b/sass/footer.scss index ff5b6de..ff39394 100644 --- a/sass/footer.scss +++ b/sass/footer.scss @@ -39,27 +39,43 @@ } } } + + + + + + + - #footer { - padding:1.5em 0; - color:$uc-footer-link-color; - a { - color: $uc-footer-link-color; - &:hover { - color:$uc-footer-link-hover; - } - } +#footer { + padding:1.5em 0; + color:$uc-footer-link-color; + + ul { + padding:0; } - #footer ul { - padding:0; - } - #footer li { - display:inline; - margin-right:$uc-footer-link-spacing; - } - #footer li:last-child { - margin-right:0; - } - #footer .glyphicon { - display:none; - } \ No newline at end of file + + a { + color: $uc-footer-link-color; + &:hover { + color:$uc-footer-link-hover; + } + } + + li { + display:inline; + margin-right:$uc-footer-link-spacing; + + &:last-child { + margin-right:0; + } + + a { + padding:15px 0px; + } + } + + glyphicon { + . display:none; + } +} \ No newline at end of file diff --git a/sass/in-page-menus.scss b/sass/in-page-menus.scss index ec7b667..a6988d6 100644 --- a/sass/in-page-menus.scss +++ b/sass/in-page-menus.scss @@ -4,8 +4,9 @@ .in-page-list { float:right; padding:.5em; - border:1px solid #e7e7e7; - background-color:#f8f8f8; + border:1px solid transparent; + border-color: $in-page-menu-border; + background-color:$in-page-menu-background; margin:0 0 1.5em 2em; width:20%; min-width:200px; diff --git a/sass/nav.scss b/sass/nav.scss index 45e95e5..854a558 100644 --- a/sass/nav.scss +++ b/sass/nav.scss @@ -1,6 +1,12 @@ /* NAV --------------------------------------------------------------*/ +#primary-nav { + a.external { + max-height:50px; + } +} + #nav-secondary { padding: $nav-secondary-padding; @@ -73,66 +79,6 @@ } - -/* -// Support for mulitple-level dropdown menus. -.dropdown-submenu{ - position:relative; - } - - .dropdown-submenu > .dropdown-menu { - top:0; - left:100%; - padding:0; - } - - .dropdown-submenu:hover > .dropdown-menu{ - display:block; - } - - .dropdown-submenu:hover > a { - color: $navbar-default-link-hover-color; - background-color: $navbar-default-link-hover-bg; - } - - .dropdown-submenu > a:after{ - display:block; - content:" "; - float:right; - width:0; - height:0; - border-color:transparent; - border-style:solid; - border-width:5px 0 5px 5px; - border-left-color:$navbar-default-link-color; - margin-top:5px; - margin-right:-10px; - } - - .dropdown-submenu:hover > a:after{ - border-left-color:$navbar-default-link-hover-color; - } - - .dropdown-submenu .pull-left{ - float:none; - } - - .dropdown-submenu.pull-left > .dropdown-menu{ - left:-100%; - margin-left:10px; - } - - -.dropdown-menu { - .dropdown-menu { - margin:0; - top:-1px; - } -} - -/**/ - - // Mobile Nav Changes .navbar-collapse { max-height:none; diff --git a/sass/table-stripper.scss b/sass/table-stripper.scss index 6634207..a46f622 100644 --- a/sass/table-stripper.scss +++ b/sass/table-stripper.scss @@ -1,5 +1,8 @@ /* - - - - - - - - - - - - - - - - - - - == Table Stripper + + Our effort to combat the use of table-based layouts by site authors. + - - - - - - - - - - - - - - - - - - - */ table div, table span, table applet, table object, table iframe, table diff --git a/sass/titlebar.scss b/sass/titlebar.scss index 886d6ae..9a1147c 100644 --- a/sass/titlebar.scss +++ b/sass/titlebar.scss @@ -2,8 +2,8 @@ == Titlebar - - - - - - - - - - - - - - - - - - - */ #uc-header{ - border-bottom:1px solid #fff; - + border-bottom:1px solid transparent; + border-bottom-color:$uc-header-bottom-border-color; } #uc-site-header { @@ -19,25 +19,12 @@ margin:0; font-size:1em; line-height:1em; - color:black; + color:$site-title-color; font-style:normal; font-weight:normal; border:0; font-family:"Proxima Nova", Helvetica, Arial, sans-serif; } - #uc-site-header .blue a { - color:#0b1860; - } - #uc-site-header .grey a { - color:#7C878E; - } - #uc-site-header .white a { - color:#FFF; - } - #uc-site-header .black a { - color:#000; - } - #uc-site-header .glyphicon { display:none; } diff --git a/sass/uup.scss b/sass/uup.scss index 4d2658e..cbf7ad4 100644 --- a/sass/uup.scss +++ b/sass/uup.scss @@ -139,4 +139,5 @@ .uup-mailing-address { } } -} \ No newline at end of file +} + diff --git a/sass/variables.scss b/sass/variables.scss index e023bd6..8adc9e9 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -2,40 +2,39 @@ == Variables - - - - - - - - - - - - - - - - - - - */ +$uc-header-bottom-border-color: #fff !default; +$site-title-color: black !default; + $contentBg: #fff; $contentPadding: 1em; - - - - /* == Nav */ $nav-secondary-border-color: #ccc !default; -$nav-secondary-border-radius: $border-radius-base !default; -$nav-secondary-padding: 5px !default; +$nav-secondary-border-radius: $border-radius-base !default; +$nav-secondary-padding: 5px !default; $nav-secondary-bg-color: #fff !default; $nav-secondary-font-size: .9em !default; $nav-secondary-link-padding: $nav-link-padding !default; -$nav-secondary-link-border-radius: $border-radius-base !default; -$nav-secondary-link-bg: transparent !default; -$nav-secondary-link-hover-bg: $nav-link-hover-bg !default; -$nav-secondary-link-color: #428bca !default; +$nav-secondary-link-border-radius: $border-radius-base !default; +$nav-secondary-link-bg: transparent !default; +$nav-secondary-link-hover-bg: $nav-link-hover-bg !default; +$nav-secondary-link-color: #428bca !default; -$nav-secondary-open-link-hover-color: $nav-open-link-hover-color !default; +$nav-secondary-open-link-hover-color: $nav-open-link-hover-color !default; -$nav-secondary-active-link-hover-bg: $component-active-bg !default; -$nav-secondary-active-link-hover-color: $component-active-color !default; +$nav-secondary-active-link-hover-bg: $component-active-bg !default; +$nav-secondary-active-link-hover-color: $component-active-color !default; -$nav-secondary-pills-padding: 5px !default; -$nav-secondary-pills-border-radius: $border-radius-base !default; -$nav-secondary-pills-link-bg: transparent !default; -$nav-secondary-pills-link-color: inherit !default; -$nav-secondary-pills-link-hover: #eee !default; +$nav-secondary-pills-padding: 5px !default; +$nav-secondary-pills-border-radius: $border-radius-base !default; +$nav-secondary-pills-link-bg: transparent !default; +$nav-secondary-pills-link-color: inherit !default; +$nav-secondary-pills-link-hover: #eee !default; $nav-secondary-pills-active-link-hover-bg: $component-active-bg !default; $nav-secondary-pills-active-link-hover-color: $component-active-color !default; @@ -44,25 +43,25 @@ $nav-secondary-pills-active-link-hover-color: $component-active-color ! /* == Widgets */ $widget-border-color: #ccc !default; -$widget-border-radius: $border-radius-base !default; +$widget-border-radius: $border-radius-base !default; $widget-border-width: 1px !default; -$widget-margin: 0 0 1.5em 0 !default; +$widget-margin: 0 0 1.5em 0 !default; $widget-padding: 0 !default; -$widget-bg: #fff !default; -$widget-content-margin: 1em; +$widget-bg: #fff !default; +$widget-content-margin: 1em !default; $widget-color: #000 !default; $widget-size: 1em !default; $widget-link-color: $link-color !default; $widget-link-hover: $link-hover-color !default; -$widget-head-bg: $widget-bg !default; +$widget-head-bg: $widget-bg !default; $widget-head-color: $widget-color !default; $widget-head-border-width: 0 0 1px 0 !default; $widget-head-border-color: $widget-border-color !default; -$widget-head-padding: .5em .5em .5em 1em !default; +$widget-head-padding: .5em .5em .5em 1em !default; $widget-head-size: $widget-size !default; -/* Sepcific Widgets */ +/* Specific Widgets */ // Events Calendar (icons) $uc-ecw-month-bg: #ccc !default; $uc-ecw-month-color: #333 !default; @@ -75,6 +74,19 @@ $uc-ecw-time-hover: lighten($widget-link-hover, 20%) !default; +/* == Main Content Area */ + +$in-page-menu-border: #e7e7e7 !default; +$in-page-menu-background: #f8f8f8 !default; + +$comment-top-border: #ccc !default; +$comment-thread-odd: #f5f5f5 !default; + + + + + + /* == Footers */ $footers-margin: 1.5em 0 0 0 !default; diff --git a/style.css b/style.css index ce7b2ce..78b3f27 100644 --- a/style.css +++ b/style.css @@ -6709,7 +6709,8 @@ button.close { - - - - - - - - - - - - - - - - - - - */ /* == Nav */ /* == Widgets */ -/* Sepcific Widgets */ +/* Specific Widgets */ +/* == Main Content Area */ /* == Footers */ /* - - - - - - - - - - - - - - - - - - - == Utilities @@ -6737,7 +6738,8 @@ button.close { == Titlebar - - - - - - - - - - - - - - - - - - - */ #uc-header { - border-bottom: 1px solid #fff; + border-bottom: 1px solid transparent; + border-bottom-color: white; } #uc-site-header { @@ -6762,22 +6764,6 @@ button.close { font-family: "Proxima Nova", Helvetica, Arial, sans-serif; } -#uc-site-header .blue a { - color: #0b1860; -} - -#uc-site-header .grey a { - color: #7C878E; -} - -#uc-site-header .white a { - color: #FFF; -} - -#uc-site-header .black a { - color: #000; -} - #uc-site-header .glyphicon { display: none; } @@ -6815,6 +6801,10 @@ button.close { /* NAV --------------------------------------------------------------*/ +#primary-nav a.external { + max-height: 50px; +} + #nav-secondary { padding: 5px; border: 1px solid transparent; @@ -7156,11 +7146,12 @@ code { .comment { padding: 1em; - border-top: 1px solid #ccc; + border-top: 1px solid transparent; + border-top-color: #cccccc; } .comment.thread-odd { - background-color: #f5f5f5; + background-color: whitesmoke; } .comment-content a { @@ -7595,6 +7586,9 @@ object { /* - - - - - - - - - - - - - - - - - - - == Table Stripper + + Our effort to combat the use of table-based layouts by site authors. + - - - - - - - - - - - - - - - - - - - */ table div, table span, table applet, table object, table iframe, table h1, table h2, table h3, table h4, table h5, table h6, table p, table blockquote, table pre, table @@ -7760,73 +7754,141 @@ q:before, table q:after { display: none; } -#events-table #vb.toolbar ul.btn-multi { - margin-bottom: .5em; -} -#events-table #vb.toolbar ul.btn-multi li ul { - padding: 0px 0px 0px 12px; -} -#events-table #vb.toolbar ul.btn-multi li ul li.month-arrow a.icon span.glyphicons { - padding: 0px 0px 0px 5px; +#events-table { + /* + ul.btn-multi{ + margin-bottom:.5em; + + li{ + + ul{ + + padding: 0px 0px 0px 12px; + + li{ + + &.month-arrow{ + + a.icon{ + + span.glyphicons{ + padding: 0px 0px 0px 5px; + + &:before{ + color:#fff; + font-size: 14px; + display:block; + position: relative; + } + } + } + } + } + } + a.btn-toggle{ + margin-left:10px; + font-size:14px; + color:#777; + text-align: center; + } + } + } + } + */ + /* + #events-grid.table { + tbody{ + tr{ + + th{ + width:14%; + text-align:right; + + span{ + font-weight:normal; + color:#777; + font-size:12px !important; + } + } + td{ + border-left: 1px solid #eee; + border-right: 1px solid #eee; + border-bottom: 1px solid #eee; + background: #fff; + text-align:left; + height: 90px; + padding:1px; + ol.event-list{ + li{ + span.event-time{ + font-size:11px !important; + padding: 0px 0px 0px 2px !important; + } + ol{ + padding: 0px 2px 0px 2px !important; + li{ + background: rgba(15,25,56, 0.1); + border:1px solid rgba(15,25,56, 0.2) !important; + padding: 0px 3px 0px 3px !important; + margin-bottom: 2px !important; + a.event-link{ + strong{ + font-weight:normal; + font-size:12px !important; + } + } + } + } + } + } + } + } + } + } + */ } -#events-table #vb.toolbar ul.btn-multi li ul li.month-arrow a.icon span.glyphicons:before { - color: #fff; - font-size: 14px; - display: block; - position: relative; +#events-table #events-toolbar { + margin-bottom: 1em; } -#events-table #vb.toolbar ul.btn-multi li a.btn-toggle { - margin-left: 10px; - font-size: 14px; - color: #777; - text-align: center; +#events-table #events-toolbar #events-month { + width: 10em; } -#events-table #events-grid.table > tbody > tr > th { - border: 1px solid #fff !important; +#events-table table { + font-size: 85%; } -#events-table #events-grid.table tbody tr.list-days th { +#events-table table thead th { + width: 14%; text-align: center; - border: 1px solid #eee !important; - background: #fff; } -#events-table #events-grid.table tbody tr th { - width: 14%; - border-top: 1px solid #eee !important; - border-left: 1px solid #eee; - border-right: 1px solid #eee; - background: #fff; +#events-table table tbody th { + border-bottom-width: 0; + padding-bottom: 0; + padding-left: 0; text-align: right; -} -#events-table #events-grid.table tbody tr th span { font-weight: normal; - color: #777; - font-size: 12px !important; -} -#events-table #events-grid.table tbody tr td { - border-left: 1px solid #eee; - border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #fff; - text-align: left; - height: 90px; - padding: 1px; + opacity: .7; } -#events-table #events-grid.table tbody tr td ol.event-list li span.event-time { - font-size: 11px !important; - padding: 0px 0px 0px 2px !important; +#events-table table tbody td { + border-top-width: 0; + padding-top: 0; } -#events-table #events-grid.table tbody tr td ol.event-list li ol { - padding: 0px 2px 0px 2px !important; +#events-table table tbody td a { + text-decoration: none; } -#events-table #events-grid.table tbody tr td ol.event-list li ol li { - background: rgba(15, 25, 56, 0.1); - border: 1px solid rgba(15, 25, 56, 0.2) !important; - padding: 0px 3px 0px 3px !important; - margin-bottom: 2px !important; +#events-table table tbody td a:hover { + text-decoration: underline; } -#events-table #events-grid.table tbody tr td ol.event-list li ol li a.event-link strong { +#events-table table tbody td a strong { font-weight: normal; - font-size: 12px !important; +} +#events-table table tbody td a .glyphicon { + display: none; +} +#events-table table tbody td .event-list + .event-list { + margin-top: 1em !important; +} +#events-table table tbody td .event-list li + li { + margin-top: .5em !important; } /* - - - - - - - - - - - - - - - - - - - @@ -7835,7 +7897,8 @@ q:before, table q:after { .in-page-list { float: right; padding: .5em; - border: 1px solid #e7e7e7; + border: 1px solid transparent; + border-color: #e7e7e7; background-color: #f8f8f8; margin: 0 0 1.5em 2em; width: 20%; @@ -7891,42 +7954,40 @@ body.sticky #footers { padding: 1.5em 0; color: #428bca; } +#footer ul { + padding: 0; +} #footer a { color: #428bca; } #footer a:hover { color: #2a6496; } - -#footer ul { - padding: 0; -} - #footer li { display: inline; margin-right: 1em; } - #footer li:last-child { margin-right: 0; } - -#footer .glyphicon { - display: none; -} - -/* Nav Changes */ -#primary-nav a.external { - max-height: 50px; -} - -/* Footer Changes */ #footer li a { padding: 15px 0px; } - -/* UUP */ -.uup-list .uup-name, .uup-list .uup-title, .uup-list .uup-phones, .uup-list .uup-email, .uup-list .uup-courses, .uup-list .uup-office-location, .uup-list .uup-office-hours, .uup-list .uup-courses, .uup-list .uup-fax { - display: block !important; - word-wrap: break-word; +#footer glyphicon { + . display: none; } + +/* + + ATTN: Devs + + Never place any SASS or CSS in this file. + Look for the appropriate .scss file that's being imported. Add it there. + If no file makes sense, for example, this is for a new feature... make a new .scss file, @import it, + and work there. + + Also! Any colors... register them as variables and use !default so we can override them later. + + - Andrew + +*/ diff --git a/style.scss b/style.scss index 31dc9d5..951977d 100644 --- a/style.scss +++ b/style.scss @@ -34,32 +34,17 @@ $icon-font-path: "../../global/bootstrap-sass-master/assets/fonts/bootstrap/" !d @import "sass/in-page-menus.scss"; @import "sass/footer.scss"; - - -/* Nav Changes */ -#primary-nav { - a.external { - max-height:50px; - } -} - -/* Footer Changes */ - -#footer { - li { - a { - padding:15px 0px; - } - } -} - -/* UUP */ - -.uup-list { - .uup-name, .uup-title, .uup-phones, .uup-email, .uup-courses, .uup-office-location, .uup-office-hours, .uup-courses, .uup-fax{ - display:block !important; - word-wrap: break-word; - } -} - - +/* + + ATTN: Devs + + Never place any SASS or CSS in this file. + Look for the appropriate .scss file that's being imported. Add it there. + If no file makes sense, for example, this is for a new feature... make a new .scss file, @import it, + and work there. + + Also! Any colors... register them as variables and use !default so we can override them later. + + - Andrew + +*/ \ No newline at end of file