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

Commit

Permalink
Many Changes
Browse files Browse the repository at this point in the history 
waited toolong to commit
  • Loading branch information
andrewmbacon committed Aug 6, 2014
1 parent 9a41a8e commit 9bad839
Show file tree
Hide file tree
Showing 21 changed files with 224 additions and 245 deletions.
Binary file modified .sass-cache/404108d960398fd8a0a888a545ab2c44cdda9bc8/content.scssc
View file
Binary file not shown.
Binary file modified .sass-cache/404108d960398fd8a0a888a545ab2c44cdda9bc8/uup.scssc
View file
Binary file not shown.
Binary file modified .sass-cache/404108d960398fd8a0a888a545ab2c44cdda9bc8/variables.scssc
View file
Binary file not shown.
Binary file modified .sass-cache/404108d960398fd8a0a888a545ab2c44cdda9bc8/widgets.scssc
View file
Binary file not shown.
Binary file modified .sass-cache/d1a548f5ef9f2ce138ebbc3eb924a26f1716968b/style.scssc
View file
Binary file not shown.
Binary file added .sass-cache/d1a548f5ef9f2ce138ebbc3eb924a26f1716968b/variables.scssc
View file
Binary file not shown.
Binary file modified .sass-cache/f11b1ad230ced2710ab733a38ef6447b0568d470/style.scssc
View file
Binary file not shown.
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="blue-var.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488217700" remote="602446763927119302" Dst="-1" /><file name="blue.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488216944" remote="602446763927119302" Dst="-1" /><file name="color.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488216632" remote="602446763927119302" Dst="-1" /><file name="config.rb" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488270627" remote="602446763927119302" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488358357" remote="602446763927119303" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3486550966" remote="602446763927119303" Dst="-1" /><file name="screenshot.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3487681623" remote="602446763927119303" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3489522861" remote="602446763927659695" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="config.rb" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488270627" remote="602446763927119302" Dst="-1" /><file name="functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3489609249" remote="602446763927746082" Dst="-1" /><file name="README.md" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3486550966" remote="602446763927119303" Dst="-1" /><file name="style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490020083" remote="602446763928156915" Dst="-1" /><file name="screenshot.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490090979" remote="602446763928227841" Dst="-1" /></dwsync>
Expand Down
12 changes: 0 additions & 12 deletions blue-var.scss
View file

This file was deleted.

11 changes: 0 additions & 11 deletions blue.scss
View file

This file was deleted.

Binary file added bootstrap-sass.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 0 additions & 21 deletions color.scss
View file

This file was deleted.

16 changes: 12 additions & 4 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
// any custom js or css

function sherman_scripts() {
wp_enqueue_script( 'sherman-js', get_stylesheet_directory_uri() . '/javascripts/min/sherman.min.js', array( 'jquery' ));
wp_enqueue_script( 'sherman-js', get_stylesheet_directory_uri() . '/javascripts/min/sherman.min.js', array( 'jquery' ));
}

add_action( 'wp_enqueue_scripts', 'sherman_scripts' );
add_action( 'wp_enqueue_scripts', 'sherman_scripts');



Expand All @@ -23,12 +23,20 @@ function sherman_remove_theme_features() {
}
add_action( 'init', 'sherman_remove_theme_features' );

function sherman_customize_register( $wp_customize ) {
$wp_customize->remove_section('colors');
$wp_customize->remove_section('background_image');
$wp_customize->remove_section('nav');
}
add_action( 'customize_register', 'sherman_customize_register' );




// Add Options for Sherman-specific Color options.


// Add Options for Sherman-specific Color options.
/*
function sherman_titlebar_register( $wp_customize ){
$wp_customize->add_setting( 'titlebarColor', //Give it a SERIALIZED name (so all theme settings can live under one db record)
Expand Down Expand Up @@ -117,5 +125,5 @@ function sherman_titlebar_register( $wp_customize ){
);
}
add_action( 'customize_register', 'sherman_titlebar_register' , 34);

*/
?>
2 changes: 1 addition & 1 deletion sass/_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/themes/sherman/" local="3488270130" remote="-4611742485168413241" Dst="-1" /><file name="ie.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488269540" remote="-4611742485168413241" Dst="-1" /><file name="print.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488269540" remote="-4611742485168413241" Dst="-1" /><file name="screen.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488269540" remote="-4611742485168413241" Dst="-1" /><file name="style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3489003406" remote="7783970743" 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/themes/sherman/" local="3488270130" remote="-4611742485168413241" Dst="-1" /><file name="ie.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488269540" remote="-4611742485168413241" Dst="-1" /><file name="print.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488269540" remote="-4611742485168413241" Dst="-1" /><file name="screen.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3488269540" remote="-4611742485168413241" Dst="-1" /><file name="style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490020080" remote="-4611742485167304703" Dst="-1" /><file name="variables.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/sherman/" local="3490019914" remote="-4611742485167304703" Dst="-1" /></dwsync>
Expand Down
29 changes: 16 additions & 13 deletions sass/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@

