WordPress.org
Get WordPress

Plugin Directory

Changeset 705432


Ignore:
Timestamp:
04/29/2013 02:01:46 PM (13 years ago)
Author:
karevn
Message:

CSS compatibility fixes.

Location:
usernoise/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • usernoise/trunk/admin/settings.php

    r703313 r705432  
    4848                'label' => __('Disable on mobile devices', 'usernoise'),
    4949                'default' => '1'),
     50                array('type' => 'checkbox', 'title' => __('Disable icons', 'usernoise'), 'name' => UN_DISABLE_ICONS,
     51                'default' => 0, 'legend' => __('Use this mode if Usernoise breaks your theme icons in Twitter Bootstrap-based themes', 'usernoise')),
    5052            array('type' => 'tab', 'title' => __('Button', 'usernoise')),
    5153            array('type' => 'select', 'name' => UN_FEEDBACK_BUTTON_POSITION,
    … …  
    5759                array('type' => 'select', 'name' => UN_FEEDBACK_BUTTON_ICON, 'title' => __('Button Icon', 'usernoise'),
    5860                'values' => $this->h->collection2options(un_get_icons(), 'icon', 'label', __('No icon', 'usernoise'), array('data-icon')),
    59                 'default' => 'icon-comments'
     61                'legend' => __('Icon used on the button. <strong>May conflict with Twitter Bootstrap-based themes</strong>', 'usernoise'),
     62                'default' => ''
    6063            ),
    6164            array('type' => 'color', 'name' => UN_FEEDBACK_BUTTON_TEXT_COLOR,
    … …  
    157160function un_get_localization_array(){
    158161    return apply_filters('un_localization_array', array(
    159         'text' => (un_get_option(UN_FEEDBACK_BUTTON_ICON) ? ("<i class='" . un_get_option(UN_FEEDBACK_BUTTON_ICON) . "'></i>")  : '') . un_get_option(UN_FEEDBACK_BUTTON_TEXT, __('Feedback', 'usernoise')),
     162        'text' => (un_get_option(UN_FEEDBACK_BUTTON_ICON) && !un_get_option(UN_DISABLE_ICONS) ? ("<i class='" . un_get_option(UN_FEEDBACK_BUTTON_ICON) . "'></i>")  : '') . un_get_option(UN_FEEDBACK_BUTTON_TEXT, __('Feedback', 'usernoise')),
    160163        'style' => sprintf("background-color: %s; color: %s",
    161164                un_get_option(UN_FEEDBACK_BUTTON_COLOR), un_get_option(UN_FEEDBACK_BUTTON_TEXT_COLOR)),

  • usernoise/trunk/css/button.css

    r704001 r705432  
    1818#un-button i{
    1919    margin-right: 0.4em;
     20    background: none !important;
    2021}
    2122#un-button.un-has-border{

  • usernoise/trunk/css/form.css

    r704241 r705432  
    112112    text-shadow: none !important;
    113113}
    114  .un-feedback-form .un-types-wrapper a i{
     114.un-feedback-form .un-types-wrapper a i{
    115115     font-size: 120%;
    116116     margin-right: 11px;
    … …  
    269269    -webkit-border-radius: 3px;
    270270}
     271#un-feedback-wrapper #un-thankyou{
     272    position: static;
     273    width: auto;
     274    top: auto;
     275    left: auto;
     276    margin-top: 0;
     277    margin-left: 0;
     278    padding: 0;
     279}
    271280@media screen and (max-width: 640px){
    272281    #un-thankyou{

  • usernoise/trunk/css/window.css

    r704001 r705432  
    134134    line-height: 10px;
    135135}
     136#un-feedback-wrapper{
     137    min-height: 100%;
     138}

  • usernoise/trunk/html/window.php

    r702958 r705432  
    1717        <a id="window-close" href="#" title="<?php _e('Close', 'usernoise'); ?>"><?php _e('Close', 'usernoise') ?></a>
    1818        <div id="viewport" class="clearfix">
    19             <?php do_action('before_feedback_wrapper')?>
     19            <?php do_action('before_feedback_wrapper') ?>
    2020            <div id="un-feedback-wrapper">
    2121                <div id="un-feedback-form-wrapper">

  • usernoise/trunk/inc/integration.php

    r703235 r705432  
    2121        wp_enqueue_style('usernoise-button', usernoise_url('/css/button.css'), null, UN_VERSION);
    2222        wp_enqueue_style('usernoise-form', usernoise_url('/css/form.css'), null, UN_VERSION);
    23         wp_enqueue_style('font-awesome', usernoise_url('/vendor/font-awesome/css/font-awesome.css'), null, UN_VERSION);
     23        if (un_get_option(UN_FEEDBACK_BUTTON_ICON) && !un_get_option(UN_DISABLE_ICONS))
     24            wp_enqueue_style('font-awesome', usernoise_url('/vendor/font-awesome/css/font-awesome.css'), null, UN_VERSION);
    2425        wp_localize_script('usernoise', 'usernoiseButton', un_get_localization_array());
    2526        add_action('wp_footer', array($this, '_wp_footer'));

  • usernoise/trunk/usernoise.php

    r704331 r705432  
    2929define('UN_FEEDBACK_BUTTON_TEXT_COLOR', 'feedback_button_text_color');
    3030define('UN_FEEDBACK_BUTTON_SHOW_BORDER', 'feedback_button_show_border');
     31define('UN_BOOTSTRAP_COMPATIBLE', 'boostrap_compatible');
    3132define('UN_SUBMIT_FEEDBACK_BUTTON_TEXT', 'submit_feedback_button_text');
    3233define('UN_FEEDBACK_TEXTAREA_PLACEHOLDER', 'feedback_textarea_placeholder');
Note: See TracChangeset for help on using the changeset viewer.