WordPress.org
Get WordPress

Plugin Directory

Changeset 767230


Ignore:
Timestamp:
09/05/2013 03:20:27 AM (13 years ago)
Author:
kcfried
Message:

Some tweaks to the code, namely making the columns fully responsive.

Location:
easy-columns/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • easy-columns/trunk/css/easy-columns.css

    r763400 r767230  
    11/*
    22** Easy Columns CSS: css to define column layouts for the WP-Colum plugin
    3 ** for more info visit: http://www.patrickfriedl.com.com/wordpress/easy-columns
     3** for more info visit: http://www.patrickfriedl.com.com/
    44**
    55** use percentage widths and margins for fluid
    … …  
    1515** for info on the CSS box model
    1616*/
     17.ezcol>* {
     18    max-width: 100%;
     19}
    1720.ezcol-one-quarter,
    1821.ezcol-one-half,
    … …  
    2326.ezcol-two-fifth,
    2427.ezcol-three-fifth,
    25 .ezcol-four-fifth
    26  {
     28.ezcol-four-fifth {
    2729    float: left;
    2830    margin-right: 4%;
    … …  
    3436    box-sizing: border-box !important;
    3537    text-rendering: optimizedLegibility;
    36     -moz-font-feature-settings: "ss01=1, onum=1, tnum=1, liga=1, dlig=1, kern=1, frac=1";
    37     -webkit-font-feature-settings: "ss01" 1, "onum" 1, "tnum" 1, "liga" 1, "dlig" 1, "kern" 1, "frac" 1;
    38     -ms-font-feature-settings: "ss01" 1, "onum" 1, "tnum" 1, "liga" 1, "dlig" 1, "kern" 1, "frac" 1;
    39     -o-font-feature-settings: "ss01" 1, "onum" 1, "tnum" 1, "liga" 1, "dlig" 1, "kern" 1, "frac" 1;
    4038}
    4139.ezcol-one-quarter {
    … …  
    102100    clear: right !important;
    103101}
     102@media all and (max-width: 768px) {
     103    .ezcol-one-quarter,
     104    .ezcol-one-half,
     105    .ezcol-three-quarter,
     106    .ezcol-one-third,
     107    .ezcol-two-third,
     108    .ezcol-one-fifth,
     109    .ezcol-two-fifth,
     110    .ezcol-three-fifth,
     111    .ezcol-four-fifth {
     112        width: 48% !important;
     113        margin-right: 2%;
     114    }
     115    .ezcol-last {
     116        float: left;
     117        clear: none;
     118        display: block;
     119    }
     120    .ezcol-last:after {
     121        content: "";
     122        display: block;
     123        clear: none;
     124    }
     125    .ezcol-last + .ezcol-divider {
     126        clear: none !important;
     127        display: none !important;
     128        margin: 0 !important;
     129        padding: 0 !important;
     130    }
     131}
     132@media all and (max-width: 480px) {
     133    .ezcol-one-quarter,
     134    .ezcol-one-half,
     135    .ezcol-three-quarter,
     136    .ezcol-one-third,
     137    .ezcol-two-third,
     138    .ezcol-one-fifth,
     139    .ezcol-two-fifth,
     140    .ezcol-three-fifth,
     141    .ezcol-four-fifth {
     142        width: 100% !important;
     143        margin-right: 0;
     144    }
     145}

  • easy-columns/trunk/easy-columns.php

    r763402 r767230  
    33Plugin Name: Easy Columns
    44Plugin URI: http://www.patrickfriedl.com/
    5 Version: v2.1
     5Version: v2.1.1
    66Author: <a href="http://www.patrickfriedl.com">Pat Friedl</a>
    77Description: Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them.  Using shortcodes for 1/4, 1/2, 1/3, 2/3, 3/4, 1/5, 2/5, and 3/5 columns, you can insert <strong>at least thirty</strong> unique variations of columns on any page and even in posts! Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface! For usage and more information, visit <a href="http://www.patrickfriedl.com" target="_blank">patrickfriedl.com</a>.
    … …  
    4444                define('EZC_PLUGIN_URL', WP_PLUGIN_URL . '/' . EZC_PLUGIN_NAME);
    4545            if (!defined('EZC_PLUGIN_VERSION'))
    46                 define('EZC_PLUGIN_VERSION','2.1');
     46                define('EZC_PLUGIN_VERSION','2.1.1');
    4747            if (!defined('EZC_PLUGIN_TYPE'))
    4848                define('EZC_PLUGIN_TYPE','free');
    4949
     50            // add css to the <head>
     51            add_action('wp_head', array(&$this, 'add_css'), 100);
     52
    5053            // define OLD column shortcodes
    51             add_shortcode('wpcol_1half', array(&$this, 'wpcol_one_half'));
    52             add_shortcode('wpcol_1half_end', array(&$this, 'wpcol_one_half_end'));
    53             add_shortcode('wpcol_1third', array(&$this, 'wpcol_one_third'));
    54             add_shortcode('wpcol_1third_end', array(&$this, 'wpcol_one_third_end'));
    55             add_shortcode('wpcol_2third', array(&$this, 'wpcol_two_third'));
    56             add_shortcode('wpcol_2third_end', array(&$this, 'wpcol_two_third_end'));
    57             add_shortcode('wpcol_1quarter', array(&$this, 'wpcol_one_quarter'));
    58             add_shortcode('wpcol_1quarter_end', array(&$this, 'wpcol_one_quarter_end'));
    59             add_shortcode('wpcol_3quarter', array(&$this, 'wpcol_three_quarter'));
    60             add_shortcode('wpcol_3quarter_end', array(&$this, 'wpcol_three_quarter_end'));
    61             add_shortcode('wpcol_1fifth', array(&$this, 'wpcol_one_fifth'));
    62             add_shortcode('wpcol_1fifth_end', array(&$this, 'wpcol_one_fifth_end'));
    63             add_shortcode('wpcol_2fifth', array(&$this, 'wpcol_two_fifth'));
    64             add_shortcode('wpcol_2fifth_end', array(&$this, 'wpcol_two_fifth_end'));
    65             add_shortcode('wpcol_3fifth', array(&$this, 'wpcol_three_fifth'));
    66             add_shortcode('wpcol_3fifth_end', array(&$this, 'wpcol_three_fifth_end'));
    67             add_shortcode('wpcol_4fifth', array(&$this, 'wpcol_four_fifth'));
    68             add_shortcode('wpcol_4fifth_end', array(&$this, 'wpcol_four_fifth_end'));
    69             add_shortcode('wpdiv', array(&$this, 'wpcol_div'));
    70             add_shortcode('wpcol_divider', array(&$this, 'wpcol_add_divider'));
    71             add_shortcode('wpcol_end_right', array(&$this, 'wpcol_end_column_right'));
    72             add_shortcode('wpcol_end_left', array(&$this, 'wpcol_end_column_left'));
    73             add_shortcode('wpcol_end_both', array(&$this, 'wpcol_end_column_both'));
     54            add_shortcode('wpcol_1half', array(&$this, 'one_half'));
     55            add_shortcode('wpcol_1half_end', array(&$this, 'one_half_end'));
     56            add_shortcode('wpcol_1third', array(&$this, 'one_third'));
     57            add_shortcode('wpcol_1third_end', array(&$this, 'one_third_end'));
     58            add_shortcode('wpcol_2third', array(&$this, 'two_third'));
     59            add_shortcode('wpcol_2third_end', array(&$this, 'two_third_end'));
     60            add_shortcode('wpcol_1quarter', array(&$this, 'one_quarter'));
     61            add_shortcode('wpcol_1quarter_end', array(&$this, 'one_quarter_end'));
     62            add_shortcode('wpcol_3quarter', array(&$this, 'three_quarter'));
     63            add_shortcode('wpcol_3quarter_end', array(&$this, 'three_quarter_end'));
     64            add_shortcode('wpcol_1fifth', array(&$this, 'one_fifth'));
     65            add_shortcode('wpcol_1fifth_end', array(&$this, 'one_fifth_end'));
     66            add_shortcode('wpcol_2fifth', array(&$this, 'two_fifth'));
     67            add_shortcode('wpcol_2fifth_end', array(&$this, 'two_fifth_end'));
     68            add_shortcode('wpcol_3fifth', array(&$this, 'three_fifth'));
     69            add_shortcode('wpcol_3fifth_end', array(&$this, 'three_fifth_end'));
     70            add_shortcode('wpcol_4fifth', array(&$this, 'four_fifth'));
     71            add_shortcode('wpcol_4fifth_end', array(&$this, 'four_fifth_end'));
     72            add_shortcode('wpdiv', array(&$this, 'div'));
     73            add_shortcode('wpcol_divider', array(&$this, 'add_divider'));
     74            add_shortcode('wpcol_end_right', array(&$this, 'end_column_right'));
     75            add_shortcode('wpcol_end_left', array(&$this, 'end_column_left'));
     76            add_shortcode('wpcol_end_both', array(&$this, 'end_column_both'));
    7477
    7578            // define NEW column shortcodes
    76             add_shortcode('ezcol_1half', array(&$this, 'wpcol_one_half'));
    77             add_shortcode('ezcol_1half_end', array(&$this, 'wpcol_one_half_end'));
    78             add_shortcode('ezcol_1third', array(&$this, 'wpcol_one_third'));
    79             add_shortcode('ezcol_1third_end', array(&$this, 'wpcol_one_third_end'));
    80             add_shortcode('ezcol_2third', array(&$this, 'wpcol_two_third'));
    81             add_shortcode('ezcol_2third_end', array(&$this, 'wpcol_two_third_end'));
    82             add_shortcode('ezcol_1quarter', array(&$this, 'wpcol_one_quarter'));
    83             add_shortcode('ezcol_1quarter_end', array(&$this, 'wpcol_one_quarter_end'));
    84             add_shortcode('ezcol_3quarter', array(&$this, 'wpcol_three_quarter'));
    85             add_shortcode('ezcol_3quarter_end', array(&$this, 'wpcol_three_quarter_end'));
    86             add_shortcode('ezcol_1fifth', array(&$this, 'wpcol_one_fifth'));
    87             add_shortcode('ezcol_1fifth_end', array(&$this, 'wpcol_one_fifth_end'));
    88             add_shortcode('ezcol_2fifth', array(&$this, 'wpcol_two_fifth'));
    89             add_shortcode('ezcol_2fifth_end', array(&$this, 'wpcol_two_fifth_end'));
    90             add_shortcode('ezcol_3fifth', array(&$this, 'wpcol_three_fifth'));
    91             add_shortcode('ezcol_3fifth_end', array(&$this, 'wpcol_three_fifth_end'));
    92             add_shortcode('ezcol_4fifth', array(&$this, 'wpcol_four_fifth'));
    93             add_shortcode('ezcol_4fifth_end', array(&$this, 'wpcol_four_fifth_end'));
    94             add_shortcode('ezdiv', array(&$this, 'wpcol_div'));
    95             add_shortcode('ezcol_divider', array(&$this, 'wpcol_add_divider'));
    96             add_shortcode('ezcol_end_right', array(&$this, 'wpcol_end_column_right'));
    97             add_shortcode('ezcol_end_left', array(&$this, 'wpcol_end_column_left'));
    98             add_shortcode('ezcol_end_both', array(&$this, 'wpcol_end_column_both'));
     79            add_shortcode('ezcol_1half', array(&$this, 'one_half'));
     80            add_shortcode('ezcol_1half_end', array(&$this, 'one_half_end'));
     81            add_shortcode('ezcol_1third', array(&$this, 'one_third'));
     82            add_shortcode('ezcol_1third_end', array(&$this, 'one_third_end'));
     83            add_shortcode('ezcol_2third', array(&$this, 'two_third'));
     84            add_shortcode('ezcol_2third_end', array(&$this, 'two_third_end'));
     85            add_shortcode('ezcol_1quarter', array(&$this, 'one_quarter'));
     86            add_shortcode('ezcol_1quarter_end', array(&$this, 'one_quarter_end'));
     87            add_shortcode('ezcol_3quarter', array(&$this, 'three_quarter'));
     88            add_shortcode('ezcol_3quarter_end', array(&$this, 'three_quarter_end'));
     89            add_shortcode('ezcol_1fifth', array(&$this, 'one_fifth'));
     90            add_shortcode('ezcol_1fifth_end', array(&$this, 'one_fifth_end'));
     91            add_shortcode('ezcol_2fifth', array(&$this, 'two_fifth'));
     92            add_shortcode('ezcol_2fifth_end', array(&$this, 'two_fifth_end'));
     93            add_shortcode('ezcol_3fifth', array(&$this, 'three_fifth'));
     94            add_shortcode('ezcol_3fifth_end', array(&$this, 'three_fifth_end'));
     95            add_shortcode('ezcol_4fifth', array(&$this, 'four_fifth'));
     96            add_shortcode('ezcol_4fifth_end', array(&$this, 'four_fifth_end'));
     97            add_shortcode('ezdiv', array(&$this, 'div'));
     98            add_shortcode('ezcol_divider', array(&$this, 'add_divider'));
     99            add_shortcode('ezcol_end_right', array(&$this, 'end_column_right'));
     100            add_shortcode('ezcol_end_left', array(&$this, 'end_column_left'));
     101            add_shortcode('ezcol_end_both', array(&$this, 'end_column_both'));
    99102
    100103            // add to tinyMCE, include the window.php file
    … …  
    109112        } // end function EasyColumns
    110113
    111         function wpcol_one_half($atts, $content = null) {
    112             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-half') . '>'.$this->wpcol_strip_autop($content).'</div>';
    113         }
    114 
    115         function wpcol_one_half_end($atts, $content = null) {
    116             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-half ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    117         }
    118 
    119         function wpcol_one_third($atts, $content = null) {
    120             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-third') . '>'.$this->wpcol_strip_autop($content).'</div>';
    121         }
    122 
    123         function wpcol_one_third_end($atts, $content = null) {
    124           return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-third ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    125         }
    126 
    127         function wpcol_two_third($atts, $content = null) {
    128           return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-third') . '>'.$this->wpcol_strip_autop($content).'</div>';
    129         }
    130 
    131         function wpcol_two_third_end($atts, $content = null) {
    132             return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-third ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    133         }
    134 
    135         function wpcol_one_quarter($atts, $content = null) {
    136             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-quarter') . '>'.$this->wpcol_strip_autop($content).'</div>';
    137         }
    138 
    139         function wpcol_one_quarter_end($atts, $content = null) {
    140             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-quarter ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    141         }
    142 
    143         function wpcol_three_quarter($atts, $content = null) {
    144             return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-quarter') . '>'.$this->wpcol_strip_autop($content).'</div>';
    145         }
    146 
    147         function wpcol_three_quarter_end($atts, $content = null) {
    148             return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-quarter ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    149         }
    150 
    151         function wpcol_one_fifth($atts, $content = null) {
    152             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    153         }
    154 
    155         function wpcol_one_fifth_end($atts, $content = null) {
    156             return '<div' . $this->wpcol_div_atts($atts,'ezcol-one-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    157         }
    158 
    159         function wpcol_two_fifth($atts, $content = null) {
    160             return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    161         }
    162 
    163         function wpcol_two_fifth_end($atts, $content = null) {
    164             return '<div' . $this->wpcol_div_atts($atts,'ezcol-two-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    165         }
    166 
    167         function wpcol_three_fifth($atts, $content = null) {
    168             return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    169         }
    170 
    171         function wpcol_three_fifth_end($atts, $content = null) {
    172             return '<div' . $this->wpcol_div_atts($atts,'ezcol-three-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    173         }
    174 
    175         function wpcol_four_fifth($atts, $content = null) {
    176             return '<div' . $this->wpcol_div_atts($atts,'ezcol-four-fifth') . '>'.$this->wpcol_strip_autop($content).'</div>';
    177         }
    178 
    179         function wpcol_four_fifth_end($atts, $content = null) {
    180             return '<div' . $this->wpcol_div_atts($atts,'ezcol-four-fifth ezcol-last') . '>'.$this->wpcol_strip_autop($content).'</div>'.$this->wpcol_add_divider();
    181         }
    182 
    183         function wpcol_div($atts, $content = null) {
    184             return '<div' . $this->wpcol_div_atts($atts,'') . '>' . $this->wpcol_strip_autop($content) . '</div>';
    185         }
    186 
    187         function wpcol_add_divider(){
     114        function one_half($atts, $content = null) {
     115            return '<div' . $this->div_atts($atts,'ezcol-one-half') . '>'.$this->strip_autop($content).'</div>';
     116        }
     117
     118        function one_half_end($atts, $content = null) {
     119            return '<div' . $this->div_atts($atts,'ezcol-one-half ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     120        }
     121
     122        function one_third($atts, $content = null) {
     123            return '<div' . $this->div_atts($atts,'ezcol-one-third') . '>'.$this->strip_autop($content).'</div>';
     124        }
     125
     126        function one_third_end($atts, $content = null) {
     127          return '<div' . $this->div_atts($atts,'ezcol-one-third ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     128        }
     129
     130        function two_third($atts, $content = null) {
     131          return '<div' . $this->div_atts($atts,'ezcol-two-third') . '>'.$this->strip_autop($content).'</div>';
     132        }
     133
     134        function two_third_end($atts, $content = null) {
     135            return '<div' . $this->div_atts($atts,'ezcol-two-third ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     136        }
     137
     138        function one_quarter($atts, $content = null) {
     139            return '<div' . $this->div_atts($atts,'ezcol-one-quarter') . '>'.$this->strip_autop($content).'</div>';
     140        }
     141
     142        function one_quarter_end($atts, $content = null) {
     143            return '<div' . $this->div_atts($atts,'ezcol-one-quarter ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     144        }
     145
     146        function three_quarter($atts, $content = null) {
     147            return '<div' . $this->div_atts($atts,'ezcol-three-quarter') . '>'.$this->strip_autop($content).'</div>';
     148        }
     149
     150        function three_quarter_end($atts, $content = null) {
     151            return '<div' . $this->div_atts($atts,'ezcol-three-quarter ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     152        }
     153
     154        function one_fifth($atts, $content = null) {
     155            return '<div' . $this->div_atts($atts,'ezcol-one-fifth') . '>'.$this->strip_autop($content).'</div>';
     156        }
     157
     158        function one_fifth_end($atts, $content = null) {
     159            return '<div' . $this->div_atts($atts,'ezcol-one-fifth ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     160        }
     161
     162        function two_fifth($atts, $content = null) {
     163            return '<div' . $this->div_atts($atts,'ezcol-two-fifth') . '>'.$this->strip_autop($content).'</div>';
     164        }
     165
     166        function two_fifth_end($atts, $content = null) {
     167            return '<div' . $this->div_atts($atts,'ezcol-two-fifth ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     168        }
     169
     170        function three_fifth($atts, $content = null) {
     171            return '<div' . $this->div_atts($atts,'ezcol-three-fifth') . '>'.$this->strip_autop($content).'</div>';
     172        }
     173
     174        function three_fifth_end($atts, $content = null) {
     175            return '<div' . $this->div_atts($atts,'ezcol-three-fifth ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     176        }
     177
     178        function four_fifth($atts, $content = null) {
     179            return '<div' . $this->div_atts($atts,'ezcol-four-fifth') . '>'.$this->strip_autop($content).'</div>';
     180        }
     181
     182        function four_fifth_end($atts, $content = null) {
     183            return '<div' . $this->div_atts($atts,'ezcol-four-fifth ezcol-last') . '>'.$this->strip_autop($content).'</div>'.$this->add_divider();
     184        }
     185
     186        function div($atts, $content = null) {
     187            return '<div' . $this->div_atts($atts,'') . '>' . $this->strip_autop($content) . '</div>';
     188        }
     189
     190        function add_divider(){
    188191            return '<div class="ezcol-divider"></div>';
    189192        }
    190193
    191         function wpcol_end_column_left($atts, $content = null) {
     194        function end_column_left($atts, $content = null) {
    192195           return '<div class="ezcol-left"></div>';
    193196        }
    194197
    195         function wpcol_end_column_right($atts, $content = null) {
     198        function end_column_right($atts, $content = null) {
    196199           return '<div  class="ezcol-right"></div>';
    197200        }
    198201
    199         function wpcol_end_column_both($atts, $content = null) {
     202        function end_column_both($atts, $content = null) {
    200203           return '<div class="ezcol-both"></div>';
    201204        }
    202205
    203         function wpcol_div_atts($atts,$col_type) {
     206        function div_atts($atts,$col_type) {
    204207            extract(shortcode_atts(array('id' => '','class' => '','style' => ''),$atts));
    205 
    206             $att_str = ' class="';
    207             if($col_type != ''){
    208                 $att_str .= $col_type;
    209             }
    210             if($col_type != '' && $class != ''){
    211                 $att_str .= ' ';
    212             }
    213             if($class != ''){
    214                 $att_str .= $class;
    215             }
     208            $att_str = ' class="ezcol';
     209            $att_str .= (!empty($col_type))? ' '.$col_type : '';
     210            $att_str .= (!empty($col_type) && !empty($class))? ' ' : '';
     211            $att_str .= (!empty($class))? $class : '';
    216212            $att_str .= '"';
    217             if($id != ''){
    218                 $att_str .= ' id="' . $id . '"';
    219             }
    220             if($style != ''){
    221                 $att_str .= ' style="' . $style . '"';
    222             }
     213            $att_str .= (!empty($id))? ' id="'.$id.'"' : '';
     214            $att_str .= (!empty($style))? ' style="'.$style.'"' : '';
    223215            return $att_str;
    224216        }
    225217
    226         function wpcol_strip_autop($content){
     218        function strip_autop($content){
    227219            $content = do_shortcode(shortcode_unautop( $content ));
    228220            $content = preg_replace('#^<\/p>|^<br \/>|<p>$#', '', $content);
    … …  
    230222        }
    231223
    232         function wpcol_add_css(){
     224        function add_css(){
    233225        ?>
    234226            <!-- Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> by Pat Friedl http://www.patrickfriedl.com -->
    235             <link rel="stylesheet" href="<?php echo EZC_PLUGIN_URL; ?>/css/easy-columns.css?<?php echo time();?>" type="text/css" media="screen, projection" />
     227            <link rel="stylesheet" href="<?php echo EZC_PLUGIN_URL; ?>/css/easy-columns.css" type="text/css" media="screen, projection" />
    236228            <?php
    237229            if($this->use_custom)
    … …  
    319311                    ?>
    320312                    </style>
    321                     <!-- End Easy Columns 1.2.1 Custom CSS -->
     313                    <!-- End Easy Columns <?php echo EZC_PLUGIN_VERSION; ?> Custom CSS -->
    322314                    <?php
    323315                }
    324316            } // end if($this->use_custom)
    325         }// end wpcol_add_css
     317        }// end add_css
    326318
    327319        // begin functions for adding plugin to tinyMCE
    … …  
    484476// set up actions and filters
    485477if (isset($ez_columns)) {
    486     add_action('wp_head', array(&$ez_columns, 'wpcol_add_css'), 100);
    487478    if (function_exists('register_uninstall_hook'))
    488479    {

  • easy-columns/trunk/readme.txt

    r763417 r767230  
    55Requires at least: 2.7
    66Tested up to: 3.6
    7 Stable tag: 2.1
     7Stable tag: 2.1.1
    88
    99Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages (or even posts!) just the way you need them.
    … …  
    113113== Changelog ==
    114114
     115= 2.1.1 =
     116* Added parent class to keep content max-wisth at 100% to prevent overflow
     117* fixed fractional display of text in columns (removed CSS3 text enhancements)
     118* Added full integration for responsive design at 768 and 480 pixel widths - now 100% responsive!
     119* More code optimization and tweaking
     120
    115121= 2.1 =
    116122* Upgraded visual editor window to WP 3.6 compliance
Note: See TracChangeset for help on using the changeset viewer.