diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml
index 81739a3..f3f754e 100644
--- a/_notes/dwsync.xml
+++ b/_notes/dwsync.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/css/_notes/dwsync.xml b/css/_notes/dwsync.xml
index 9970658..6726c6b 100644
--- a/css/_notes/dwsync.xml
+++ b/css/_notes/dwsync.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/css/nav.css b/css/nav.css
index 45a7f8d..ff336a7 100644
--- a/css/nav.css
+++ b/css/nav.css
@@ -1,49 +1,5 @@
/* NAV
--------------------------------------------------------------*/
-#nav-secondary > ul {
- margin: 0;
- padding: 0;
- list-style-type: none;
-}
-#nav-secondary > ul > li > a {
- display: none;
-}
-#nav-secondary > ul > li > ul {
- margin: 0;
- padding: 0;
- list-style-type: none;
-}
-#nav-secondary > ul > li > ul > li > a {
- display: none;
-}
-#nav-secondary ul ul ul ul ul {
- display: none;
-}
-
-.navbar-collapse {
- max-height: none;
-}
-
-.menu-icon,
-.menu-label {
- display: inline-block;
-}
-
-.menu-label {
- position: relative;
- top: -.15em;
- margin-left: .2em;
-}
-
-.navbar-default .navbar-brand {
- height: auto;
- float: none;
- margin-right: 110px;
- font: 500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
- color: black;
-}
-
-/**/
#masthead {
z-index: 9999;
}
diff --git a/functions.php b/functions.php
index e7c22a0..2d5d936 100644
--- a/functions.php
+++ b/functions.php
@@ -80,11 +80,8 @@ function cs_widgets_init() {
* Enqueue scripts and styles.
*/
function cs_scripts() {
-
- wp_enqueue_style( 'cs-bootstrap-css',get_template_directory_uri() . '/css/bootstrap.css' );
- wp_enqueue_style( 'cs-style', get_stylesheet_uri(),array('cs-bootstrap-css') );
-
- //wp_enqueue_style( 'cs-style', get_stylesheet_uri() );
+
+ wp_enqueue_style( 'cs-style', get_stylesheet_uri());
wp_enqueue_script( 'cs-bootstrap-js', get_template_directory_uri() . '/js/bootstrap.min.js', array( 'jquery' ));
wp_enqueue_script( 'cs-modernizr', get_template_directory_uri() . '/js/cs-modernizr.js', array( 'jquery' ));
@@ -105,6 +102,11 @@ function htmlShiv(){
';
+
+ //needed for IE7 grid hack
+ echo '';
}
add_action( 'wp_head', htmlShiv, 1 );
diff --git a/js/_notes/dwsync.xml b/js/_notes/dwsync.xml
index 27d537c..3ffdd00 100644
--- a/js/_notes/dwsync.xml
+++ b/js/_notes/dwsync.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/js/min/_notes/dwsync.xml b/js/min/_notes/dwsync.xml
index 5e51288..8a90953 100644
--- a/js/min/_notes/dwsync.xml
+++ b/js/min/_notes/dwsync.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/page.php b/page.php
old mode 100755
new mode 100644
index 3707821..6ae0064
--- a/page.php
+++ b/page.php
@@ -16,84 +16,75 @@
checkMenu()
- If the current page is level 3 or 4 within the primary menu...
+ If the current page is level 2 or more and has menu children within the primary menu...
True/False
-->
+
+term_id);
+ $level = 0;
+ $stack = array('0');
+ foreach($menu_items as $key => $menu_item) {
+ if($menu_item->object_id == get_the_ID()) $current_id = $menu_item->ID;
+ }
+ foreach($menu_items as $key => $menu_item) {
+ while($menu_item->menu_item_parent != array_pop($stack)) {
+ $level--;
+ }
+ $level++;
+ $stack[] = $menu_item->menu_item_parent;
+ $stack[] = $menu_item->ID;
+ $menu_items[$key]->level = $level;
+ if($menu_item->menu_item_parent == $current_id && $level > 2 || $menu_item->ID == $current_id && $level > 2){
+ $has_sub_menu = true;
+ }
+ }
+ //print_r($menu_items);
+}
+if($has_sub_menu){
+?>
+
-
+ 'aside',
- 'menu_class' => '',
+ 'menu_class' => 'nav nav-pills nav-stacked',
'theme_location' => 'primary',
'container' => false,
- 'fallback_cb' => 'hale_main_nav_fallback',
- 'items_wrap' => '
'
+ 'fallback_cb' => false,
+ 'items_wrap' => '
',
+ 'walker' => new Secondary_Bootstrap_Nav_Walker(),
+ 'depth' => 2,
+ 'sub_menu' => true,
+ 'start_depth' => 2
)
);
- */
+
+
?>
-
-
+
+
diff --git a/sass/_notes/dwsync.xml b/sass/_notes/dwsync.xml
index 7d9ddec..ea9687b 100644
--- a/sass/_notes/dwsync.xml
+++ b/sass/_notes/dwsync.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/sass/cal.scss b/sass/cal.scss
index a21d7cb..350dd36 100644
--- a/sass/cal.scss
+++ b/sass/cal.scss
@@ -50,4 +50,6 @@
}
}
-}
\ No newline at end of file
+}
+
+
diff --git a/sass/nav.scss b/sass/nav.scss
index eaa24e7..ad17cb5 100644
--- a/sass/nav.scss
+++ b/sass/nav.scss
@@ -1,7 +1,22 @@
-/* - - - - - - - - - - - - - - - - - - -
- == NAV
-- - - - - - - - - - - - - - - - - - - */
+/* NAV
+--------------------------------------------------------------*/
+// Move these to cs-variables.scss
+
+$nav-secondary-border-color: #ccc !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-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;
#nav-secondary {
@@ -18,19 +33,26 @@
a {
@include cs-word-break;
- padding: $nav-secondary-link-padding;
- border-radius: $nav-secondary-link-border-radius;
- background-color: $nav-secondary-link-bg;
- color: $nav-secondary-link-color;
+ //padding: $nav-secondary-pills-padding;
+ border-radius: $nav-secondary-pills-border-radius;
+ background-color: $nav-secondary-pills-link-bg;
+ color: $nav-secondary-pills-link-color;
&:hover {
- background-color: $nav-secondary-active-link-hover-bg;
- color: $nav-secondary-active-link-hover-color;
+ background-color: $nav-secondary-pills-link-hover;
}
}
+ .active a {
+ background-color: $nav-secondary-pills-active-link-hover-bg;
+ color: $nav-secondary-pills-active-link-hover-color;
+ &:hover {
+
+ }
+ }
+
}
@@ -46,25 +68,22 @@
& > li {
& > a {
- display:none;
}
& > ul {
margin:0;
padding:0;
- list-style-type:none;
& > li {
& > a {
- display:none;
}
}
}
}
}
- ul ul ul ul ul {
+ ul ul ul {
display:none;
}
diff --git a/sass/variables.scss b/sass/variables.scss
index 6a496ce..e6373af 100644
--- a/sass/variables.scss
+++ b/sass/variables.scss
@@ -8,6 +8,7 @@ $contentPadding: 1em;
+
/* == Nav */
$nav-secondary-border-color: #ccc !default;
@@ -41,8 +42,8 @@ $widget-padding: none !default;
$widget-bg: #fff !default;
$widget-color: #000 !default;
$widget-size: 1em !default;
-$widget-link-color: blue !default;
-$widget-link-hover: red !default;
+$widget-link-color: $link-color !default;
+$widget-link-hover: $link-hover-color !default;
$widget-head-bg: $widget-bg !default;
$widget-head-color: $widget-color !default;
@@ -51,6 +52,14 @@ $widget-head-border-color: $widget-border-color !default;
$widget-head-padding: .5em .5em .5em 1em !default;
$widget-head-size: $widget-size !default;
+/* Sepcific Widgets */
+// Events Calendar (icons)
+$uc-ecw-month-bg: #7c7c7c !default;
+$uc-ecw-month-color: #fff !default;
+$uc-ecw-day-bg: #fff !default;
+$uc-ecw-day-color: #333 !default;
+
+
/* == Footers */
diff --git a/sass/widgets.scss b/sass/widgets.scss
new file mode 100644
index 0000000..f1d747f
--- /dev/null
+++ b/sass/widgets.scss
@@ -0,0 +1,213 @@
+/* - - - - - - - - - - - - - - - - - - -
+ == Widgets
+- - - - - - - - - - - - - - - - - - - */
+
+.widget {
+ @include cs-word-break;
+ overflow:hidden;
+
+ border:1px solid transparent;
+ border-width:$widget-border-width;
+ border-color: $widget-border-color;
+ border-radius: $widget-border-radius;
+
+ margin: $widget-margin;
+ padding: $widget-padding;
+ background-color: $widget-bg;
+
+ color:$widget-color;
+
+ a {
+ color: $widget-link-color;
+
+ &:hover {
+ color:$widget-link-hover;
+ }
+
+ }
+
+ .widget-head {
+ padding: $widget-head-padding;
+
+ border:1px solid transparent;
+ border-width: $widget-head-border-width;
+ border-color: $widget-head-border-color;
+
+ h2 {
+ font-size: $widget-head-size;
+ margin: 0;
+ color: $widget-head-color;
+ }
+
+ }
+
+ p, form {
+ margin:1em;
+ }
+
+ ul {
+ list-style-type:none;
+ padding:0;
+ margin:1em;
+
+ li {
+ margin-bottom:.75em;
+
+ ul {
+ padding:0;
+ margin:.5em 0 .5em 2em;
+ list-style-type:disc;
+
+ li {
+ margin-bottom:.5em;
+ ul {
+ list-style-type:circle;
+ }
+ }
+ }
+ }
+
+ }
+
+
+}
+
+/* Make sure select elements fit in widgets */
+.widget select {
+ max-width: 100%;
+}
+
+.widget {
+ /* === CORE WP Widgets
+ */
+ &.widget_archive {}
+ &.widget_nav_menu{}
+ &.widget_meta {}
+ &.widget_recent_comments {}
+ &.widget_recent_entries {}
+ &.widget_rss {}
+ &.widget_search {}
+ &.widget_text {}
+ &.widget_tag_cloud {
+ .tagcloud {
+ margin:1em;
+ }
+
+ }
+
+ /* === 3rd Party Widgets
+ */
+
+ &.simple-social-icons {
+ ul {
+ margin:.5em!important;
+ li {
+ margin:.5em!important;
+ }
+ }
+ }
+ &.widget_rcpt {
+ ul {
+ margin:0;
+
+ .rcpt_item_title {
+ padding:.5em 5% 0;
+ font-weight:bold;
+ .rcpt_item_image{
+ margin-left:-9%;
+ margin-bottom:1em;
+ width:117%;
+ img {
+ width:100%;
+ }
+ }
+ }
+ .rcpt_item_excerpt {
+ margin:.5em 5% 1em;
+ }
+ .rcpt_item_date {
+ margin:.5em 5% 1em;
+ }
+ }
+ }
+ &.widget_sp_image {
+ img {
+ max-height:200px;
+ }
+ }
+
+
+ /* === UCONN Widgets
+ */
+ &.uc-contact-widget {
+ th {
+ white-space:nowrap;
+ }
+ }
+ &.uc-ecw {
+ padding-bottom:1em;
+ .uc-cal {
+ padding:0;
+
+ &.uc-iconcal {
+
+ .uc-cal-list {
+ a.uc-cal-event {
+ font-family:$font-family-base;
+
+ .uc-cal-event-date {
+ border:none;
+ width:33px;
+
+ .uc-cal-event-month {
+ height:auto;
+ padding:.4em;
+ font-size:.7em;
+ background-color:$uc-ecw-month-bg;
+ color:$uc-ecw-month-color;
+ }
+
+ .uc-cal-event-day {
+ padding:.4em;
+ height:auto;
+ background-color:$uc-ecw-day-bg;
+ color:$uc-ecw-day-color;
+ }
+ }
+ .uc-cal-event-title {
+ color: $widget-link-color;
+ }
+ .uc-cal-event-time {
+ color: $widget-link-color;
+ opacity:.6;
+ }
+ &:hover {
+ .uc-cal-event-title {
+ color: $widget-link-hover;
+ }
+ .uc-cal-event-time {
+ color: $widget-link-hover;
+ }
+
+
+ }
+ }
+ }
+ }
+ }
+ .uc-cal-link {
+ margin:1em;
+ }
+
+ }
+ &.uc-hours-widget {
+ caption {
+ padding:.5em;
+ }
+ }
+ &.uc-ssw {}
+
+
+
+}
+
diff --git a/style.css b/style.css
index a3330a3..f50f2ac 100644
--- a/style.css
+++ b/style.css
@@ -6709,6 +6709,7 @@ button.close {
- - - - - - - - - - - - - - - - - - - */
/* == Nav */
/* == Widgets */
+/* Sepcific Widgets */
/* == Footers */
/* - - - - - - - - - - - - - - - - - - -
== Utilities
@@ -6812,9 +6813,8 @@ button.close {
transition: all 2s ease;
}
-/* - - - - - - - - - - - - - - - - - - -
- == NAV
-- - - - - - - - - - - - - - - - - - - */
+/* NAV
+--------------------------------------------------------------*/
#nav-secondary {
padding: 5px;
border: 1px solid transparent;
@@ -6830,12 +6830,14 @@ button.close {
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
- padding: 10px 15px;
border-radius: 4px;
background-color: transparent;
- color: #428bca;
+ color: inherit;
}
#nav-secondary .nav.nav-pills.nav-stacked a:hover {
+ background-color: #eeeeee;
+}
+#nav-secondary .nav.nav-pills.nav-stacked .active a {
background-color: #428bca;
color: white;
}
@@ -6844,18 +6846,11 @@ button.close {
padding: 0;
list-style-type: none;
}
-#nav-secondary > ul > li > a {
- display: none;
-}
#nav-secondary > ul > li > ul {
margin: 0;
padding: 0;
- list-style-type: none;
}
-#nav-secondary > ul > li > ul > li > a {
- display: none;
-}
-#nav-secondary ul ul ul ul ul {
+#nav-secondary ul ul ul {
display: none;
}
@@ -7210,10 +7205,10 @@ object {
color: black;
}
.widget a {
- color: blue;
+ color: #428bca;
}
.widget a:hover {
- color: red;
+ color: #2a6496;
}
.widget .widget-head {
padding: 0.5em 0.5em 0.5em 1em;
@@ -7224,6 +7219,7 @@ object {
.widget .widget-head h2 {
font-size: 1em;
margin: 0;
+ color: black;
}
.widget p, .widget form {
margin: 1em;
@@ -7261,6 +7257,9 @@ object {
/* === UCONN Widgets
*/
}
+.widget.widget_tag_cloud .tagcloud {
+ margin: 1em;
+}
.widget.simple-social-icons ul {
margin: 0.5em !important;
}
@@ -7294,6 +7293,48 @@ object {
.widget.uc-contact-widget th {
white-space: nowrap;
}
+.widget.uc-ecw {
+ padding-bottom: 1em;
+}
+.widget.uc-ecw .uc-cal {
+ padding: 0;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
+ border: none;
+ width: 33px;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-month {
+ height: auto;
+ padding: .4em;
+ font-size: .7em;
+ background-color: #7c7c7c;
+ color: white;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-date .uc-cal-event-day {
+ padding: .4em;
+ height: auto;
+ background-color: white;
+ color: #333333;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-title {
+ color: #428bca;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event .uc-cal-event-time {
+ color: #428bca;
+ opacity: .6;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event:hover .uc-cal-event-title {
+ color: #2a6496;
+}
+.widget.uc-ecw .uc-cal.uc-iconcal .uc-cal-list a.uc-cal-event:hover .uc-cal-event-time {
+ color: #2a6496;
+}
+.widget.uc-ecw .uc-cal-link {
+ margin: 1em;
+}
.widget.uc-hours-widget caption {
padding: .5em;
}