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

Commit

Permalink
Variables In Progress
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Jul 28, 2014
1 parent fe7036e commit 9f28d93
Show file tree
Hide file tree
Showing 13 changed files with 379 additions and 143 deletions.
2 changes: 1 addition & 1 deletion _notes/dwsync.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/_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="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485542" remote="997424038209786114" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485421" remote="602446763926622264" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493604" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488485036" remote="-4611742485168493604" Dst="-1" /><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493603" Dst="-1" /><file name="bootstrap.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493603" Dst="-1" /><file name="accessibility.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493604" Dst="-1" /><file name="admin-style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493603" Dst="-1" /><file name="cal.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="in-page-menus.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="link-flags.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="nav.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="test.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="uup.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493601" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485542" remote="997424038209786114" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485421" remote="602446763926622264" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493604" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488485036" remote="-4611742485168493604" Dst="-1" /><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493603" Dst="-1" /><file name="bootstrap.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493603" Dst="-1" /><file name="accessibility.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981695" remote="-4611742485168391249" Dst="-1" /><file name="admin-style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981687" remote="-4611742485168391249" Dst="-1" /><file name="cal.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488991327" remote="-4611742485168391249" Dst="-1" /><file name="in-page-menus.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981796" remote="-4611742485168391249" Dst="-1" /><file name="link-flags.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981778" remote="-4611742485168391249" Dst="-1" /><file name="nav.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902110" remote="-4611742485168493602" Dst="-1" /><file name="test.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="uup.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981733" remote="-4611742485168391249" Dst="-1" /><file name="alignments.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981849" remote="-4611742485168391249" Dst="-1" /><file name="captions.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981836" remote="-4611742485168391249" Dst="-1" /><file name="cs-word-break.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488910938" remote="-4611742485168391249" Dst="-1" /><file name="fonts.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981828" remote="-4611742485168391249" Dst="-1" /><file name="footer.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488978356" remote="-4611742485168391249" Dst="-1" /><file name="galleries.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981817" remote="-4611742485168391249" Dst="-1" /><file name="header-image.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981807" remote="-4611742485168391249" Dst="-1" /><file name="media.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981770" remote="-4611742485168391249" Dst="-1" /><file name="table-stripper.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981758" remote="-4611742485168391249" Dst="-1" /><file name="titlebar.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981751" remote="-4611742485168391249" Dst="-1" /><file name="utilities.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981743" remote="-4611742485168391249" Dst="-1" /><file name="widgets.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488921429" remote="-4611742485168391249" Dst="-1" /></dwsync>
Expand Down
44 changes: 0 additions & 44 deletions css/nav.css
View file
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
12 changes: 7 additions & 5 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' ));
Expand All @@ -105,6 +102,11 @@ function htmlShiv(){
<script src="' . $template . '/js/html5shiv/html5shiv.min.js"></script>
<script src="' . $template . '/js/html5shiv/html5shiv-printshiv.min.js"></script>
<![endif]-->';

//needed for IE7 grid hack
echo '<!--[if lt IE 8]>
<link href="'. $template .'/css/bootstrap.css" rel="stylesheet">
<![endif]-->';
}

add_action( 'wp_head', htmlShiv, 1 );
Expand Down
2 changes: 1 addition & 1 deletion js/_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="cs-modernizr.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3483710527" remote="-4611740835901487918" Dst="-1" /><file name="cs.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488479601" remote="7783446898" Dst="-1" /><file name="customizer.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611740835901487918" Dst="-1" /><file name="layoutbuilder.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611740835901487917" Dst="-1" /><file name="navigation.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611740835901487917" Dst="-1" /><file name="skip-link-focus-fix.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611740835901487917" Dst="-1" /><file name="respond.min.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488480632" remote="602446763926617944" Dst="-1" /><file name="boxsizing.htc" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493597" Dst="-1" /><file name="cs-modernizr.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3483710527" remote="-4611742485168493597" Dst="-1" /><file name="navigation.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482672152" remote="-4611742485168493596" Dst="-1" /><file name="respond.min.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493596" Dst="-1" /><file name="admin-style.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493598" Dst="-1" /><file name="bootstrap.min.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900390" remote="-4611742485168493598" Dst="-1" /><file name="cs.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488966980" remote="7783934277" Dst="-1" /><file name="customizer.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493597" Dst="-1" /><file name="layoutbuilder.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493596" Dst="-1" /><file name="skip-link-focus-fix.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493595" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="cs-modernizr.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3483710527" remote="-4611740835901487918" Dst="-1" /><file name="cs.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488479601" remote="7783446898" Dst="-1" /><file name="customizer.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611740835901487918" Dst="-1" /><file name="layoutbuilder.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611740835901487917" Dst="-1" /><file name="navigation.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611740835901487917" Dst="-1" /><file name="skip-link-focus-fix.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611740835901487917" Dst="-1" /><file name="respond.min.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488480632" remote="602446763926617944" Dst="-1" /><file name="boxsizing.htc" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493597" Dst="-1" /><file name="cs-modernizr.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3483710527" remote="-4611742485168493597" Dst="-1" /><file name="navigation.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482672152" remote="-4611742485168493596" Dst="-1" /><file name="respond.min.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493596" Dst="-1" /><file name="admin-style.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493598" Dst="-1" /><file name="bootstrap.min.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900390" remote="-4611742485168493598" Dst="-1" /><file name="cs.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488966980" remote="-4611742485168428731" Dst="-1" /><file name="customizer.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493597" Dst="-1" /><file name="layoutbuilder.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493596" Dst="-1" /><file name="skip-link-focus-fix.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493595" Dst="-1" /></dwsync>
Expand Down
Loading

0 comments on commit 9f28d93

Please sign in to comment.