Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Nav Touchups
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Jul 21, 2014
1 parent 1667f1e commit d6ac59e
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 118 deletions.
2 changes: 1 addition & 1 deletion _notes/dwsync.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3487060276" remote="-4611742485168929597" Dst="-1" /><file name="404.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929583" Dst="-1" /><file name="archive.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929583" Dst="-1" /><file name="comments.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="content-none.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484303703" remote="-4611742485168929582" Dst="-1" /><file name="content-page.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="content-single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484303652" remote="-4611742485168929582" Dst="-1" /><file name="content.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488537822" remote="997424038209838302" Dst="-1" /><file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488538264" remote="7783505565" Dst="-1" /><file name="index.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="mega-footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="page-home.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="page.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="997424038209766611" Dst="-1" /><file name="README.html" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484302198" remote="-4611742485168929581" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484302198" remote="-4611742485168929581" Dst="-1" /><file name="screenshot.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="search.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="searchform.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="sidebar.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488538867" remote="602446763926675704" Dst="-1" /><file name="search.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488466131" remote="997500248109466835" Dst="-1" /><file name="searchform.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488553209" remote="7783520508" Dst="-1" /><file name="page-home.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488555015" remote="7783522312" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488800337" remote="7783767634" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488809575" remote="602446763926946413" Dst="-1" /><file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488798549" remote="7783765845" Dst="-1" /><file name="404.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488801785" remote="7783769086" Dst="-1" /><file name="page-user-profile.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488472971" remote="602446763926938764" Dst="-1" /><file name="page-az.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488808166" remote="7783775463" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3487060276" remote="-4611742485168929597" Dst="-1" /><file name="404.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929583" Dst="-1" /><file name="archive.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929583" Dst="-1" /><file name="comments.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="content-none.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484303703" remote="-4611742485168929582" Dst="-1" /><file name="content-page.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="content-single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484303652" remote="-4611742485168929582" Dst="-1" /><file name="content.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488537822" remote="997424038209838302" Dst="-1" /><file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488538264" remote="7783505565" Dst="-1" /><file name="index.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929582" Dst="-1" /><file name="mega-footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="page-home.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="page.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="997424038209766611" Dst="-1" /><file name="README.html" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484302198" remote="-4611742485168929581" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484302198" remote="-4611742485168929581" Dst="-1" /><file name="screenshot.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="search.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="searchform.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="sidebar.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611742485168929581" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488538867" remote="602446763926675704" Dst="-1" /><file name="search.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488466131" remote="997500248109466835" Dst="-1" /><file name="searchform.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488553209" remote="7783520508" Dst="-1" /><file name="page-home.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488555015" remote="7783522312" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488800337" remote="7783767634" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488814180" remote="602446763926951015" Dst="-1" /><file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488813896" remote="7783781195" Dst="-1" /><file name="404.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488801785" remote="7783769086" Dst="-1" /><file name="page-user-profile.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488472971" remote="602446763926938764" Dst="-1" /><file name="page-az.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488808166" remote="7783775463" Dst="-1" /></dwsync>
Expand Down
71 changes: 0 additions & 71 deletions css/nav.css
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,5 @@
/* NAV
--------------------------------------------------------------*/
.navbar-default .navbar-brand {
height: auto;
float: none;
margin-right: 110px;
font: 500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
color: black;
}

/* overwriting bootstrap 3's philosophical opposition to drop down menus. */
.dropdown-submenu {
position: relative;
}

.dropdown-submenu > .dropdown-menu {
top: 0;
left: 100%;
padding: 0;
}

.dropdown-submenu:hover > .dropdown-menu {
display: block;
}

.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: #cccccc;
margin-top: 5px;
margin-right: -10px;
}

.dropdown-submenu:hover > a:after {
border-left-color: #ffffff;
}

.dropdown-submenu .pull-left {
float: none;
}

.dropdown-submenu.pull-left > .dropdown-menu {
left: -100%;
margin-left: 10px;
}

.navbar-collapse {
max-height: none;
}

/**/
.menu-icon,
.menu-label {
display: inline-block;
}

