Skip to content

Commit

Permalink
update to version 1.6.1 of less.php see also: oyejorge/less.php#61
Browse files Browse the repository at this point in the history
  • Loading branch information
@bassjobsen
bassjobsen committed Feb 3, 2014
1 parent 4578de2 commit 4f1417e
Show file tree
Hide file tree
Showing 12 changed files with 3,793 additions and 1,732 deletions.
17 changes: 17 additions & 0 deletions functions/custom-style-css.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,20 @@
background-color: '.$navbar_activebackground_color.';
}';
}

/* Link Color */

if($link_color=get_theme_mod( 'link-color',link-color)) {
echo 'a, a:hover {color:'.$link_color.';}';
echo '.nav-tabs > .active > a, .nav-tabs > .active > a:hover,.nav-pills > .active > a, .nav-pills > .active > a:hover {background:'.$link_color.'}';
echo 'a.thumbnail:hover {border-color:'.$link_color.';}';
}
if($footer_bg_color=get_theme_mod( 'footer_bg_color',footer_bg_color)) {
echo 'footer#colophon {background-color:'.$footer_bg_color.';}';
}
if($footer_text_color=get_theme_mod( 'footer_text_color',footer_text_color)) {
echo 'footer#colophon {color:'.$footer_text_color.';}';
}
if($footer_link_color=get_theme_mod( 'footer_link_color',footer_link_color)) {
echo 'footer#colophon {color:'.$footer_link_color.';}';
}
18 changes: 12 additions & 6 deletions functions/custom-style.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$heading_color = get_theme_mod( 'heading_color');
$page_backgroundcolor = get_theme_mod( 'page_backgroundcolor','');
$small_color = get_theme_mod( 'small_color');
$link_color = get_theme_mod( 'link_color' );
$link_color = get_theme_mod( 'link_color',link_color );
$border_color = get_theme_mod( 'border_color');
$border_accent_color = get_theme_mod( 'accent_color');
$well_color = get_theme_mod( 'well_color');
Expand All @@ -26,6 +26,7 @@
$ftr_top_border_color = get_theme_mod( 'footer_top_border_color');
$ftr_widget_border_color = get_theme_mod( 'footer_widget_border_color');
$ftr_link_color = get_theme_mod( 'footer_link_color',footer_link_color);
$ftr_linkhover_color = get_theme_mod( 'footer_linkhover_color',footer_linkhover_color);
$container = get_theme_mod( 'container_width', 1200);

/* Site Background */
Expand Down Expand Up @@ -68,7 +69,7 @@

/* Link Color */

if($link_color){echo 'a, a:hover {color:'.$link_color.';} .nav-tabs > .active > a, .nav-tabs > .active > a:hover,.nav-pills > .active > a, .nav-pills > .active > a:hover {background:'.$link_color.'} a.thumbnail:hover {border-color:'.$link_color.';}';}
if($link_color){echo '@link-color: '.$link_color.';';}

/* Border Color */
if($border_color){echo '.page-header,footer,.thumbnail,.default_product_display,ol.commentlist li article,.nav-tabs,.nav-tabs > .active > a, .nav-tabs > .active > a:hover,.nav-tabs li a:hover,.pager a,table.checkout_cart td, table.checkout_cart th,form.wpsc_checkout_forms table.table-4,.table th, .table td,#fancy_notification,table.shop_table,table.shop_table td,.cart-collaterals .cart_totals tr td, .cart-collaterals .cart_totals tr th,#payment div.form-row,.nav-tabs.nav-stacked > li > a,blockquote {border-color:' .$border_color.';}';}
Expand All @@ -95,16 +96,21 @@
if($border_color){echo '.pager a:hover {background-color:' .$border_color.';}';}

/* Footer Background */
echo 'footer.site-footer '.((get_theme_mod( 'footer_width', footer_width ) == 'cont-width')?' .container':'').' {';
if($ftr_bg_color){echo 'background:' .$ftr_bg_color.';';}
if($ftr_text_color){echo 'color:' .$ftr_text_color.';';}
echo 'footer#colophon '.((get_theme_mod( 'footer_width', footer_width ) == 'cont-width')?' .container':'').' {';
if($ftr_top_border_color){echo 'border-top:1px solid ' .$ftr_top_border_color.';';}
if($ftr_bg_image){echo 'background-image:url("' .$ftr_bg_image.'");';}
echo'}';

if($ftr_bg_color){echo '@footer-bg-color:' .$ftr_bg_color.';';}
if($ftr_text_color){echo '@footer-text-color:' .$ftr_text_color.';';}

/* Footer Borders */
if($ftr_bottom_border_color){echo '.site-info {border-color:' .$ftr_bottom_border_color.';}';}
if($ftr_link_color){echo 'footer.site-footer a, footer.site-footer a:hover {color:' .$ftr_link_color.';}';}

/* Footer Links */
if($ftr_link_color){echo '@footer-link-color:' .$ftr_link_color.';';}
if($ftr_linkhover_color){echo '@footer-link-hover-color:' .$ftr_linkhover_color.';';}