@import "variables.scss";

$uc-ecw-month-bg: #f5f5f5;
$uc-ecw-month-color: #2e77b0;
$uc-ecw-day-bg: #f5f5f5;
$uc-ecw-day-color: #454545;

$footers-border-color: #bd2429;
$footers-border-width: 1px 0 0 0;

$footers-margin: 0;
$footers-bg: #d5d5d5;
$footers-link-color: #5a595a;
$footers-link-hover: #343434;


@import "../../cornerstone/style.scss";
Expand Down Expand Up @@ -203,13 +191,24 @@ $footers-link-hover: #343434;
margin-top:1em;
}

h3 {
margin-top:2em;
font-weight:bold;
color:#4C608A;
}

}
}
.col-sm-12 .page {
padding-left:4em;
padding-right:4em;
}

@media (max-width: 767px) {
#content .page {
padding-left:1em!important;
padding-right:1em!important;
}
}


#page-home {
Expand All @@ -222,4 +221,8 @@ $footers-link-hover: #343434;
}
#mega-footer+#footer {
border-top:none;
}

#content .btn {
border-radius:5px;
}
74 changes: 39 additions & 35 deletions sass/variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
SHERMAN variables
*/

$header_border: #273a60;
$uc-ecw-month-bg: #f5f5f5;
$uc-ecw-month-color: #2e77b0;
$uc-ecw-day-bg: #f5f5f5;
$uc-ecw-day-color: #454545;

//$title_bg: #0b1d42;
$footers-border-color: #bd2429;
$footers-border-width: 1px 0 0 0;

$title_parent: #fff;
$title_parentHover: yellow;
$footers-margin: 0;
$footers-bg: #d5d5d5;
$footers-link-color: #5a595a;
$footers-link-hover: #343434;

$title_txt: #fff;
$title_txtHover: pink;

/*
$navbar_bg: transparent;
$header_border: #273a60;

$title_parent: #fff;
$title_parentHover: yellow;

$nav1_txt: rgba(255,255,255,.8);
$nav1_txtActive: #fff;
$nav1_txtHover: #fff;
$nav1_bg: yellow;
$nav1_bgActive: blue;
$nav1_bgHover: green;
$nav1_arrow: rgba(255,255,255,.8);
$nav1_arrowHover: #fff;
$title_txt: #fff;
$title_txtHover: pink;

*/

$contentPadding: 31px 0 4em;


$headings-font-weight: bold;
Expand All @@ -49,12 +49,6 @@ $navbar-default-link-active-bg: transparent;


$dropdown-bg: #e9e9e9 ;
/*
$dropdown-border: rgba(0,0,0,.15) ;
$dropdown-fallback-border: #ccc ;
$dropdown-divider-bg: #e5e5e5 ;
*/

$dropdown-link-color: #444 ;
$dropdown-link-hover-color: #fff ;
$dropdown-link-hover-bg: #b8000f ;
Expand All @@ -70,29 +64,35 @@ $widget-head-border-width: 0;
$widget-head-size: 150%;
$widget-head-color: #4d628c;

$uc-ecw-month-bg: #f5f5f5;
$uc-ecw-month-color: #2e77b0;
$uc-ecw-day-bg: #f5f5f5;
$uc-ecw-day-color: #454545;



$font-size-base: 14px !default;

$font-size-h1: ceil(($font-size-base * 1.7));
$font-size-h2: floor(($font-size-base * 1.5)) !default; // ~30px
$font-size-h3: ceil(($font-size-base * 1.4)) !default; // ~24px
$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
$font-size-h2: floor(($font-size-base * 1.5)) ;
$font-size-h3: ceil(($font-size-base * 1.15)) ;
$font-size-h4: ceil(($font-size-base * 1.15)) ;
$font-size-h5: $font-size-base !default;
$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
/*
$font-size-h2:
$font-size-h3:
$font-size-h4:
$font-size-h5:
$font-size-h6:
/**/

$headings-font-weight: 500;

$link-color: #388ac3;
$link-hover-color: darken($link-color, 15%) !default;


$footers-border-color: #bd2429;
$footers-border-width: 1px 0 0 0;

$link-color: #388ac3;
$link-hover-color: darken($link-color, 15%) !default;
$footers-margin: 0;
$footers-bg: #d5d5d5;
$footers-link-color: #444;
$footers-link-hover: #000;


@mixin searchform(){
Expand Down Expand Up @@ -131,4 +131,8 @@ $link-hover-color: darken($link-color, 15%) !default;
}
}
}
.ie7 .searchform .formcontrol,
.ie7 .searchform .btn {
background-color:#3e4a67!important;
}
}
Binary file added screenshot.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed screenshot.png
View file
Binary file not shown.
Loading

0 comments on commit 9bad839

Please sign in to comment.