.menu-label {
position: relative;
top: -.15em;
margin-left: .2em;
}

.dropdown-menu .dropdown-menu {
margin: 0;
top: -1px;
}

#masthead {
z-index: 9999;
}
Expand Down
3 changes: 0 additions & 3 deletions header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
<!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<!--
<link rel='stylesheet' id='cs-bootstrap-css-css' href='http://development.wordpress.uconn.edu/webdev/wp-content/themes/cornerstone/bootstrap/css/bootstrap.css?ver=3.9.1' type='text/css' media='all' />
-->
<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
72 changes: 44 additions & 28 deletions sass/nav.scss
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
/* NAV
--------------------------------------------------------------*/
.navbar-default .navbar-brand {
height:auto;
float:none;
margin-right:110px;
font:500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
color:black;
}

/* overwriting bootstrap 3's philosophical opposition to drop down menus. */

// Support for mulitple-level dropdown menus.
.dropdown-submenu{
position:relative;
}
Expand All @@ -22,6 +16,11 @@
.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;
Expand All @@ -32,13 +31,13 @@
border-color:transparent;
border-style:solid;
border-width:5px 0 5px 5px;
border-left-color:#cccccc;
border-left-color:$navbar-default-link-color;
margin-top:5px;
margin-right:-10px;
}

.dropdown-submenu:hover > a:after{
border-left-color:#ffffff;
border-left-color:$navbar-default-link-hover-color;
}

.dropdown-submenu .pull-left{
Expand All @@ -50,22 +49,6 @@
margin-left:10px;
}

.navbar-collapse {
max-height:none;
}

/**/
.menu-icon,
.menu-label {
display: inline-block;
}
.menu-label {
position: relative;
top:-.15em;
margin-left: .2em;
}

// Alignment Correction

.dropdown-menu {
.dropdown-menu {
Expand All @@ -74,7 +57,40 @@
}
}

// For IE
/**/


// Mobile Nav Changes
.navbar-collapse {
max-height:none;
}


.menu-icon,
.menu-label {
display: inline-block;
}
.menu-label {
position: relative;
top:-.15em;
margin-left: .2em;
}



// Display Alternate Site Identity in Mobile

.navbar-default .navbar-brand {
height:auto;
float:none;
margin-right:110px;
font:500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
color:black;
}

/**/
// For IE 7

$nav-z: 9999;
#masthead {
z-index:$nav-z;
Expand Down
35 changes: 20 additions & 15 deletions style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7109,15 +7109,6 @@ object {

/* NAV
--------------------------------------------------------------*/
.navbar-default .navbar-brand {
height: auto;
float: none;
margin-right: 110px;
font: 500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
color: black;
}

/* overwriting bootstrap 3's philosophical opposition to drop down menus. */
.dropdown-submenu {
position: relative;
}
Expand All @@ -7132,6 +7123,11 @@ object {
display: block;
}

.dropdown-submenu:hover > a {
color: #333333;
background-color: transparent;
}

.dropdown-submenu > a:after {
display: block;
content: " ";
Expand All @@ -7141,13 +7137,13 @@ object {
border-color: transparent;
border-style: solid;
border-width: 5px 0 5px 5px;
border-left-color: #cccccc;
border-left-color: #777777;
margin-top: 5px;
margin-right: -10px;
}

.dropdown-submenu:hover > a:after {
border-left-color: #ffffff;
border-left-color: #333333;
}

.dropdown-submenu .pull-left {
Expand All @@ -7159,11 +7155,16 @@ object {
margin-left: 10px;
}

.dropdown-menu .dropdown-menu {
margin: 0;
top: -1px;
}

/**/
.navbar-collapse {
max-height: none;
}

/**/
.menu-icon,
.menu-label {
display: inline-block;
Expand All @@ -7175,11 +7176,15 @@ object {
margin-left: .2em;
}

.dropdown-menu .dropdown-menu {
margin: 0;
top: -1px;
.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;
}
Expand Down

0 comments on commit d6ac59e

Please sign in to comment.