if($ftr_widget_border_color){echo 'footer .widget li, footer .shoppingcart table td, footer .shoppingcart table th,.site-footer .widget .nav-tabs.nav-stacked > li > a {border-color:' .$ftr_widget_border_color.';}.site-footer .widget .nav-tabs.nav-stacked > li > a:hover {background:' .$ftr_widget_border_color.';}';}

if(get_theme_mod( 'footer_width', footer_width ) == 'cont-width') {
Expand Down
4 changes: 2 additions & 2 deletions functions/jbst-footer-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function jbst_bottom_content_wrapper() {
add_action( 'jbst_footer', 'jbst_footer_area', 30 );

function jbst_footer_area() {?>
<footer id="colophon" class="site-footer" role="contentinfo">
<footer id="colophon" role="contentinfo">
<?php do_action( 'jbst_footer_start_content' ); ?>
<div class="container">
<?php do_action( 'jbst_footer_widgets' );?>
Expand Down Expand Up @@ -140,7 +140,7 @@ function jbst_body_close() {
?>
</div><!-- END jbst-site-wrap -->
<?php do_action( 'jbst_after' ); ?>
<?php wp_footer(); ?>
<?php wp_footer(); ?>
</body>
</html>
<?php
Expand Down
42 changes: 21 additions & 21 deletions functions/jbst-header-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,17 @@ function jbst_main_navbar() {
* @param string $content empty HTML5 string.
*/
echo apply_filters('jbst_before_headercontent','');
$fixed = preg_match('/fixed/',get_theme_mod( 'navbar_style' ));

$fixed = preg_match('/fixed/',get_theme_mod( 'navbar_style', navbar_style ));

if( get_theme_mod('logo_image_position', logo_image_position) == 'outside-nav' && !$fixed )
{
echo apply_filters('jbst_logooustside',jbst_logooustside());
}

if(get_theme_mod( 'navbar_style' ) == '') {?><div class="container"><?php } ?>
if(get_theme_mod( 'navbar_style',navbar_style ) == 'default') {?><div class="container"><?php } ?>

<nav role="navigation" class="navbar navbar-default <?php echo get_theme_mod( 'navbar_style', '' );?> <?php //echo get_theme_mod( 'navbar_color', 'navbar-default' );?>" id="jbst-top-nav">
<?php if(get_theme_mod( 'navbar_style' ) != '') {?><div class="container"><?php } ?>
<nav role="navigation" class="navbar navbar-default <?php echo get_theme_mod( 'navbar_style',navbar_style );?> <?php //echo get_theme_mod( 'navbar_color', 'navbar-default' );?>" id="jbst-top-nav">
<?php if(get_theme_mod( 'navbar_style',navbar_style ) != 'default') {?><div class="container"><?php } ?>
<a class="sr-only" href="#content"><?php _e( 'Skip to content', 'jamedo-bootstrap-start-theme' ); ?></a>

<div class="navbar-header">
Expand All @@ -200,9 +199,9 @@ function jbst_main_navbar() {
<!--/ul-->
</div>

<?php if(get_theme_mod( 'navbar_style' ) != '') {?></div><?php } ?>
<?php if(get_theme_mod( 'navbar_style',navbar_style ) != 'default') {?></div><?php } ?>
</nav>
<?php if(get_theme_mod( 'navbar_style' ) == '') {?></div><?php } ?>
<?php if(get_theme_mod( 'navbar_style',navbar_style ) == 'default') {?></div><?php } ?>
<?php

if( get_theme_mod('logo_image_position', 'in-nav') == 'outside-nav' && $fixed)
Expand Down Expand Up @@ -232,24 +231,24 @@ function jbst_main_navbar() {
} // END jbst_main_navbar

function jbst_nav_styles() {
if(get_theme_mod( 'navbar_style' ) == '') { //default
if(get_theme_mod( 'navbar_style', navbar_style) == 'default') { //default
echo '
body { padding-top: 30px; }
.navbar { margin-bottom: 30px; margin-left: -15px;
margin-right: -15px;}
';
}
if(get_theme_mod( 'navbar_style') == 'navbar-static-top') {
elseif(get_theme_mod( 'navbar_style', navbar_style) == 'navbar-static-top') {
echo '
.navbar-static-top { margin-bottom: 19px; }
';
}
if(get_theme_mod( 'navbar_style') == 'navbar-fixed-top') {
elseif(get_theme_mod( 'navbar_style', navbar_style) == 'navbar-fixed-top') {
echo '
body { padding-top: 70px; }
';
}
if(get_theme_mod( 'navbar_style') == 'navbar-fixed-bottom') {
elseif(get_theme_mod( 'navbar_style', navbar_style) == 'navbar-fixed-bottom') {
echo '
body { padding-padding-bottom: 70px; }
';
Expand Down Expand Up @@ -302,17 +301,18 @@ function jbst_nav_styles() {


/* LOGO */

$logo_link_color = get_theme_mod( 'logo_link_color','');
if(!empty($logo_link_color))
{
echo '#jbst-top-nav .navbar-brand {color: '.$logo_link_color.';}';
if(!$logo_link_color=get_theme_mod( 'logo_link_color',logo_link_color)) {
$logo_link_color=get_theme_mod( 'navbar_link_color',navbar_link_color);
}
if($logo_link_color) {
echo '@navbar-default-brand-color: '. $logo_link_color.';';
}

$logo_linkhover_color = get_theme_mod( 'logo_linkhover_color');
if(!empty($logo_linkhover_color))
{
echo '#jbst-top-nav .navbar-brand:hover {color: '.$logo_linkhover_color.';}';

if(!$logo_linkhover_color=get_theme_mod( 'logo_linkhover_color',logo_linkhover_color)) {
$logo_linkhover_color=get_theme_mod( 'navbar_linkhover_color',navbar_linkhover_color);
}
if($logo_linkhover_color) {
echo '@navbar-default-brand-hover-color: '. $logo_linkhover_color.';';
}


Expand Down
10 changes: 5 additions & 5 deletions functions/template-customizer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ function jbst_logo_customizer_options($wp_customize) {

/* Logo Link Color */
$wp_customize->add_setting( 'logo_link_color', array(
'default' => '',
'default' => logo_link_color,
) );

$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'logo_link_color', array(
Expand All @@ -263,7 +263,7 @@ function jbst_logo_customizer_options($wp_customize) {

/* Logo Link hover Color */
$wp_customize->add_setting( 'logo_linkhover_color', array(
'default' => '',
'default' => logo_linkhover_color,
) );

$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'logo_linkhover_color', array(
Expand Down Expand Up @@ -292,7 +292,7 @@ function jbst_navbar_customizer_options($wp_customize) {

/* Navbar Width */
$wp_customize->add_setting( 'navbar_style', array(
'' => __( 'Default', 'jamedo-bootstrap-start-theme'),
'default' => navbar_style,
) );

$wp_customize->add_control( 'navbar_style', array(
Expand All @@ -301,7 +301,7 @@ function jbst_navbar_customizer_options($wp_customize) {
'type' => 'select',
'priority' => 10,
'choices' => array(
''=> 'Default',
'default'=> __( 'Default', 'jamedo-bootstrap-start-theme'),
'navbar-static-top' => 'Static top navbar',
'navbar-fixed-top' => 'Fixed to top',
'navbar-fixed-bottom' => 'Fixed to bottom',
Expand Down Expand Up @@ -725,7 +725,7 @@ function jbst_colors_customizer_options($wp_customize) {

/* Link Color */
$wp_customize->add_setting( 'link_color', array(
'default' => '',
'default' => link_color,
) );

$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_color', array(
Expand Down
2 changes: 1 addition & 1 deletion library/assets/css/wpless2css.css
View file

Large diffs are not rendered by default.

17 changes: 14 additions & 3 deletions library/core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ function jbst_default_settings()
do_action('jbst_child_settings');

/* navbar */
if(!defined('navbar_style'))define('navbar_style','default');

if(!defined('navbar_background_color'))define('navbar_background_color',false);
if(!defined('navbar_border_color'))define('navbar_border_color',false);
if(!defined('navbar_link_color'))define('navbar_link_color',false);
Expand All @@ -24,6 +26,10 @@ function jbst_default_settings()
if(!defined('navbar_account'))define('navbar_account',1);
if(!defined('navbar_cart'))define('navbar_cart',1);

/* logo text */
if(!defined('logo_link_color'))define('logo_link_color',false);
if(!defined('logo_linkhover_color'))define('logo_linkhover_color',false);

/* logo */
if(!defined('logo_image_position'))define('logo_image_position','in-nav');
if(!defined('logo_image'))define('logo_image','');
Expand All @@ -32,15 +38,20 @@ function jbst_default_settings()

/* footer */
if(!defined('footer_width'))define('footer_width','cont-width');
if(!defined('footer_bg_color'))define('footer_bg_color','#371B2C');
if(!defined('footer_text_color'))define('footer_text_color','#D1D6E7');
if(!defined('footer_link_color'))define('footer_link_color','#D1D6E7');
if(!defined('footer_bg_color'))define('footer_bg_color',false);
if(!defined('footer_text_color'))define('footer_text_color',false);
if(!defined('footer_link_color'))define('footer_link_color',false);
if(!defined('footer_linkhover_color'))define('footer_linkhover_color',false);


/* disable LESS / Customizer / Options */
if(!defined('jbst_less'))define('jbst_less',1);
if(!defined('jbst_customizer'))define('jbst_customizer',1);
if(!defined('jbst_options'))define('jbst_options',1);

/* site color */
if(!defined('link_color'))define('link_color',false);

}


Expand Down
Loading

0 comments on commit 4f1417e

Please sign in to comment.