From 87183f9ddaf1955a3ed5243fa7fa76d03771e3bc Mon Sep 17 00:00:00 2001 From: kiballion Date: Wed, 9 Dec 2015 21:06:43 +0200 Subject: [PATCH] v2.3 - added VC elements --- class.vc.php | 800 ++++++++++ css/render.css.php | 7 +- css/style.css | 1379 +++++------------ css/style.scss | 45 +- css/vc-icon.css | 7 + curly-extension.php | 441 +----- js/main.js | 4 + js/min/main-min.js | 2 +- .../simple-text-rotator.php | 2 +- shortcodes/abbr.php | 2 +- shortcodes/accordion.php | 6 +- shortcodes/action.php | 23 +- shortcodes/agenda.php | 3 +- shortcodes/boxes.php | 12 +- shortcodes/buttons.php | 2 +- shortcodes/client-list.php | 2 +- shortcodes/columns.php | 4 +- shortcodes/dividers.php | 12 +- shortcodes/fullwidth.php | 2 +- shortcodes/highlight.php | 2 +- shortcodes/lists.php | 4 +- shortcodes/map-maker.php | 2 +- shortcodes/marker.php | 2 +- shortcodes/person.php | 9 +- shortcodes/photo-frame.php | 2 +- shortcodes/pretty-photo.php | 2 +- shortcodes/pricing.php | 22 +- shortcodes/quotes.php | 4 +- shortcodes/slider-ios.php | 2 +- shortcodes/slider-roundabout.php | 2 +- shortcodes/slider.php | 4 +- shortcodes/tabs.php | 82 +- shortcodes/testimonials.php | 2 +- shortcodes/toggle-box.php | 3 +- 34 files changed, 1373 insertions(+), 1526 deletions(-) create mode 100644 class.vc.php create mode 100644 css/vc-icon.css diff --git a/class.vc.php b/class.vc.php new file mode 100644 index 0000000..d8bb80c --- /dev/null +++ b/class.vc.php @@ -0,0 +1,800 @@ + __("Person", "CURLYTHEME"), + "base" => "person", + "content_element" => true, + "icon" => "curly_icon", + "class" => '', + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "textfield", + "heading" => __("Person Name", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6', + "holder" => "div", + "param_name" => "name" + ), + array( + "type" => "textfield", + "heading" => __("Position", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "position" + ), + array( + "type" => "textfield", + "heading" => __("E-mail", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-3 vc_column', + "param_name" => "email" + ), + array( + "type" => "textfield", + "heading" => __("Facebook", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-3 vc_column', + "param_name" => "facebook" + ), + array( + "type" => "textfield", + "heading" => __("Twitter", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-3 vc_column', + "param_name" => "twitter" + ), + array( + "type" => "textfield", + "heading" => __("LinkedIn", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-3 vc_column', + "param_name" => "linkedin" + ), + array( + "type" => "attach_image", + "heading" => __("Image", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "picture" + ), + array( + 'type' => 'checkbox', + 'heading' => __("Small Pictures?", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'style', + 'value' => array( __( 'Yes', 'CURLYTHEME' ) => 'mini' ) + ), + array( + "type" => "textarea_html", + "heading" => __("Extra Description", "CURLYTHEME"), + "param_name" => "content" + ) + ) + ) + ); + } + + + /** Accordion */ + public function add_accordion() { + + /** Accordion */ + vc_map( array( + "name" => __("Accordion", "CURLYTHEME"), + "base" => "accordion", + "as_parent" => array( 'only' => 'toggle' ) , + "content_element" => true, + 'is_container' => true, + "show_settings_on_create" => false, + "admin_enqueue_css" => array( plugins_url( '/css/vc-icon.css' , __FILE__ ) ), + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "js_view" => 'VcColumnView' + ) ); + + /** Toggle */ + vc_map( array( + "name" => __("Toggle", "CURLYTHEME"), + "base" => "toggle", + "as_child" => array( 'only' => 'accordion' ) , + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + "holder" => "div", + "param_name" => "title" + ), + array( + "type" => "checkbox", + "heading" => __("Opened", "CURLYTHEME"), + "param_name" => "opened" + ), + array( + "type" => "textarea_html", + "heading" => __("Content", "CURLYTHEME"), + "holder" => "div", + "param_name" => "content" + ), + ) + ) ); + } + + + + /** Action */ + public function add_action() { + + vc_map( array( + "name" => __("Action", "CURLYTHEME"), + "base" => "call2action", + "as_parent" => array( 'only' => 'vc_column_text' ), + "content_element" => true, + 'is_container' => true, + "show_settings_on_create" => false, + "admin_enqueue_css" => array( plugins_url( '/css/vc-icon.css' , __FILE__ ) ), + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6', + "param_name" => "title" + ), + array( + "type" => "textfield", + "heading" => __("Button", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "button_vc" + ), + array( + "type" => "textfield", + "heading" => __("Link", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "link" + ), + array( + 'type' => 'dropdown', + 'heading' => __("Box Style", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'style', + 'value' => array( 1, 2, 3, 4, 5 ) + ) + ), + "js_view" => 'VcColumnView' + ) ); + + } + + + + + /** Agenda */ + public function add_agenda() { + + vc_map( array( + "name" => __("Agenda", "CURLYTHEME"), + "base" => "agenda", + "as_parent" => array( 'only' => 'event_day,event' ), + "content_element" => true, + 'is_container' => true, + "show_settings_on_create" => false, + "admin_enqueue_css" => array( plugins_url( '/css/vc-icon.css' , __FILE__ ) ), + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "js_view" => 'VcColumnView' + ) ); + + vc_map( array( + "name" => __("Event Day", "CURLYTHEME"), + "base" => "event_day", + "as_child" => array( 'only' => 'agenda' ) , + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "textfield", + "heading" => __("Date", "CURLYTHEME"), + "holder" => "div", + "param_name" => "date" + ), + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + "param_name" => "content" + ), + ) + ) ); + + vc_map( array( + "name" => __("Event", "CURLYTHEME"), + "base" => "event", + "as_child" => array( 'only' => 'agenda' ), + "as_parent" => array( 'only' => 'vc_column_text,curly_toggle_box' ), + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "textfield", + "heading" => __("Time", "CURLYTHEME"), + "param_name" => "time" + ), + array( + "type" => "textfield", + "heading" => __("Room", "CURLYTHEME"), + "param_name" => "room" + ) + ), + "js_view" => 'VcColumnView' + ) ); + + } + + + + /** Add Alerts */ + function add_alert(){ + + vc_map( array( + "name" => __("Alert", "CURLYTHEME"), + "base" => "alert", + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + 'type' => 'dropdown', + 'heading' => __("Color", 'CURLYTHEME'), + 'param_name' => 'color', + 'value' => array( + __( 'Green', 'CURLYTHEME' ) => 'green', + __( 'Blue', 'CURLYTHEME' ) => 'blue', + __( 'Red', 'CURLYTHEME' ) => 'red', + __( 'Orange', 'CURLYTHEME' ) => 'orange', + ) + ), + array( + "type" => "textarea_html", + "heading" => __("Content", "CURLYTHEME"), + "holder" => "div", + "param_name" => "content" + ), + ) + ) ); + + } + + + + /** Add Boxes */ + function add_box(){ + + vc_map( array( + "name" => __("Box", "CURLYTHEME"), + "base" => "box", + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6', + "param_name" => "title" + ), + array( + "type" => "textfield", + "heading" => __("Icon", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "icon" + ), + array( + "type" => "colorpicker", + "heading" => __("Background", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "background" + ), + array( + 'type' => 'dropdown', + 'heading' => __("Box Style", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'style', + 'value' => array( 1, 2, 3, 4, 5 ) + ), + array( + "type" => "textarea_html", + "heading" => __("Content", "CURLYTHEME"), + "holder" => "div", + "param_name" => "content" + ), + ) + ) ); + + } + + + + /** Add Button */ + function add_button(){ + + vc_map( array( + "name" => __("Button", "CURLYTHEME"), + "base" => "button", + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6', + "param_name" => "title" + ), + array( + "type" => "textfield", + "heading" => __("Label", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "content" + ), + array( + "type" => "textfield", + "heading" => __("Link", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "link" + ), + array( + 'type' => 'dropdown', + 'heading' => __("Size", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'style', + 'value' => array( __( 'Normal', 'CURLYTHEME' ) => 'normal', __( 'Mini', 'CURLYTHEME' ) => 'mini', __( 'Small', 'CURLYTHEME' ) => 'small', __( 'Large', 'CURLYTHEME' ) => 'large' ) + ), + array( + 'type' => 'dropdown', + 'heading' => __("Color", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'color', + 'value' => array( __( 'Red', 'CURLYTHEME' ) => 'red', __( 'Green', 'CURLYTHEME' ) => 'green', __( 'Blue', 'CURLYTHEME' ) => 'blue', __( 'Violet', 'CURLYTHEME' ) => 'violet', __( 'Navy', 'CURLYTHEME' ) => 'navy', __( 'Gray', 'CURLYTHEME' ) => 'gray' ) + ), + array( + 'type' => 'dropdown', + 'heading' => __("Target", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'target', + 'value' => array( '_self', '_blank' ) + ), + array( + "type" => "textfield", + "heading" => __("Rel Attribute", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "rel" + ), + array( + "type" => "textfield", + "heading" => __("Class", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + "param_name" => "class" + ), + ) + ) ); + + } + + + + + /** Add Countdown */ + function add_countdown(){ + + vc_map( array( + "name" => __("Countdown", "CURLYTHEME"), + "base" => "countdown", + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "dropdown", + "heading" => __("Year", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-2', + "param_name" => "year", + "value" => array( date("Y"), date("Y") + 1, date("Y") + 2, date("Y") + 3 ) + ), + array( + "type" => "dropdown", + "heading" => __("Month", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-2', + "param_name" => "month", + "value" => range( 1, 12 ) + ), + array( + "type" => "dropdown", + "heading" => __("Day", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-2', + "param_name" => "day", + 'value' => range( 1, 31 ) + ), + array( + 'type' => 'dropdown', + 'heading' => __("Hour", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-2', + 'param_name' => 'hour', + 'value' => range( 0, 23 ) + ), + array( + 'type' => 'dropdown', + 'heading' => __("Minutes", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-2 vc_column', + 'param_name' => 'minutes', + 'value' => range( 0, 59 ) + ), + array( + 'type' => 'dropdown', + 'heading' => __("Language", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'lang', + 'value' => array( 'en', 'ar', 'bg', 'bn', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'es', 'et', 'fa', 'fi', 'fr', 'gl', 'gu', 'he', 'hr', 'hu', 'hy', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'ms', 'my', 'nb', 'nl', 'pl', 'pt-BR', 'ro', 'ru', 'sk', 'sl', 'sq', 'sr-SR', 'sr', 'sv', 'th', 'tr', 'uk', 'uz', 'vi', 'zh-CN', 'zh-TW' ) + ), + array( + 'type' => 'dropdown', + 'heading' => __("Alignment", 'CURLYTHEME'), + 'edit_field_class' => 'vc_col-sm-6 vc_column', + 'param_name' => 'align', + 'value' => array( 'left', 'center', 'right' ) + ) + ) + ) ); + + } + + + + /** Add Dividers */ + function add_dividers(){ + + vc_map( array( + "name" => __("Divider", "CURLYTHEME"), + "base" => "divider", + "content_element" => true, + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "textfield", + "heading" => __("Space Before", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-4', + "param_name" => "before" + ), + array( + "type" => "textfield", + "heading" => __("Space After", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-4', + "param_name" => "after", + 'value' => 40 + ), + array( + "type" => "dropdown", + "heading" => __("Style", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-4', + "param_name" => "year", + "value" => range( 1,5 ) + ), + ) + ) ); + + } + + + /** Add Toggle Box */ + public function add_toggle(){ + + vc_map( array( + "name" => __("Toggle Box", "CURLYTHEME"), + "base" => "curly_toggle_box", + "content_element" => true, + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + "holder" => "div", + "param_name" => "title" + ), + array( + "type" => "textarea_html", + "heading" => __("Content", "CURLYTHEME"), + "param_name" => "content" + ), + ) + ) ); + + } + + + + /** Tabs */ + public function add_tabs() { + + /** Tabs */ + vc_map( array( + "name" => __("Tabs", "CURLYTHEME"), + "base" => "curly_tabs", + "as_parent" => array( 'only' => 'curly_tab' ) , + "content_element" => true, + 'is_container' => true, + "show_settings_on_create" => false, + "admin_enqueue_css" => array( plugins_url( '/css/vc-icon.css' , __FILE__ ) ), + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "js_view" => 'VcColumnView' + ) ); + + /** Tab */ + vc_map( array( + "name" => __("Tab", "CURLYTHEME"), + "base" => "curly_tab", + "as_child" => array( 'only' => 'curly_tabs' ) , + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + "holder" => "div", + "param_name" => "title" + ), + array( + "type" => "textarea_html", + "heading" => __("Content", "CURLYTHEME"), + "param_name" => "content" + ), + ) + ) ); + } + + + + + /** Pricing Table */ + public function add_pricing() { + + vc_map( array( + "name" => __("Pricing Table", "CURLYTHEME"), + "base" => "curly_pricing_table", + "as_parent" => array( 'only' => 'curly_pricing_column' ), + "content_element" => true, + 'is_container' => true, + "show_settings_on_create" => false, + "admin_enqueue_css" => array( plugins_url( '/css/vc-icon.css' , __FILE__ ) ), + "icon" => "curly_icon", + "category" => __('Curly Themes Extension', "CURLYTHEME"), + "js_view" => 'VcColumnView' + ) ); + + vc_map( array( + "name" => __("Pricing Column", "CURLYTHEME"), + "base" => "curly_pricing_column", + "as_child" => array( 'only' => 'curly_pricing_table' ) , + "as_parent" => array( 'only' => 'curly_pricing_header,curly_pricing_row,curly_pricing_footer' ) , + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "dropdown", + "heading" => __("Size", "CURLYTHEME"), + "param_name" => "size", + 'edit_field_class' => 'vc_col-sm-6', + 'value' => array( '1/4', '1/3', '1/2' ) + ), + array( + 'type' => 'checkbox', + 'heading' => __("Highlight Column", "CURLYTHEME"), + 'param_name' => 'highlight', + 'edit_field_class' => 'vc_col-sm-6', + ) + ), + "js_view" => 'VcColumnView' + ) ); + + vc_map( array( + "name" => __("Header", "CURLYTHEME"), + "base" => "curly_pricing_header", + "as_child" => array( 'only' => 'curly_pricing_column' ) , + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "textfield", + "heading" => __("Title", "CURLYTHEME"), + "holder" => "div", + "param_name" => "content" + ), + array( + "type" => "textfield", + "heading" => __("Currency", "CURLYTHEME"), + "holder" => "span", + 'edit_field_class' => 'vc_col-sm-4 vc_column', + "param_name" => "currency" + ), + array( + "type" => "textfield", + "heading" => __("Price", "CURLYTHEME"), + "holder" => "span", + 'edit_field_class' => 'vc_col-sm-4 vc_column', + "param_name" => "price" + ), + array( + "type" => "textfield", + "heading" => __("Frequency", "CURLYTHEME"), + 'edit_field_class' => 'vc_col-sm-4 vc_column', + "param_name" => "frequency" + ), + ) + ) ); + + vc_map( array( + "name" => __("Row", "CURLYTHEME"), + "base" => "curly_pricing_row", + "as_child" => array( 'only' => 'curly_pricing_column' ) , + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "params" => array( + array( + "type" => "textarea_html", + "holder" => "div", + "heading" => __("Content", "CURLYTHEME"), + "param_name" => "content" + ), + ) + ) ); + + vc_map( array( + "name" => __("Footer", "CURLYTHEME"), + "base" => "curly_pricing_footer", + "as_child" => array( 'only' => 'curly_pricing_column' ) , + "as_parent" => array( 'only' => 'button,vc_btn' ), + "content_element" => true, + 'is_container' => true, + "icon" => "curly_icon", + "js_view" => 'VcColumnView' + ) ); + + } + + + + + /* !Constructors */ + + /** Construct Single Image */ + function construct_single_image(){ + + vc_add_param( 'vc_single_image', + array( + 'type' => 'checkbox', + 'heading' => __("Add Photo Stack Effect", "CURLYTHEME"), + 'param_name' => 'photo_frame', + 'weight' => 1 + ) + ); + + vc_add_param( 'vc_single_image', + array( + 'type' => 'checkbox', + 'heading' => __("Add Zoomify Effect", "CURLYTHEME"), + 'param_name' => 'zoomify', + 'weight' => 2 + ) + ); + + } + + + + /* !Filters */ + + /** Filter Single Image */ + function filter_single_image_atts( $out, $pairs, $atts ){ + + if( isset( $out['photo_frame'] ) && filter_var( $out['photo_frame'], FILTER_VALIDATE_BOOLEAN ) === true ) + $out['el_class'] = $out['el_class'] . ' photo-frame'; + + if( isset( $out['zoomify'] ) && filter_var( $out['zoomify'], FILTER_VALIDATE_BOOLEAN ) === true ){ + + if( ! wp_script_is('curly-picture-zoom' ) ) { + + wp_enqueue_script('curly-picture-zoom'); + + } + + $out['el_class'] = $out['el_class'] . ' zoom-picture-container photo-frame'; + + } + + return $out; + + } + + + } + + /** Initialize the Class */ + new CurlyExtensionVisualComposer; + + /** Check if Visual Composer is Activated */ + if ( defined( 'WPB_VC_VERSION' ) ) { + + } + + add_action( 'admin_init', 'curly_extenders' ); + + function curly_extenders(){ + + /** Extend Classes */ + if ( class_exists( 'WPBakeryShortCodesContainer' ) ) { + class WPBakeryShortCode_accordion extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_call2action extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_agenda extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_event extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_curly_tabs extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_curly_pricing_table extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_curly_pricing_column extends WPBakeryShortCodesContainer {} + class WPBakeryShortCode_curly_pricing_footer extends WPBakeryShortCodesContainer {} + } + if ( class_exists( 'WPBakeryShortCode' ) ) { + class WPBakeryShortCode_toggle extends WPBakeryShortCode {} + class WPBakeryShortCode_event_day extends WPBakeryShortCode {} + class WPBakeryShortCode_curly_tab extends WPBakeryShortCode {} + class WPBakeryShortCode_curly_header extends WPBakeryShortCode {} + class WPBakeryShortCode_curly_row extends WPBakeryShortCode {} + + } + + } + + +?> \ No newline at end of file diff --git a/css/render.css.php b/css/render.css.php index 45bed2e..5d70de1 100644 --- a/css/render.css.php +++ b/css/render.css.php @@ -63,7 +63,8 @@ /* Shortcodes - Accordion ================================================= */ - $curly_css_output .= '.panel{ + $curly_css_output .= ' + .panel{ border-bottom: 1px solid '.$curly_color_text->opacity(0.15).'; } footer .panel{ @@ -78,14 +79,14 @@ .btn:focus, input[type="button"], input[type="submit"], - .button{ + .button:not(.wc-forward){ background: '.$curly_color_primary.'; color: '.$curly_color_primary->contrast().'; } .btn:hover, input[type="button"]:hover, input[type="submit"]:hover, - .button:hover{ + .button:not(.wc-forward):hover{ background: '.$curly_color_primary->darken().'; color: '.$curly_color_primary->contrast().'; }'; diff --git a/css/style.css b/css/style.css index 393a0a2..c2a2433 100644 --- a/css/style.css +++ b/css/style.css @@ -1,1010 +1,373 @@ @charset "UTF-8"; -/** - * Table of Contents: - * - * 8.0 - Shortcodes - * 8.1 - Accordion - * 8.2 - Slider - * 8.3 - Action Boxes - * 8.4 - Lists - * 8.5 - Buttons - * 8.6 - Toggle Box - * 8.7 - Clients Slider - * 8.8 - Columns - * 8.9 - Dividers - * 8.10 - Boxes - * 8.11 - Tabs - * 8.12 - Marker - * 8.13 - Drop cap - * 8.14 - Person - * 8.15 - Icons - * 8.16 - Zoomify - * 8.17 - Blockquote - * 8.18 - Testimonials - * 8.19 - Map Maker - * 8.20 - Pricing Table - * 8.21 - Event Agenda - * 8.22 - Countdown - * 8.23 - Alerts - * 8.24 - Progress Bar - * 8.25 - Full Width - * ----------------------------------------------------------------------------- - */ +/** Table of Contents: 8.0 - Shortcodes 8.1 - Accordion 8.2 - Slider 8.3 - Action Boxes 8.4 - Lists 8.5 - Buttons 8.6 - Toggle Box 8.7 - Clients Slider 8.8 - Columns 8.9 - Dividers 8.10 - Boxes 8.11 - Tabs 8.12 - Marker 8.13 - Drop cap 8.14 - Person 8.15 - Icons 8.16 - Zoomify 8.17 - Blockquote 8.18 - Testimonials 8.19 - Map Maker 8.20 - Pricing Table 8.21 - Event Agenda 8.22 - Countdown 8.23 - Alerts 8.24 - Progress Bar 8.25 - Full Width ----------------------------------------------------------------------------- */ /* Photo Frame */ -.photo-frame { - position: relative; - box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); - border: 4px solid #fff; - display: block; } - .photo-frame::before { - content: ""; - height: 100%; - width: 100%; - background: #fff; - border: 4px solid #fff; - position: absolute; - z-index: -1; - top: -5px; - left: -10px; - box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); - border-radius: 3px; - -webkit-transform: rotate(-2deg); - -ms-transform: rotate(-2deg); - transform: rotate(-2deg); - box-sizing: border-box; } - .photo-frame::after { - content: ""; - height: 100%; - width: 100%; - background: #fff; - border: 4px solid #fff; - position: absolute; - z-index: -1; - bottom: -3px; - right: -5px; - box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); - border-radius: 3px; - -webkit-transform: rotate(3deg); - -ms-transform: rotate(3deg); - transform: rotate(3deg); - box-sizing: border-box; } - .photo-frame img { - border-radius: 0; } - -/** - * 8.0 - Shortcodes - * ----------------------------------------------------------------------------- - */ -/** - * 8.1 - Accordion - * ----------------------------------------------------------------------------- - */ -.panel { - background: transparent; - margin: 0 !important; } - -.panel .accordion-toggle { - display: block; } - -.panel .accordion-toggle:before { - content: '\F056'; - font-family: 'FontAwesome'; - float: left; - margin-right: 10px; - font-weight: normal; - font-size: 14px; } - -.panel .accordion-toggle.collapsed:before { - content: '\F055' !important; } - -.panel-heading h6 { - line-height: 3em; } -.panel-heading a { - text-decoration: none; } - -.panel-body { - padding-bottom: 1rem; } - -.panel-group { - margin: 1.4rem 0; } - -/** - * 8.2 - Slider - * ----------------------------------------------------------------------------- - */ -.carousel { - margin-bottom: 20px; } - -.carousel-control { - width: 40px; - height: 40px; - line-height: 35px; - font-size: 45px; - border-radius: 300px; - display: none; } - -.carousel:hover .carousel-control { - display: block; } - -/** - * 8.3 - Action Boxes - * ----------------------------------------------------------------------------- - */ -.action-box { - padding: 20px; - margin: 0 0 20px 0; - border-radius: 3px; } - -.action-box h3 { - margin-top: 0; - margin-bottom: 10px; - line-height: 1em; } - -.action-box .btn:first-child { - float: right; } - -.action-box p:last-of-type { - margin-bottom: 0; } - -.action-box .btn:last-of-type { - margin-top: 20px; } - -.action-box.style-1 { - background: transparent; - border-width: 1px; - border-top-width: 3px; - border-style: solid; } - -.action-box.style-2 { - border-left-width: 3px; - border-left-style: solid; } - -.action-box.style-3 { - border-width: 3px; - border-style: solid; } - -.action-box.style-4 { - background: transparent; - border-width: 3px; - border-style: solid; } - -.action-box.style-5 { - background: transparent; - border-width: 1px; - border-style: solid; } - -/** - * 8.4 - Lists - * ----------------------------------------------------------------------------- - */ -.list-none ul { - list-style: none; - padding: 0 !important; } - -.list-none li { - margin-bottom: 0.5em; } - -*[class*='list-'] ul { - list-style: none; - padding: 0 0 0 20px; } - -*[class*='list-'] li:before { - font-family: 'FontAwesome'; - font-size: 14px; - margin: 0 10px 0 0; - display: inline-block; } - -.list-bullets ul, -.list-circle ul, -.list-square ul, -.list-crosslist ul, -.list-checklist ul, -.list-default-list ul { - padding: 0; } - -.list-bullets li:before { - content: '\F111'; } - -.list-circle li:before { - content: ""; } - -.list-square li:before { - content: ""; } - -.list-crosslist li:before { - content: ""; } - -.list-checklist li:before { - content: '\F00C'; } - -.list-default-list li:before { - content: '\F178'; } - -.list-bullets li, -.list-circle li, -.list-square li, -.list-crosslist li, -.list-checklist li, -.list-default-list li { - padding-bottom: 0.5em; } - -/** - * 8.5 - Buttons - * ----------------------------------------------------------------------------- - */ -.btn, -input[type="button"], -input[type="submit"] { - border: none; - text-shadow: none; - border-radius: 3px; - outline: none !important; } - -.btn.btn-red { - color: #FFF; - background: #e74c3c; } - -.btn.btn-red:hover { - color: #FFF; - background: #c0392b; } - -.btn.btn-green { - color: #FFF; - background: #2ecc71; } - -.btn.btn-green:hover { - color: #FFF; - background: #27ae60; } - -.btn.btn-blue { - color: #FFF; - background: #3498db; } - -.btn.btn-blue:hover { - color: #FFF; - background: #2980b9; } - -.btn.btn-violet { - color: #FFF; - background: #9b59b6; } - -.btn.btn-violet:hover { - color: #FFF; - background: #8e44ad; } - -.btn.btn-navy { - color: #FFF; - background: #2c3e50; } - -.btn.btn-navy:hover { - color: #FFF; - background: #34495e; } - -.btn.btn-gray { - color: #FFF; - background: #bdc3c7; } - -.btn.btn-gray:hover { - color: #FFF; - background: #95a5a6; } - -/** - * 8.6 - Toggle Box - * ----------------------------------------------------------------------------- - */ -.toggle-box h6 { - cursor: pointer; - line-height: 1.425em; } - -.toggle-box .collapse { - padding: 0.5rem 0; } - -/** - * 8.7 - Clients Slider - * ----------------------------------------------------------------------------- - */ -.clients-carousel-container { - position: relative; - margin-bottom: 30px; - padding: 0 30px; - box-sizing: border-box; } - -.clients-carousel { - overflow: hidden; - padding: 0; } - -.clients-carousel ul { - margin: 0; - padding: 0; - list-style: none; - height: auto; } - -.caroufredsel_wrapper { - margin: 0 30px; } - -.clients-carousel ul li { - float: left; - text-align: center; - margin: 0; - padding: 0 5px; } - -.clients-carousel ul a { - padding: 1px; - display: block; - overflow: hidden; } - -.clients-carousel img { - -webkit-transition: opacity 160ms ease-in-out; - transition: opacity 160ms ease-in-out; - -webkit-backface-visibility: hidden; - -webkit-transform: rotate(0); - -ms-transform: rotate(0); - transform: rotate(0); - position: relative; - opacity: 0.4; - filter: alpha(opacity=40); } - -.clients-carousel img:hover { - opacity: 1; - filter: alpha(opacity=100); } - -.clients-carousel .next:after, -.clients-carousel .prev:after { - -webkit-transition: opacity 160ms ease-in-out; - transition: opacity 160ms ease-in-out; } - -.clients-carousel-container .controls { - position: absolute; - top: 50%; - margin-top: -12px; - width: 100%; - left: 0; } - -.clients-carousel-container .next, -.clients-carousel-container .prev { - position: absolute; - width: 24px; - height: 24px; - line-height: 24px; - text-align: center; - border-radius: 2px; } - -.clients-carousel-container .next { - right: 0; } - -/** - * 8.8 - Columns - * ----------------------------------------------------------------------------- - */ -.content-column { - float: left; - margin-right: 3.22555%; - margin-bottom: 40px; } - -.content-column.half { - width: 48.387224%; } - -.content-column.one-three { - width: 31.182966%; } - -.content-column.one-four { - width: 22.580837%; } - -.content-column.two-three { - width: 65.591482%; } - -.content-column.two-four { - width: 48.387226%; } - -.content-column.three-four { - width: 74.193611%; } - -.content-column.last { - margin-right: 0 !important; } - -.clear { - clear: both; } - -.clearfix { - clear: none !important; } - -@media (max-width: 992px) { - .content-column { - float: left; - width: 48.387224% !important; } } -@media (max-width: 768px) { - .content-column { - float: none; - width: 100% !important; - margin: 2rem 0 !important; } } -/** - * 8.9 - Dividers - * ----------------------------------------------------------------------------- - */ -.divider { - clear: both; - color: transparent; - height: 20px; - background-position: center center; - margin: 0 0 40px; - background-repeat: no-repeat; - border-bottom: none; } - -/** - * 8.10 - Boxes - * ----------------------------------------------------------------------------- - */ -.well { - padding: 35px 0 0 0; - border: none; - background: transparent; - box-shadow: none; - border-radius: 0px; - margin-bottom: 35px; } - -.well.well-2 { - padding: 0; - border-top: none; } - -.well.well-2 .fa { - margin-right: 10px; } - -.well.well-3 { - text-align: center; - padding: 0; - border-top: none; } - -.well.well-3 .fa { - margin-bottom: 0px; } - -.well.well-4 { - padding: 0 0 0 42px; - border-top: none; - position: relative; } - -.well.well-4 .fa { - position: absolute; - left: 0; } - -.well.well-5 { - text-align: center; - border-top: none; - position: relative; } - -.well.well-5 .fa { - position: absolute; - margin-left: -46px; } - -.well.well-5 > div { - padding: 40px 20px 20px; - margin-top: 40px; - border-radius: 3px; } - -.content-column .well { - margin-bottom: 0; } - -/** - * 8.11 - Tabs - * ----------------------------------------------------------------------------- - */ -.tabs-container { - margin-bottom: 20px; } - -.nav-tabs { - border: none !important; } - -.nav-tabs a { - border: none !important; } - -.nav-tabs .active > a, -.nav-tabs .active > a:hover, -.nav-tabs .active > a:focus { - background-color: transparent; } - -.tab-content { - padding: 20px 0; - margin-top: -2px; } - -.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - border: none; } - -/** - * 8.12 - Marker - * ----------------------------------------------------------------------------- - */ -.label { - font-size: small; } - -/** - * 8.13 - Dropcap - * ----------------------------------------------------------------------------- - */ -.dropcap { - font-size: 40px; - float: left; - line-height: 1em; - min-width: 30px; - font-weight: bold; - display: inline-block; - margin: 0 5px 0px 0; } - -/** - * 8.14 - Person - * ----------------------------------------------------------------------------- - */ -.person.mini { - padding-left: 110px; - position: relative; } - -.person.mini img { - position: absolute; - left: 0; - top: 0; } - -.person img { - margin: 0 20px 20px 0; - width: 90px; - height: 90px; - border-radius: 300px; } - -.person p:first-child img { - border-radius: 300px; - width: 160px; - height: 160px; } - -.person h5 { - margin: 30px 0 0; } - -/** - * 8.15 - Icons - * ----------------------------------------------------------------------------- - */ -/** - * 8.16 - Zoomify - * ----------------------------------------------------------------------------- - */ -.zoom-picture:after { - content: '\F002'; - font-family: 'FontAwesome'; - text-shadow: 0px 0px 3px #000000; - color: #fff; - font-size: 18px; - position: absolute; - top: 10px; - right: 10px; } - -/** - * 8.17 - Blockquote - * ----------------------------------------------------------------------------- - */ -.blockquote { - border: none; - padding: 0 0 0 70px; - position: relative; } - -.blockquote i:before { - float: left; - margin-left: -70px; - display: inline-block; - position: absolute; - font-style: normal; - top: 0; } - -.blockquote img { - border-radius: 300px; - margin: 0 0 10px 10px; - width: 90px; - height: 90px; } - -.blockquote cite:before { - content: '\2014'; - margin-right: 10px; } - -.blockquote cite { - display: block; - font-weight: bold; - margin-top: 10px; } - -/** - * 8.18 - Testimonials - * ----------------------------------------------------------------------------- - */ -.testimonials { - margin-bottom: 20px; } - -.testimonials blockquote { - border-radius: 3px; - padding: 20px 20px 20px 60px; - border: none; - position: relative; - margin: 0; - font-size: 1em; - line-height: 1.4em; } - -.testimonials blockquote p { - font-size: 1em; - line-height: 1.4em; - margin: 0; } - -.testimonials blockquote p + p { - margin-top: 20px; } - -.testimonials blockquote:before { - content: '\F10D'; - font-family: 'FontAwesome'; - font-size: 26px; - line-height: 26px; - margin-left: -40px; - display: inline-block; - position: absolute; } - -.testimonials cite { - padding: 10px 0 10px 60px; - display: block; - font-weight: normal; } - -.testimonials cite:before { - content: '\2014'; - margin-right: 10px; } - -.testimonials blockquote i { - font-size: 30px; } - -.testimonials blockquote i:after, -.testimonials blockquote i:before { - margin: 0 10px 10px 0; } - -/** - * 8.19 - Map Maker - * ----------------------------------------------------------------------------- - */ -.map-container { - position: relative; - z-index: 1; } - -#map_controls { - list-style: none; - position: absolute; - right: 30px; - bottom: 30px; } - -#map_controls li { - margin: 5px; } - -/** - * 8.20 - Pricing Table - * ----------------------------------------------------------------------------- - */ -.wl-pricing-table { - text-align: center; - margin-bottom: 60px; - overflow: hidden; } - -.wl-pricing-table .pricing-footer a { - margin: 0; } - -.wl-pricing-table.light { - padding: 30px 0; } - -.wl-pricing-table.light .content-column { - margin: 0; - padding: 30px; - box-sizing: border-box; } - -.wl-pricing-table.light .half { - width: 50%; } - -.wl-pricing-table.light .one-three { - width: 33.33333%; } - -.wl-pricing-table.light .one-four { - width: 25%; } - -.wl-pricing-table.light .pricing-header { - position: relative; - margin-bottom: 10px; } - -.wl-pricing-table .pricing-header h3 { - margin: 0px 0 10px; } - -.wl-pricing-table h4 { - position: relative; - overflow: hidden; - margin: 0; - padding: 0; - line-height: 1em; } - -.wl-pricing-table h4 * { - position: relative; - font-weight: bold; - font-size: 42px !important; - line-height: 50px; - display: inline-block !important; - padding: 0; - margin: 0; - letter-spacing: -1px; } - -.wl-pricing-table h4 *:after, -.wl-pricing-table h4 *:before { - margin: 0px 15px; - position: absolute; - top: 50%; - content: ''; - width: 200em; - height: 0px; - display: block; } - -.wl-pricing-table h4 *:before { - right: 100%; } - -.wl-pricing-table h4 *:after { - left: 100%; } - -.wl-pricing-table .pricing-header em { - font-style: normal; - text-transform: uppercase; - opacity: 0.8; - font-weight: normal; } - -.wl-pricing-table.light span { - display: block; - padding: 2px 0; - margin-bottom: 10px; } - -.wl-pricing-table.light .pricing-footer { - padding: 30px 0 0; } - -.wl-pricing-table.light .highlight-column { - padding: 50px 30px; - margin-top: -20px; - position: relative; - z-index: 2; - border-radius: 3px; } - -.wl-pricing-table.light .content-column:first-child { - -webkit-border-top-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -moz-border-radius-topleft: 3px; - -moz-border-radius-bottomleft: 3px; - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; } - -.wl-pricing-table.light .content-column:last-child { - -webkit-border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; } - -.wl-pricing-table.light .highlight-column:first-child, .wl-pricing-table.light .highlight-column:last-child { - box-shadow: inset 0px 0px 20px rgba(0, 0, 0, 0.3); } - -.pricing-row h4 { - border-bottom: none; } - .pricing-row h4::after { - display: none; } - -/** - * 8.21 - Event Agenda - * ----------------------------------------------------------------------------- - */ -.event-agenda { - line-height: 1.425em; } - .event-agenda .event-agenda-day { - margin-top: 4rem; } - -.event-agenda-event span { - font-size: 0.9em; } - -.event-agenda .toggle-box { - margin-bottom: 0; } - -.event-agenda .row.event-agenda-day:hover { - background: transparent; } - -.event-agenda p { - margin-bottom: 0; } - -.event-agenda *[class*="col-"] { - padding: 8px 5px; } - -.event-agenda .event-agenda-day span { - line-height: 2em; } - -.event-agenda h3 { - margin: 0; } - -.event-agenda h6 { - margin: 0 0 0; } - -.event-agenda h6 + div.in { - margin: 0 0 0; } - -.event-agenda-event i.fa-clock-o { - margin-right: 5px; } - -.event-agenda-event i.fa-map-marker { - margin-left: 5px; } - -.event-agenda-day i.fa-calendar { - margin-right: 5px; } - -/** - * 8.22 - Countdown - * ----------------------------------------------------------------------------- - */ -.curly-counter { - margin-bottom: 20px; } - -#counter > div { - display: inline-block; - padding-right: 6%; - width: 20.5%; - max-width: 100px; - box-sizing: content-box; } - -#counter > div:last-child { - padding-right: 0; } - -.countdown_descr { - display: block; - border-top-style: solid; - border-top-width: 1px; - padding-top: 7px; } - -.countdown_amount { - font-size: 44px; - font-weight: bold; - padding-bottom: 7px; - display: block; - line-height: 44px; - height: auto; } - -/** - * 8.23 - Alerts - * ----------------------------------------------------------------------------- - */ -.alert .fa { - background: transparent; - border: none; - padding: 0; - margin: 0 0 30px 30px; - float: right; - outline: none; } - -.alert h1, -.alert h2, -.alert h3, -.alert h4, -.alert h5, -.alert h6 { - margin-bottom: 0; - margin-top: 10px; } - -.alert.alert-warning h1, -.alert.alert-warning h2, -.alert.alert-warning h3, -.alert.alert-warning h4, -.alert.alert-warning h5, -.alert.alert-warning h6, -.alert.alert-warning .fa::before { - color: #C09853; } - -.alert.alert-success h1, -.alert.alert-success h2, -.alert.alert-success h3, -.alert.alert-success h4, -.alert.alert-success h5, -.alert.alert-success h6, -.alert.alert-success .fa::before { - color: #468847; } - -.alert.alert-info h1, -.alert.alert-info h2, -.alert.alert-info h3, -.alert.alert-info h4, -.alert.alert-info h5, -.alert.alert-info h6, -.alert.alert-info .fa::before { - color: #3A87AD; } - -.alert.alert-danger h1, -.alert.alert-danger h2, -.alert.alert-danger h3, -.alert.alert-danger h4, -.alert.alert-danger h5, -.alert.alert-danger h6, -.alert.alert-danger .fa::before { - color: #B94A48; } - -/** - * 8.25 - FullWidth - * ----------------------------------------------------------------------------- - */ -.fullwidth-row .col-lg-12 *:last-child { - margin-bottom: 0; } - -/** - * 8.26 - Progress - * ----------------------------------------------------------------------------- - */ -.progress { - box-shadow: none; - height: 3rem; - line-height: 3rem; } - -.progress .progress-bar { - font-weight: bold; - box-shadow: none; - line-height: inherit; - height: inherit; } - -/** - * Recent Posts Widget - * ----------------------------------------------------------------------------- - */ -.custom_recent_posts .recent-posts { - list-style: none; - padding: 0; - margin: 0; } - .custom_recent_posts .recent-posts li { - padding: 0; - margin: 0 0 2rem 0; } - .custom_recent_posts .recent-posts li::before { - display: none; } - .custom_recent_posts .recent-posts li h6 { - margin-bottom: 0.5em; - margin-top: 0; } - .custom_recent_posts .recent-posts.type-thumbnail li { - padding: 20px 0 20px 100px; - margin: 0 0 1.4rem 0; - min-height: 80px; } - .custom_recent_posts .recent-posts.type-thumbnail li:hover .wp-post-image { - opacity: 1; } - .custom_recent_posts .recent-posts.type-thumbnail .wp-post-image { - max-width: 80px; - height: auto; - position: absolute; - left: 0; - top: 20px; - -webkit-transition: opacity 200ms; - transition: opacity 200ms; - opacity: 0; } - .custom_recent_posts .recent-posts.type-thumbnail time { - display: block; - width: 80px; - height: 80px; - position: absolute; - left: 0; - top: 20px; - text-align: center; - border-radius: 3px; } - .custom_recent_posts .recent-posts.type-thumbnail time span { - font-size: 2.5em; - display: block; - padding-top: 0.25em; - line-height: 1.2em; } - .custom_recent_posts .recent-posts.type-thumbnail time em { - font-style: normal; } - .custom_recent_posts .recent-posts.type-fullwidth .wp-post-image { - max-width: 100%; - height: auto; - margin-bottom: 1em; } - .custom_recent_posts .recent-posts.type-fullwidth time { - display: none; } - .custom_recent_posts .recent-posts .cols-1 { - width: 100%; } - .custom_recent_posts .recent-posts .cols-2 { - width: 50%; } - .custom_recent_posts .recent-posts .cols-3 { - width: 33.3333333%; } - .custom_recent_posts .recent-posts .cols-4 { - width: 25%; } - -@media (max-width: 992px) { - .custom_recent_posts .recent-posts .cols-1, - .custom_recent_posts .recent-posts .cols-2, - .custom_recent_posts .recent-posts .cols-3, - .custom_recent_posts .recent-posts .cols-4 { - width: 100%; } } +.photo-frame { position: relative; box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); border: 4px solid #fff; display: block; } +.photo-frame::before { content: ""; height: 100%; width: 100%; background: #fff; border: 4px solid #fff; position: absolute; z-index: -1; top: -5px; left: -10px; box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); border-radius: 3px; -webkit-transform: rotate(-2deg); -ms-transform: rotate(-2deg); transform: rotate(-2deg); box-sizing: border-box; } +.photo-frame::after { content: ""; height: 100%; width: 100%; background: #fff; border: 4px solid #fff; position: absolute; z-index: -1; bottom: -3px; right: -5px; box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.25); border-radius: 3px; -webkit-transform: rotate(3deg); -ms-transform: rotate(3deg); transform: rotate(3deg); box-sizing: border-box; } +.photo-frame img { border-radius: 0; } +.photo-frame p:empty { display: none; } +.photo-frame br { display: none; } +.photo-frame p { margin: 0 auto !important; } + +/** 8.0 - Shortcodes ----------------------------------------------------------------------------- */ +/** 8.1 - Accordion ----------------------------------------------------------------------------- */ +.panel { background: transparent; margin: 0 !important; } + +.panel .accordion-toggle { display: block; } + +.panel .accordion-toggle:before { content: '\F056'; font-family: 'FontAwesome'; float: left; margin-right: 10px; font-weight: normal; font-size: 14px; } + +.panel .accordion-toggle.collapsed:before { content: '\F055' !important; } + +.panel-heading h6 { line-height: 3em; } +.panel-heading a { text-decoration: none; } + +.panel-body { padding-bottom: 1rem; } + +.panel-group { margin: 1.4rem 0; } + +/** 8.2 - Slider ----------------------------------------------------------------------------- */ +.carousel { margin-bottom: 20px; } + +.carousel-control { width: 40px; height: 40px; line-height: 35px; font-size: 45px; border-radius: 300px; display: none; } + +.carousel:hover .carousel-control { display: block; } + +/** 8.3 - Action Boxes ----------------------------------------------------------------------------- */ +.action-box { padding: 20px; margin: 0 0 20px 0; border-radius: 3px; } + +.action-box h3 { margin-top: 0; margin-bottom: 10px; line-height: 1em; } + +.action-box .btn:first-child { float: right; } + +.action-box p:last-of-type { margin-bottom: 0; } + +.action-box .btn:last-of-type { margin-top: 20px; } + +.action-box.style-1 { background: transparent; border-width: 1px; border-top-width: 3px; border-style: solid; } + +.action-box.style-2 { border-left-width: 3px; border-left-style: solid; } + +.action-box.style-3 { border-width: 3px; border-style: solid; } + +.action-box.style-4 { background: transparent; border-width: 3px; border-style: solid; } + +.action-box.style-5 { background: transparent; border-width: 1px; border-style: solid; } + +/** 8.4 - Lists ----------------------------------------------------------------------------- */ +.list-none ul { list-style: none; padding: 0 !important; } + +.list-none li { margin-bottom: 0.5em; } + +*[class*='list-'] ul { list-style: none; padding: 0 0 0 20px; } + +*[class*='list-'] li:before { font-family: 'FontAwesome'; font-size: 14px; margin: 0 10px 0 0; display: inline-block; } + +.list-bullets ul, .list-circle ul, .list-square ul, .list-crosslist ul, .list-checklist ul, .list-default-list ul { padding: 0; } + +.list-bullets li:before { content: '\F111'; } + +.list-circle li:before { content: ""; } + +.list-square li:before { content: ""; } + +.list-crosslist li:before { content: ""; } + +.list-checklist li:before { content: '\F00C'; } + +.list-default-list li:before { content: '\F178'; } + +.list-bullets li, .list-circle li, .list-square li, .list-crosslist li, .list-checklist li, .list-default-list li { padding-bottom: 0.5em; } + +/** 8.5 - Buttons ----------------------------------------------------------------------------- */ +.btn, input[type="button"], input[type="submit"] { border: none; text-shadow: none; border-radius: 3px; outline: none !important; } + +.btn.btn-red { color: #FFF; background: #e74c3c; } + +.btn.btn-red:hover { color: #FFF; background: #c0392b; } + +.btn.btn-green { color: #FFF; background: #2ecc71; } + +.btn.btn-green:hover { color: #FFF; background: #27ae60; } + +.btn.btn-blue { color: #FFF; background: #3498db; } + +.btn.btn-blue:hover { color: #FFF; background: #2980b9; } + +.btn.btn-violet { color: #FFF; background: #9b59b6; } + +.btn.btn-violet:hover { color: #FFF; background: #8e44ad; } + +.btn.btn-navy { color: #FFF; background: #2c3e50; } + +.btn.btn-navy:hover { color: #FFF; background: #34495e; } + +.btn.btn-gray { color: #FFF; background: #bdc3c7; } + +.btn.btn-gray:hover { color: #FFF; background: #95a5a6; } + +/** 8.6 - Toggle Box ----------------------------------------------------------------------------- */ +.toggle-box h6 { cursor: pointer; line-height: 1.425em; } + +.toggle-box .collapse { padding: 0.5rem 0; } + +/** 8.7 - Clients Slider ----------------------------------------------------------------------------- */ +.clients-carousel-container { position: relative; margin-bottom: 30px; padding: 0 30px; box-sizing: border-box; } + +.clients-carousel { overflow: hidden; padding: 0; } + +.clients-carousel ul { margin: 0; padding: 0; list-style: none; height: auto; } + +.caroufredsel_wrapper { margin: 0 30px; } + +.clients-carousel ul li { float: left; text-align: center; margin: 0; padding: 0 5px; } + +.clients-carousel ul a { padding: 1px; display: block; overflow: hidden; } + +.clients-carousel img { -webkit-transition: opacity 160ms ease-in-out; transition: opacity 160ms ease-in-out; -webkit-backface-visibility: hidden; -webkit-transform: rotate(0); -ms-transform: rotate(0); transform: rotate(0); position: relative; opacity: 0.4; filter: alpha(opacity=40); } + +.clients-carousel img:hover { opacity: 1; filter: alpha(opacity=100); } + +.clients-carousel .next:after, .clients-carousel .prev:after { -webkit-transition: opacity 160ms ease-in-out; transition: opacity 160ms ease-in-out; } + +.clients-carousel-container .controls { position: absolute; top: 50%; margin-top: -12px; width: 100%; left: 0; } + +.clients-carousel-container .next, .clients-carousel-container .prev { position: absolute; width: 24px; height: 24px; line-height: 24px; text-align: center; border-radius: 2px; } + +.clients-carousel-container .next { right: 0; } + +/** 8.8 - Columns ----------------------------------------------------------------------------- */ +.content-column { float: left; margin-right: 3.22555%; margin-bottom: 40px; } + +.content-column.half { width: 48.387224%; } + +.content-column.one-three { width: 31.182966%; } + +.content-column.one-four { width: 22.580837%; } + +.content-column.two-three { width: 65.591482%; } + +.content-column.two-four { width: 48.387226%; } + +.content-column.three-four { width: 74.193611%; } + +.content-column.last { margin-right: 0 !important; } + +.clear { clear: both; } + +.clearfix { clear: none !important; } + +@media (max-width: 992px) { .content-column { float: left; width: 48.387224% !important; } } +@media (max-width: 768px) { .content-column { float: none; width: 100% !important; margin: 2rem 0 !important; } } +/** 8.9 - Dividers ----------------------------------------------------------------------------- */ +.divider { clear: both; color: transparent; height: 20px; background-position: center center; margin: 0 0 40px; background-repeat: no-repeat; border-bottom: none; } + +/** 8.10 - Boxes ----------------------------------------------------------------------------- */ +.well { padding: 35px; border: none; background: transparent; box-shadow: none; border-radius: 0px; margin-bottom: 35px; } + +.well.well-2 { padding: 0; border-top: none; } + +.well.well-2 .fa { margin-right: 10px; } + +.well.well-3 { text-align: center; padding: 0; border-top: none; } + +.well.well-3 .fa { margin-bottom: 0px; } + +.well.well-4 { padding: 0 0 0 42px; border-top: none; position: relative; } + +.well.well-4 .fa { position: absolute; left: 0; } + +.well.well-5 { text-align: center; border-top: none; position: relative; } + +.well.well-5 .fa { position: absolute; margin-left: -46px; } + +.well.well-5 > div { padding: 40px 20px 20px; margin-top: 40px; border-radius: 3px; } + +.content-column .well { margin-bottom: 0; } + +/** 8.11 - Tabs ----------------------------------------------------------------------------- */ +.tabs-container { margin-bottom: 20px; } + +.nav-tabs { border: none !important; } + +.nav-tabs a { border: none !important; } + +.nav-tabs .active > a, .nav-tabs .active > a:hover, .nav-tabs .active > a:focus { background-color: transparent; } + +.tab-content { padding: 20px 0; margin-top: -2px; } + +.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { border: none; } + +/** 8.12 - Marker ----------------------------------------------------------------------------- */ +.label { font-size: small; } + +/** 8.13 - Dropcap ----------------------------------------------------------------------------- */ +.dropcap { font-size: 40px; float: left; line-height: 1em; min-width: 30px; font-weight: bold; display: inline-block; margin: 0 5px 0px 0; } + +/** 8.14 - Person ----------------------------------------------------------------------------- */ +.person.mini { padding-left: 110px; position: relative; margin: 2.8rem 0; } + +.person.mini img { position: absolute; left: 0; top: 0; } + +.person img { margin: 0 20px 20px 0; width: 90px; height: 90px; border-radius: 300px; } + +.person p:first-child img { border-radius: 300px; width: 160px; height: 160px; } + +.person h5 { margin: 30px 0 0; } + +/** 8.15 - Icons ----------------------------------------------------------------------------- */ +/** 8.16 - Zoomify ----------------------------------------------------------------------------- */ +.zoom-picture:after, .zoom-picture-container .vc_single_image-wrapper:after { content: '\F002'; font-family: 'FontAwesome'; text-shadow: 0px 0px 3px #000000; color: #fff; font-size: 18px; position: absolute; top: 10px; right: 10px; } + +/** 8.17 - Blockquote ----------------------------------------------------------------------------- */ +/** 8.18 - Testimonials ----------------------------------------------------------------------------- */ +.testimonials { margin-bottom: 20px; } + +.testimonials blockquote { border-radius: 3px; padding: 20px 20px 20px 60px; border: none; position: relative; margin: 0; font-size: 1em; line-height: 1.4em; } + +.testimonials blockquote p { font-size: 1em; line-height: 1.4em; margin: 0; } + +.testimonials blockquote p + p { margin-top: 20px; } + +.testimonials blockquote:before { content: '\F10D'; font-family: 'FontAwesome'; font-size: 26px; line-height: 26px; margin-left: -40px; display: inline-block; position: absolute; } + +.testimonials cite { padding: 10px 0 10px 60px; display: block; font-weight: normal; } + +.testimonials cite:before { content: '\2014'; margin-right: 10px; } + +.testimonials blockquote i { font-size: 30px; } + +.testimonials blockquote i:after, .testimonials blockquote i:before { margin: 0 10px 10px 0; } + +/** 8.19 - Map Maker ----------------------------------------------------------------------------- */ +.map-container { position: relative; z-index: 1; } + +#map_controls { list-style: none; position: absolute; right: 30px; bottom: 30px; } + +#map_controls li { margin: 5px; } + +/** 8.20 - Pricing Table ----------------------------------------------------------------------------- */ +.wl-pricing-table { text-align: center; margin-bottom: 60px; overflow: hidden; } + +.wl-pricing-table .pricing-footer a { margin: 0; } + +.wl-pricing-table.light { padding: 30px 0; } + +.wl-pricing-table.light .content-column { margin: 0; padding: 30px; box-sizing: border-box; } + +.wl-pricing-table.light .half { width: 50%; } + +.wl-pricing-table.light .one-three { width: 33.33333%; } + +.wl-pricing-table.light .one-four { width: 25%; } + +.wl-pricing-table.light .pricing-header { position: relative; margin-bottom: 10px; } + +.wl-pricing-table .pricing-header h3 { margin: 0px 0 10px; } + +.wl-pricing-table h4 { position: relative; overflow: hidden; margin: 0; padding: 0; line-height: 1em; } + +.wl-pricing-table h4 * { position: relative; font-weight: bold; font-size: 42px !important; line-height: 50px; display: inline-block !important; padding: 0; margin: 0; letter-spacing: -1px; } + +.wl-pricing-table h4 *:after, .wl-pricing-table h4 *:before { margin: 0px 15px; position: absolute; top: 50%; content: ''; width: 200em; height: 0px; display: block; } + +.wl-pricing-table h4 *:before { right: 100%; } + +.wl-pricing-table h4 *:after { left: 100%; } + +.wl-pricing-table .pricing-header em { font-style: normal; text-transform: uppercase; opacity: 0.8; font-weight: normal; } + +.wl-pricing-table.light span { display: block; padding: 2px 0; margin-bottom: 10px; } + +.wl-pricing-table.light .pricing-footer { padding: 30px 0 0; } + +.wl-pricing-table.light .highlight-column { padding: 50px 30px; margin-top: -20px; position: relative; z-index: 2; border-radius: 3px; } + +.wl-pricing-table.light .content-column:first-child { -webkit-border-top-left-radius: 3px; -webkit-border-bottom-left-radius: 3px; -moz-border-radius-topleft: 3px; -moz-border-radius-bottomleft: 3px; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } + +.wl-pricing-table.light .content-column:last-child { -webkit-border-top-right-radius: 3px; -webkit-border-bottom-right-radius: 3px; -moz-border-radius-topright: 3px; -moz-border-radius-bottomright: 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } + +.wl-pricing-table.light .highlight-column:first-child, .wl-pricing-table.light .highlight-column:last-child { box-shadow: inset 0px 0px 20px rgba(0, 0, 0, 0.3); } + +.pricing-row h4 { border-bottom: none; } +.pricing-row h4::after { display: none; } + +/** 8.21 - Event Agenda ----------------------------------------------------------------------------- */ +.event-agenda { line-height: 1.425em; } +.event-agenda .event-agenda-day { margin-top: 4rem; } + +.event-agenda-event span { font-size: 0.9em; } + +.event-agenda .toggle-box { margin-bottom: 0; } + +.event-agenda .row.event-agenda-day:hover { background: transparent; } + +.event-agenda p { margin-bottom: 0; } + +.event-agenda *[class*="col-"] { padding: 8px 5px; } + +.event-agenda .event-agenda-day span { line-height: 2em; } + +.event-agenda h3 { margin: 0; } + +.event-agenda h6 { margin: 0 0 0; } + +.event-agenda h6 + div.in { margin: 0 0 0; } + +.event-agenda-event i.fa-clock-o { margin-right: 5px; } + +.event-agenda-event i.fa-map-marker { margin-left: 5px; } + +.event-agenda-day i.fa-calendar { margin-right: 5px; } + +/** 8.22 - Countdown ----------------------------------------------------------------------------- */ +.curly-counter { margin-bottom: 20px; } + +#counter > div { display: inline-block; padding-right: 6%; width: 20.5%; max-width: 100px; box-sizing: content-box; } + +#counter > div:last-child { padding-right: 0; } + +.countdown_descr { display: block; border-top-style: solid; border-top-width: 1px; padding-top: 7px; } + +.countdown_amount { font-size: 44px; font-weight: bold; padding-bottom: 7px; display: block; line-height: 44px; height: auto; } + +/** 8.23 - Alerts ----------------------------------------------------------------------------- */ +.alert .fa { background: transparent; border: none; padding: 0; margin: 0 0 30px 30px; float: right; outline: none; } + +.alert h1, .alert h2, .alert h3, .alert h4, .alert h5, .alert h6 { margin-bottom: 0; margin-top: 10px; } + +.alert.alert-warning h1, .alert.alert-warning h2, .alert.alert-warning h3, .alert.alert-warning h4, .alert.alert-warning h5, .alert.alert-warning h6, .alert.alert-warning .fa::before { color: #C09853; } + +.alert.alert-success h1, .alert.alert-success h2, .alert.alert-success h3, .alert.alert-success h4, .alert.alert-success h5, .alert.alert-success h6, .alert.alert-success .fa::before { color: #468847; } + +.alert.alert-info h1, .alert.alert-info h2, .alert.alert-info h3, .alert.alert-info h4, .alert.alert-info h5, .alert.alert-info h6, .alert.alert-info .fa::before { color: #3A87AD; } + +.alert.alert-danger h1, .alert.alert-danger h2, .alert.alert-danger h3, .alert.alert-danger h4, .alert.alert-danger h5, .alert.alert-danger h6, .alert.alert-danger .fa::before { color: #B94A48; } + +/** 8.25 - FullWidth ----------------------------------------------------------------------------- */ +.fullwidth-row .col-lg-12 *:last-child { margin-bottom: 0; } + +/** 8.26 - Progress ----------------------------------------------------------------------------- */ +.progress { box-shadow: none; height: 3rem; line-height: 3rem; } + +.progress .progress-bar { font-weight: bold; box-shadow: none; line-height: inherit; height: inherit; } + +/** Recent Posts Widget ----------------------------------------------------------------------------- */ +.custom_recent_posts .recent-posts { list-style: none; padding: 0; margin: 0; } +.custom_recent_posts .recent-posts li { padding: 0; margin: 0 0 2rem 0; } +.custom_recent_posts .recent-posts li::before { display: none; } +.custom_recent_posts .recent-posts li h6 { margin-bottom: 0.5em; margin-top: 0; } +.custom_recent_posts .recent-posts.type-thumbnail li { padding: 20px 0 20px 100px; margin: 0 0 1.4rem 0; min-height: 80px; } +.custom_recent_posts .recent-posts.type-thumbnail li:hover .wp-post-image { opacity: 1; } +.custom_recent_posts .recent-posts.type-thumbnail .wp-post-image { max-width: 80px; height: auto; position: absolute; left: 0; top: 20px; -webkit-transition: opacity 200ms; transition: opacity 200ms; opacity: 0; } +.custom_recent_posts .recent-posts.type-thumbnail time { display: block; width: 80px; height: 80px; position: absolute; left: 0; top: 20px; text-align: center; border-radius: 3px; } +.custom_recent_posts .recent-posts.type-thumbnail time span { font-size: 2.5em; display: block; padding-top: 0.25em; line-height: 1.2em; } +.custom_recent_posts .recent-posts.type-thumbnail time em { font-style: normal; } +.custom_recent_posts .recent-posts.type-fullwidth .wp-post-image { max-width: 100%; height: auto; margin-bottom: 1em; } +.custom_recent_posts .recent-posts.type-fullwidth time { display: none; } +.custom_recent_posts .recent-posts .cols-1 { width: 100%; } +.custom_recent_posts .recent-posts .cols-2 { width: 50%; } +.custom_recent_posts .recent-posts .cols-3 { width: 33.3333333%; } +.custom_recent_posts .recent-posts .cols-4 { width: 25%; } + +@media (max-width: 992px) { .custom_recent_posts .recent-posts .cols-1, .custom_recent_posts .recent-posts .cols-2, .custom_recent_posts .recent-posts .cols-3, .custom_recent_posts .recent-posts .cols-4 { width: 100%; } } diff --git a/css/style.scss b/css/style.scss index 68bb2ef..d703c41 100644 --- a/css/style.scss +++ b/css/style.scss @@ -71,6 +71,15 @@ $screen-sm-max: 992px; img{ border-radius: 0; } + p:empty{ + display: none; + } + br{ + display: none; + } + p{ + margin: 0 auto !important; + } } /** @@ -407,7 +416,7 @@ input[type="submit"]{ */ .well{ - padding: 35px 0 0 0; + padding: 35px; border: none; background: transparent; -webkit-box-shadow: none; @@ -520,6 +529,7 @@ input[type="submit"]{ .person.mini{ padding-left: 110px; position: relative; + margin: 2.8rem 0; } .person.mini img{ position: absolute; @@ -556,7 +566,8 @@ input[type="submit"]{ * ----------------------------------------------------------------------------- */ -.zoom-picture:after{ +.zoom-picture:after, +.zoom-picture-container .vc_single_image-wrapper:after{ content: '\F002'; font-family: 'FontAwesome'; text-shadow: 0px 0px 3px #000000; @@ -571,35 +582,7 @@ input[type="submit"]{ * 8.17 - Blockquote * ----------------------------------------------------------------------------- */ - -.blockquote{ - border:none; - padding: 0 0 0 70px; - position: relative; -} -.blockquote i:before{ - float: left; - margin-left: -70px; - display: inline-block; - position: absolute; - font-style: normal; - top: 0; -} -.blockquote img{ - border-radius: 300px; - margin: 0 0 10px 10px; - width: 90px; - height: 90px -} -.blockquote cite:before{ - content: '\2014'; - margin-right: 10px -} -.blockquote cite{ - display: block; - font-weight:bold; - margin-top: 10px -} + /** * 8.18 - Testimonials diff --git a/css/vc-icon.css b/css/vc-icon.css new file mode 100644 index 0000000..4784795 --- /dev/null +++ b/css/vc-icon.css @@ -0,0 +1,7 @@ +.curly_icon{ + background-image: url(data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="30px" height="32px" viewBox="0 0 30 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
    <!-- Generator: Sketch 3.0.4 (8054) - http://www.bohemiancoding.com/sketch -->
    <title>curly</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
            <stop stop-color="#E74C3C" offset="0%"></stop>
            <stop stop-color="#C0392B" offset="100%"></stop>
        </linearGradient>
    </defs>
    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
        <g id="curly" sketch:type="MSLayerGroup" transform="translate(1.000000, 0.000000)" fill="url(#linearGradient-1)">
            <g id="Page-1" sketch:type="MSShapeGroup">
                <g id="Zen-Desk-Mobile">
                    <path d="M12.595843,0.430892375 C13.6300054,-0.162917382 15.304943,-0.163934234 16.3408763,0.430892375 L27.0894615,6.60266467 C28.1236238,7.19647444 28.9619781,8.63857449 28.9619781,9.82822769 L28.9619781,22.1717723 C28.9619781,23.3593918 28.1253949,24.8025087 27.0894615,25.3973353 L16.3408763,31.5691075 C15.3067139,32.1629175 13.6317763,32.1639343 12.595843,31.5691075 L1.84725773,25.3973353 C0.813095356,24.8035256 -0.0252589033,23.3614255 -0.0252589033,22.1717723 L-0.0252589033,9.82822769 C-0.0252589033,8.64060817 0.811324435,7.19749129 1.84725773,6.60266467 L12.595843,0.430892375 L12.595843,0.430892375 Z M20.9040337,12.0978141 L20.2196785,12.5402131 C19.6569837,11.7234724 18.9289131,11.0750052 18.035445,10.594792 C17.1419769,10.1145787 16.1743844,9.87447567 15.1326386,9.87447567 C14.0148529,9.87447567 12.9845285,10.148609 12.0416345,10.696884 C11.0987404,11.245159 10.3516602,11.988155 9.80037134,12.9258943 C9.24908248,13.8636335 8.9734422,14.8883252 8.9734422,16 C8.9734422,17.1116748 9.24908248,18.1363665 9.80037134,19.0741057 C10.3516602,20.011845 11.0987404,20.754841 12.0416345,21.303116 C12.9845285,21.851391 14.0148529,22.1255243 15.1326386,22.1255243 C16.1743844,22.1255243 17.1438778,21.8835307 18.041148,21.3995363 C18.9384181,20.9155418 19.6683896,20.2614029 20.2310845,19.4370998 L20.9040337,19.9021859 C20.265299,20.8399251 19.4383781,21.5810305 18.4232463,22.1255243 C17.4081144,22.6700181 16.3112561,22.9422609 15.1326386,22.9422609 C13.8703772,22.9422609 12.7031831,22.6322066 11.6310214,22.0120887 C10.5588596,21.3919708 9.71102808,20.5487743 9.08750137,19.482474 C8.46397468,18.4161737 8.15221601,17.2553606 8.15221601,16 C8.15221601,14.7446394 8.46397468,13.5838263 9.08750137,12.517526 C9.71102808,11.4512257 10.5588596,10.6080292 11.6310214,9.9879113 C12.7031831,9.3677934 13.8703772,9.05773908 15.1326386,9.05773908 C16.3112561,9.05773908 17.4081144,9.32998191 18.4232463,9.87447567 C19.4383781,10.4189695 20.265299,11.1600749 20.9040337,12.0978141 L20.9040337,12.0978141 Z M22.272744,11.190329 L21.5883888,11.632728 C20.8736143,10.589115 19.9478431,9.76293367 18.8110475,9.15415939 C17.6742519,8.54538511 16.4481278,8.24100253 15.1326386,8.24100253 C14.0756848,8.24100253 13.06437,8.44518461 12.0986641,8.85355494 C11.1329581,9.26192529 10.3022353,9.81208262 9.60647069,10.5040435 C8.91070615,11.1960043 8.35752462,12.0221856 7.94690946,12.9826121 C7.53629433,13.9430386 7.33098982,14.9488245 7.33098982,16 C7.33098982,17.0511755 7.53629433,18.0569614 7.94690946,19.0173879 C8.35752462,19.9778144 8.91070615,20.8039957 9.60647069,21.4959565 C10.3022353,22.1879174 11.1329581,22.7380747 12.0986641,23.1464451 C13.06437,23.5548154 14.0756848,23.7589975 15.1326386,23.7589975 C16.4557318,23.7589975 17.6837568,23.4527243 18.8167505,22.8401688 C19.9497441,22.2276134 20.8736143,21.3995415 21.5883888,20.3559284 L22.2499321,20.8437016 C21.4591178,21.9931885 20.4382982,22.9025551 19.1874429,23.5718287 C17.9365874,24.2411023 16.5849995,24.5757341 15.1326386,24.5757341 C13.5738218,24.5757341 12.1328884,24.1919473 10.8097952,23.4243624 C9.48670192,22.6567774 8.43926882,21.6150705 7.66746443,20.2992106 C6.89566004,18.9833506 6.50976363,17.5502948 6.50976363,16 C6.50976363,14.4497052 6.89566004,13.0166494 7.66746443,11.7007894 C8.43926882,10.3849295 9.48670192,9.3432226 10.8097952,8.57563764 C12.1328884,7.80805268 13.5738218,7.42426595 15.1326386,7.42426595 C16.5926035,7.42426595 17.9498943,7.76267887 19.2045517,8.43951488 C20.4592091,9.11635089 21.4819296,10.0332798 22.272744,11.190329 L22.272744,11.190329 Z M23.6186424,10.2601568 L22.9342873,10.7025558 C22.0674331,9.43963276 20.9477632,8.44140913 19.5752441,7.70785504 C18.202725,6.97430092 16.7218713,6.60752937 15.1326386,6.60752937 C13.8551692,6.60752937 12.6328471,6.85519468 11.4656355,7.35053277 C10.298424,7.84587087 9.29281214,8.51324384 8.44876989,9.35267174 C7.60472765,10.1920996 6.93368613,11.1922138 6.43562516,12.3530443 C5.93756419,13.5138748 5.68853745,14.7295145 5.68853745,16 C5.68853745,17.2704855 5.93756419,18.4861252 6.43562516,19.6469557 C6.93368613,20.8077862 7.60472765,21.8079004 8.44876989,22.6473283 C9.29281214,23.4867562 10.298424,24.1541291 11.4656355,24.6494672 C12.6328471,25.1448053 13.8551692,25.3924706 15.1326386,25.3924706 C16.7218713,25.3924706 18.2046259,25.0219179 19.5809471,24.2808014 C20.9572682,23.5396849 22.078839,22.5376801 22.9456932,21.2747571 L23.6072365,21.7738739 C22.6643425,23.1351083 21.4477233,24.2146266 19.9573424,25.0124613 C18.4669615,25.8102959 16.858743,26.2092072 15.1326386,26.2092072 C13.7411095,26.2092072 12.4123331,25.938855 11.1462698,25.3981424 C9.88020644,24.8574298 8.78905106,24.131449 7.87277099,23.2201782 C6.95649088,22.3089074 6.22651937,21.2237173 5.68283449,19.9645755 C5.13914964,18.7054336 4.86731126,17.3839217 4.86731126,16 C4.86731126,14.6160783 5.13914964,13.2945664 5.68283449,12.0354245 C6.22651937,10.7762827 6.95649088,9.69109263 7.87277099,8.77982179 C8.78905106,7.86855095 9.88020644,7.14257015 11.1462698,6.60185757 C12.4123331,6.06114502 13.7411095,5.79079279 15.1326386,5.79079279 C16.866347,5.79079279 18.4783674,6.19159468 19.9687483,6.99321053 C21.4591292,7.79482636 22.6757484,8.88379756 23.6186424,10.2601568 L23.6186424,10.2601568 Z" id="c-copy"></path>
                </g>
            </g>
        </g>
    </g>
</svg>); + background-position: 0 0 !important; +} +.vc_column + .vc_column{ + padding-top: 15px; +} \ No newline at end of file diff --git a/curly-extension.php b/curly-extension.php index bbc68c0..e68aac7 100644 --- a/curly-extension.php +++ b/curly-extension.php @@ -3,185 +3,23 @@ Plugin Name: Curly Themes Extension Plugin URI: http://demo.curlythemes.com Description: Curly Themes Extension is a collection of Shortcodes, Widgets and Plugins. This plugin exclusive for Curly Themes -Version: 2.2 +Version: 2.3 Author: Curly Themes Author URI: http://www.curlythemes.com */ -/** -* Migration Assistant -*/ -class CurlyMigrationAssistant { - - static function install(){ - - self::set_value( 'page_heading', '_page_heading' ); // default now if disabled not enabled - self::set_value( 'comments', '_general_comments_pages' ); - self::set_value( 'sharing', '_general_sharing_box_text' ); - self::set_value( 'sharing_pages', '_general_comments_pages' ); - self::set_value( 'bc', '_bc' ); - self::set_value( 'bc_text_before', '_bc_text_before' ); - self::set_value( 'bc_separator', '_bc_separator' ); - self::set_value( 'bc_text_home', '_bc_text_home' ); - self::set_value( 'bc_text_category', '_bc_text_category' ); - self::set_value( 'bc_text_search', '_bc_text_search' ); - self::set_value( 'bc_text_tag', '_bc_text_tag' ); - self::set_value( 'bc_text_author', '_bc_text_author' ); - self::set_value( 'bc_text_404', '_bc_text_404' ); - self::set_value( 'tf_user', '_theme_options_username' ); - self::set_value( 'tf_api', '_theme_options_api' ); - self::set_value( 'seo_analytics', '_seo_analytics' ); - self::set_value( 'seo_webmaster', '_seo_webmaster' ); - self::set_value( 'favicon', '_general_favicon' ); - self::set_value( 'iphone', '_general_iphone_favicon' ); - self::set_value( 'iphone_retina', '_general_iphone_favicon_retina' ); - self::set_value( 'ipad', '_general_ipad_favicon' ); - self::set_value( 'ipad_retina', '_general_ipad_favicon_retina' ); - self::set_value( 'login_box_position', '_login_box_position' ); - self::set_value( 'admin_logo', '_admin_logo' ); - self::set_value( 'admin_bg', '_admin_bg' ); - self::set_value( '404', '_404_text' ); - self::set_value( 'logo', '_logo' ); - self::set_value( 'logo_retina', '_logo_retina' ); - self::set_value( 'header_style', '_header_style' ); - self::set_value( 'logo_alignment', '_logo_alignment' ); - self::set_value( 'header_margin_top', '_header_margin_top' ); - self::set_value( 'header_margin_bottom', '_header_margin_bottom' ); - self::set_value( 'header_pattern', '_header_shading_pattern' ); - self::set_value( 'footer_logo', '_logo_footer' ); - self::set_value( 'footer_top', '_footer_margin' ); - self::set_value( 'footer_bot', '_footer_margin_bottom' ); - self::set_value( 'footer_bg', '_bg_footer_image' ); - self::set_value( 'footer_bg_repeat', '_bg_footer_repeat' ); - self::set_value( 'footer_bg_position', '_bg_footer_position' ); - self::set_value( 'bg_pattern', '_bg_pattern' ); - - self::set_value( 'font', '_fonts_body', false, true ); - self::set_value( 'font_style', '_fonts_body_style' ); - self::set_value( 'font_size', '_fonts_body_size' ); - self::set_value( 'font_variant', '_fonts_body_variant' ); - - self::set_value( 'font_subset', '_fonts_subset' ); - - self::set_value( 'font_menu', '_fonts_menu', false, true ); - self::set_value( 'font_menu_style', '_fonts_menu_style' ); - self::set_value( 'font_menu_variant', '_fonts_menu_variant' ); - self::set_value( 'font_menu_size', '_fonts_menu_size'); - - self::set_value( 'font_h1', '_fonts_h1', false, true ); - self::set_value( 'font_h1_style', '_fonts_h1_style'); - self::set_value( 'font_h1_variant', '_fonts_h1_variant' ); - self::set_value( 'font_h1_size', '_fonts_h1_size' ); - - self::set_value( 'font_h2', '_fonts_h2', false, true ); - self::set_value( 'font_h2_style', '_fonts_h2_style' ); - self::set_value( 'font_h2_variant', '_fonts_h2_variant' ); - self::set_value( 'font_h2_size', '_fonts_h2_size' ); - - self::set_value( 'font_h3', '_fonts_h3', false, true ); - self::set_value( 'font_h3_style', '_fonts_h3_style' ); - self::set_value( 'font_h3_variant', '_fonts_h3_variant' ); - self::set_value( 'font_h3_size', '_fonts_h3_size' ); - - self::set_value( 'font_h4', '_fonts_h4', false, true ); - self::set_value( 'font_h4_style', '_fonts_h4_style' ); - self::set_value( 'font_h4_variant', '_fonts_h4_variant' ); - self::set_value( 'font_h4_size', '_fonts_h4_size'); - - self::set_value( 'font_h5', '_fonts_h5', false, true ); - self::set_value( 'font_h5_style', '_fonts_h5_style' ); - self::set_value( 'font_h5_variant', '_fonts_h5_variant'); - self::set_value( 'font_h5_size', '_fonts_h5_size' ); - - self::set_value( 'font_h6', '_fonts_h6', false, true ); - self::set_value( 'font_h6_style', '_fonts_h6_style' ); - self::set_value( 'font_h6_variant', '_fonts_h6_variant' ); - self::set_value( 'font_h6_size', '_fonts_h6_size' ); - - self::set_value( 'font_blockquote', '_fonts_blockquote', false, true ); - self::set_value( 'font_blockquote_style', '_fonts_blockquote_style' ); - self::set_value( 'font_blockquote_variant', '_fonts_blockquote_variant' ); - self::set_value( 'font_blockquote_size', '_fonts_blockquote' ); - - self::set_value( 'color_text', '_color_text' ); - self::set_value( 'color_bg', '_bg_color' ); - self::set_value( 'color_primary', '_color_primary' ); - self::set_value( 'color_links', '_color_links' ); - self::set_value( 'color_links_hover', '_color_links_hover' ); - self::set_value( 'header_text_color', '_header_text_color' ); - self::set_value( 'header_shading_color', '_header_shading_color', '_header_shading_opacity' ); - self::set_value( 'footer_bg_color', '_footer_bg_color' ); - self::set_value( 'footer_text_color', '_footer_text_color' ); - self::set_value( 'footer_link_color', '_footer_link_color' ); - self::set_value( 'footer_title_color', '_footer_title_color' ); - self::set_value( 'color_h1', '_color_h1' ); - self::set_value( 'color_h2', '_color_h2' ); - self::set_value( 'color_h3', '_color_h3' ); - self::set_value( 'color_h4', '_color_h4' ); - self::set_value( 'color_h5', '_color_h5' ); - self::set_value( 'color_h6', '_color_h6' ); - self::set_value( 'color_menu_text', '_color_menu_text' ); - self::set_value( 'color_menu_hover_text', '_color_menu_hover_text' ); - self::set_value( 'color_menu_bg', '_color_menu_bg_top' ); - self::set_value( 'color_submenu_text', '_color_submenu_text' ); - self::set_value( 'color_submenu_hover_text', '_color_submenu_hover_text' ); - self::set_value( 'color_submenu_bg', '_color_menu_submenu' ); - self::set_value( 'background_image', '_bg_image' ); - self::set_value( 'background_image_repeat', '_bg_repeat' ); - self::set_value( 'background_image_position', '_bg_position' ); - self::set_value( 'general_wide', '_general_wide' ); - self::set_value( 'general_align', '_general_align' ); - self::set_value( 'general_responsive', '_general_responsive' ); - self::set_value( 'animations', '_general_animations' ); - self::set_value( 'custom_css', '_custom_css' ); - self::set_value( 'custom_footer', '_custom_body' ); - self::set_value( 'custom_head', '_custom_head' ); - } - - public static function set_value( $theme_mod, $theme_option, $color = false, $font = false ){ - $theme_option = get_option( 'eque' . $theme_option ); - - if( get_option( 'eque' . $color ) ){ - $theme_option = 'rgba('.self::hex2rgb( $theme_option ).','.( get_option( 'eque' . $color ) / 100 ).')'; - } - if( $font === true ){ - $fonts = json_decode( get_option( 'eque_json_font_list' ), true ); - $theme_option = $fonts[$theme_option][1]; - } - $temp = get_theme_mod( $theme_mod ); - if( empty( $temp ) && $theme_option ) set_theme_mod( $theme_mod, $theme_option ); - - } - - public static function hex2rgb($hex) { - $hex = str_replace("#", "", $hex); - - if(strlen($hex) == 3) { - $r = hexdec(substr($hex,0,1).substr($hex,0,1)); - $g = hexdec(substr($hex,1,1).substr($hex,1,1)); - $b = hexdec(substr($hex,2,1).substr($hex,2,1)); - } else { - $r = hexdec(substr($hex,0,2)); - $g = hexdec(substr($hex,2,2)); - $b = hexdec(substr($hex,4,2)); - } - $rgb = array($r, $g, $b); - return implode(",", $rgb); - } -} -register_activation_hook( __FILE__, array( 'CurlyMigrationAssistant', 'install' ) ); - class CurlyThemesExtension { public function __construct( $prefix = null ) { - if ( !defined( 'THEMEPREFIX' ) ) { + if ( ! defined( 'THEMEPREFIX' ) ) { define( 'THEMEPREFIX' , $prefix ); } add_action('init', array($this, 'add_button')); add_filter('the_content', array($this, 'shortcode_sanitizer')); add_filter('widget_text', array($this, 'shortcode_sanitizer')); + add_filter('vc_inner_shortcode', array($this, 'shortcode_sanitizer')); add_action('wp_enqueue_scripts', array($this, 'load_shortcodes_scripts')); @@ -193,66 +31,7 @@ public function __construct( $prefix = null ) { // Include Widgets self::widgets(); - - if ( function_exists('register_sidebar')) - register_sidebar(array( - 'name' => __('[DEPRECATED]Pre-Footer Left' , 'CURLYTHEME'), - 'id' => 'pre_footer_sidebar_left', - 'before_widget' => '', - 'before_title' => '

', - 'after_title' => '

', - )); - - if ( function_exists('register_sidebar')) - register_sidebar(array( - 'name' => __('[DEPRECATED]Pre-Footer Right' , 'CURLYTHEME'), - 'id' => 'pre_footer_sidebar_right', - 'before_widget' => '', - 'before_title' => '

', - 'after_title' => '

', - )); - - if ( function_exists('register_sidebar')) - register_sidebar(array( - 'name' => __('[DEPRECATED]Footer Left Sidebar' , 'CURLYTHEME'), - 'id' => 'footer_sidebar_left', - 'before_widget' => '', - 'before_title' => '
', - 'after_title' => '
', - )); - - if ( function_exists('register_sidebar')) - register_sidebar(array( - 'name' => __('[DEPRECATED]Footer Center Sidebar' , 'CURLYTHEME'), - 'id' => 'footer_sidebar_center', - 'before_widget' => '', - 'before_title' => '
', - 'after_title' => '
', - )); - - if ( function_exists('register_sidebar')) - register_sidebar(array( - 'name' => __('[DEPRECATED]Footer Right Sidebar', 'CURLYTHEME'), - 'id' => 'footer_sidebar_right', - 'before_widget' => '', - 'before_title' => '
', - 'after_title' => '
', - )); - - if ( function_exists('register_sidebar')) - register_sidebar(array( - 'name' => '[DEPRECATED]Absolute Footer', - 'id' => 'absolute_footer', - 'before_widget' => '', - 'after_widget' => '', - 'before_title' => '', - 'after_title' => '', - )); + } /* Frontend Scripts @@ -367,12 +146,26 @@ function add_plugin($plugin_array) { /* Shortcode Sanitizer ================================================= */ function shortcode_sanitizer( $content ) { + /* $needle = join("|",array("column", '\/column', "list", "\/list", "tabs", "\/tabs", "tab", "\/tab", "toggle", "\/toggle", "accordion", "\/accordion", "testimonials", "\/testimonials", "testimonial", "\/testimonial", "clear", "divider", "button", "\/button", "blockquote", "\/blockquote", "highlight", "\/highlight", "call2action", "\/call2action", "toggle-box", "\/toggle-box", "slider", "slide", "youtube", "vimeo", "progress", "icon", "clients", "\/clients", "client", "\/client", "pretty-photo", "agenda", "\/agenda", "event-day", "\/event-day", "event", "\/event", "pricing-table", "\/pricing-table", "pricing-column", "\/pricing-column", "pricing-header", "\/pricing-header", "pricing-row", "\/pricing-row", "pricing-footer", "\/pricing-footer", "map-maker", "\/map-maker", "picture-zoom", "full-width-box", '\/full-width-box', "box", "\/box", "alert", "\/alert", "ios-slider", "ios-slide", "roundabout-slider", "roundabout-slide", "person", "\/person", "photo-frame", "\/photo-frame", "gallery", "countdown", "location", "simple-weather", "simple-text-rotator", "\/simple-text-rotator", "simple-qr")); $html = preg_replace("/(

)?\[($needle)(\s[^\]]+)?\](<\/p>|
)?/","[$2$3]",$content); $html = preg_replace("/(

)?\[\/($needle)](<\/p>|
)/","[/$2]",$html); return $html; + + */ + + $array = array( + '

[' => '[', + ']

' => ']', + ']
' => ']', + '] ' => ']', + ' [' => '[' + ); + + return strtr( $content, $array ); + } function activate_plugins() { @@ -475,203 +268,9 @@ function load_shortcodes_admin_scripts() { } } -class CurlySidebars { - - public function __construct( $prefix = null ) { - - if ( !defined( 'THEMEPREFIX' ) ) { - define( 'THEMEPREFIX' , $prefix ); - } - - add_action('admin_enqueue_scripts', array($this, 'load_scripts')); - add_action('admin_menu', array($this, 'add_submenu_page')); - add_action('wp_ajax_update_sidebars', array($this, 'update_sidebars')); - add_action('widgets_init', array($this, 'create_sidebars')); - - add_shortcode('sidebar', array($this, 'sidebar_shortcode')); - - } - - function load_scripts() { - - // Get Current Color Scheme - global $_wp_admin_css_colors; - $admin_colors = $_wp_admin_css_colors; - $color_scheme = $admin_colors[get_user_option('admin_color')]->colors; - - if (get_current_screen()->id == 'appearance_page_sidebars') { - - wp_enqueue_style('curly-google-font-roboto', 'http://fonts.googleapis.com/css?family=Roboto:400,300,700,900', true); - wp_enqueue_style('curly-sidebars-css', plugins_url( '/css/sidebars.css', __FILE__ ), null, null, null); - wp_enqueue_script('curly-sidebars-js', plugins_url( '/js/sidebars.js', __FILE__ ) , 'jquery', null, true); - - $js_data = array( - __('Remove','CURLYTHEME'), - __('Are you sure you want to delete this sidebar?','CURLYTHEME'), - __('Sidebar name cannot be empty. Please provide a valid name for your sidebar.','CURLYTHEME'), - __('You already have a sidebar with that name. Please provide a valid name for your sidebar.','CURLYTHEME'), - __('Your sidebar has been succesfully created.','CURLYTHEME'), - __('You currently have no sidebars created.
Use the form above to create your first sidebar.','CURLYTHEME') - ); - - wp_localize_script('curly-sidebars-js', 'js_data', $js_data); - - $color_scheme = ' - #sidebars-wrapper input[type=submit], - #sidebar-list li a:hover{ - background-color: '.$color_scheme[3].'; - color: #fff; - }'; - - wp_add_inline_style('curly-sidebars-css', $color_scheme); - } - } - - function update_sidebars() { - - $name = sanitize_text_field( $_POST['name'] ); - $id = sanitize_text_field( $_POST['id'] ); - $method = sanitize_text_field( $_POST['method'] ); - - $sidebars = self::get_sidebars(); - $count = self::get_sidebars_count() + 1; - - if ( $method == 'update' ) { - - if ( !empty($name) ) { - - if ( !$sidebars ) { - - $sidebars = array( $count => $name ); - $sidebars = json_encode($sidebars); - update_option( THEMEPREFIX . '_sidebars_list' , $sidebars ); - update_option( THEMEPREFIX . '_sidebars_list_count' , $count ); - - echo json_encode( array( $count, $name ) ); - - } else { - - if ( !in_array( $name , $sidebars ) ) { - - $sidebars[$count] = $name ; - $sidebars = json_encode($sidebars); - update_option( THEMEPREFIX . '_sidebars_list' , $sidebars ); - update_option( THEMEPREFIX . '_sidebars_list_count' , $count ); - - echo json_encode( array( $count, $name ) ); - - } else { - echo 'duplicate'; - } - } - - } else { - echo 'empty'; - } - - } - - if ( $method == 'delete' ) { - unset( $sidebars[$id] ); - $sidebars = json_encode($sidebars); - update_option( THEMEPREFIX . '_sidebars_list' , $sidebars ); - echo 'success'; - } - - die(); - } - - function add_submenu_page(){ - add_submenu_page( 'themes.php', __('Sidebars', 'CURLYTHEME'), __('Sidebars', 'CURLYTHEME'), 'manage_options', 'sidebars', array($this, 'add_submenu_page_cb')); - } - - function add_submenu_page_cb( $html = null ) { - - $sidebars = self::get_sidebars(); - - $html .= ''; - - echo $html; - } - - public static function get_sidebars() { - $sidebars = get_option( THEMEPREFIX . '_sidebars_list' ); - $sidebars = json_decode($sidebars, true); - - return $sidebars; - } - - function get_sidebars_count() { - $count = get_option( THEMEPREFIX . '_sidebars_list_count', 0 ); - - return $count; - } - - function create_sidebars() { - $sidebars = self::get_sidebars(); - if ( $sidebars ) { - foreach ($sidebars as $id => $name) { - register_sidebar( array( - 'name' => $name, - 'id' => 'sidebar_'.$id, - 'before_widget'=> '', - 'before_title' => '
', - 'after_title' => '
', - ) ); - } - } - - } - - public static function sidebar( $default = null ) { - - global $post; - - $sidebar = get_post_meta( $post->ID, THEMEPREFIX . '_sidebar', true); - - if ( $sidebar ) { - dynamic_sidebar( $sidebar ); - } else { - dynamic_sidebar( $default ); - } - } - - function sidebar_shortcode( $atts ) { - - ob_start(); - dynamic_sidebar( 'sidebar_'.$atts['id'] ); - $sidebar = ob_get_contents(); - ob_end_clean(); - - return $sidebar; - } - -} - -$sidebar = new CurlySidebars('eque'); $extension = new CurlyThemesExtension('eque'); $builder = new CurlyThemesShortcodeBuilder('eque'); +require_once( 'class.vc.php' ); + ?> \ No newline at end of file diff --git a/js/main.js b/js/main.js index 3fee676..d287a71 100644 --- a/js/main.js +++ b/js/main.js @@ -19,6 +19,10 @@ jQuery(document).ready(function(){ jQuery('.zoom-picture').zoom(); } + if( jQuery('.zoom-picture-container').length > 0 ) { + jQuery('.vc_single_image-wrapper', '.zoom-picture-container').zoom(); + } + }); (function($) { diff --git a/js/min/main-min.js b/js/min/main-min.js index c5c1475..54edf1a 100644 --- a/js/min/main-min.js +++ b/js/min/main-min.js @@ -1 +1 @@ -jQuery(document).ready(function(){"use strict";jQuery(".video-container").length>0&&jQuery(".video-container").fitVids(),jQuery(".panel-group").length>0&&jQuery(".panel-group").each(function(){0==jQuery(this).find(".in").length&&(jQuery(".panel:first-child .panel-collapse",jQuery(this)).addClass("in"),jQuery(".panel:first-child .accordion-toggle",jQuery(this)).removeClass("collapsed"))}),jQuery(".zoom-picture").length>0&&jQuery(".zoom-picture").zoom()}),function($){"use strict";$(function(){if($(".recent-posts .recent-post").length>0){var e=$(".recent-posts");e.imagesLoaded(function(){e.masonry({itemSelector:".recent-post"})})}})}(jQuery),jQuery(".fullwidth-row").length>0&&jQuery(".fullwidth-row").each(function(){0==jQuery.trim(jQuery(this).prev().not("div.fullwidth-row").children(".row").children(".col-lg-12").html()).length&&jQuery(this).prev().not("div.fullwidth-row").remove(),0==jQuery.trim(jQuery(this).next().not("div.fullwidth-row").children(".row").children(".col-lg-12").html()).length&&jQuery(this).next().not("div.fullwidth-row").remove()}); \ No newline at end of file +jQuery(document).ready(function(){"use strict";jQuery(".video-container").length>0&&jQuery(".video-container").fitVids(),jQuery(".panel-group").length>0&&jQuery(".panel-group").each(function(){0==jQuery(this).find(".in").length&&(jQuery(".panel:first-child .panel-collapse",jQuery(this)).addClass("in"),jQuery(".panel:first-child .accordion-toggle",jQuery(this)).removeClass("collapsed"))}),jQuery(".zoom-picture").length>0&&jQuery(".zoom-picture").zoom(),jQuery(".zoom-picture-container").length>0&&jQuery(".vc_single_image-wrapper",".zoom-picture-container").zoom()}),function($){"use strict";$(function(){if($(".recent-posts .recent-post").length>0){var e=$(".recent-posts");e.imagesLoaded(function(){e.masonry({itemSelector:".recent-post"})})}})}(jQuery),jQuery(".fullwidth-row").length>0&&jQuery(".fullwidth-row").each(function(){0==jQuery.trim(jQuery(this).prev().not("div.fullwidth-row").children(".row").children(".col-lg-12").html()).length&&jQuery(this).prev().not("div.fullwidth-row").remove(),0==jQuery.trim(jQuery(this).next().not("div.fullwidth-row").children(".row").children(".col-lg-12").html()).length&&jQuery(this).next().not("div.fullwidth-row").remove()}); \ No newline at end of file diff --git a/plugins/simple-text-rotator/simple-text-rotator.php b/plugins/simple-text-rotator/simple-text-rotator.php index 9163c0b..f76e658 100644 --- a/plugins/simple-text-rotator/simple-text-rotator.php +++ b/plugins/simple-text-rotator/simple-text-rotator.php @@ -39,7 +39,7 @@ function curly_simple_content_rotator( $atts , $content = null ) { ), $atts ) ); $html = '
'; - $html .= do_shortcode($content); + $html .= apply_filters( 'the_content', $content); $html .= '
'; return $html; diff --git a/shortcodes/abbr.php b/shortcodes/abbr.php index 413e694..ddf7edb 100644 --- a/shortcodes/abbr.php +++ b/shortcodes/abbr.php @@ -1,7 +1,7 @@ '.$content.''; } ?> \ No newline at end of file diff --git a/shortcodes/accordion.php b/shortcodes/accordion.php index 0124322..c17a1a5 100644 --- a/shortcodes/accordion.php +++ b/shortcodes/accordion.php @@ -13,7 +13,7 @@ function curly_accordion( $atts, $content = null ) { $GLOBALS['accordionPanelID'] = $GLOBALS['accordionID'] * 100; $html = '
'; - $html .= do_shortcode($content).'
'; + $html .= apply_filters( 'the_content', $content).''; return $html; } @@ -30,7 +30,7 @@ function curly_toggle( $atts, $content = null ) { // Global Panel ID $GLOBALS['accordionPanelID']++; - if ( $opened == "yes" ) { + if ( filter_var( $opened, FILTER_VALIDATE_BOOLEAN ) === true ) { $opened = ' in'; $collapsed = null; } else { @@ -45,7 +45,7 @@ function curly_toggle( $atts, $content = null ) { $html .= '
'; $html .= '
'.$title.'
'; $html .= '
- '.do_shortcode($content).'
'; + '.apply_filters( 'the_content', $content).'
'; $html .= ''; } diff --git a/shortcodes/action.php b/shortcodes/action.php index 37942ac..83c4a4c 100644 --- a/shortcodes/action.php +++ b/shortcodes/action.php @@ -5,24 +5,27 @@ function curly_action( $atts, $content = null ) { extract(shortcode_atts(array( 'title' => null, 'button' => null, + 'button_vc' => null, 'link' => null, 'style' => null ), $atts)); - switch ( $style ) { - case '1' : $style = ' style-1'; break; - case '2' : $style = ' style-2'; break; - case '3' : $style = ' style-3'; break; - case '4' : $style = ' style-4'; break; - case '5' : $style = ' style-5'; break; + switch ( intval( $style ) ) { + case 1 : $style = ' style-1'; break; + case 2 : $style = ' style-2'; break; + case 3 : $style = ' style-3'; break; + case 4 : $style = ' style-4'; break; + case 5 : $style = ' style-5'; break; default: $style = null; break; } + + $button = ! is_null( $button_vc ) ? $button_vc : $button; $html = '
'; - $html .= ($button) ? do_shortcode('[button link="'.$link.'" size="large" class="hidden-xs"]'.$button.'[/button]') : null ; - $html .= ($title) ? '

'.$title.'

' : null; - $html .= do_shortcode($content); - $html .= ($button) ? do_shortcode('[button link="'.$link.'" class="visible-xs btn-large btn-block btn-default"]'.$button.'[/button]') : null; + $html .= $button ? do_shortcode('[button link="'.$link.'" size="large" class="hidden-xs"]'.$button.'[/button]') : null ; + $html .= $title ? '

'.$title.'

' : null; + $html .= apply_filters( 'the_content', $content ); + $html .= $button ? do_shortcode('[button link="'.$link.'" class="visible-xs btn-large btn-block btn-default"]'.$button.'[/button]') : null; $html .= '
'; return $html; diff --git a/shortcodes/agenda.php b/shortcodes/agenda.php index 8e162ac..cfbdfd8 100644 --- a/shortcodes/agenda.php +++ b/shortcodes/agenda.php @@ -7,6 +7,7 @@ function curly_agenda( $atts, $content = null ) { } add_shortcode("event-day", "curly_day"); +add_shortcode("event_day", "curly_day"); function curly_day( $atts, $content = null ) { extract(shortcode_atts(array( @@ -38,7 +39,7 @@ function curly_event( $atts, $content = null ) { if ( $content || $room || $time ) { $html .= '
'; $html .= ( $time ) ? ' '.$time.'' : null; - $html .= ( $content ) ? '
'.do_shortcode($content).'
' : null; + $html .= ( $content ) ? '
'.apply_filters( 'the_content', $content).'
' : null; $html .= ( $room ) ? ''.$room.' ' : null; $html .= '
'; } diff --git a/shortcodes/boxes.php b/shortcodes/boxes.php index 2355f14..b70e64d 100644 --- a/shortcodes/boxes.php +++ b/shortcodes/boxes.php @@ -12,34 +12,34 @@ function curly_box( $atts, $content = null ) { $css = ( $background ) ? 'style="background-color: '.$background.'"' : null; - switch ( $style ) { - case '1' : { + switch ( intval( $style ) ) { + case 1 : { $html .= '
'; $html .= do_shortcode($content); $html .= '
'; } break; - case '2' : { + case 2 : { $html .= '
'; $html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" boxed="yes" position="left"]') : null; $html .= ( $title ) ? '

'.$title.'

' : null; $html .= do_shortcode($content); $html .= '
'; } break; - case '3' : { + case 3 : { $html .= '
'; $html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" size="3x" boxed="yes" bg="transparent"]') : null; $html .= ( $title ) ? '

'.$title.'

' : null; $html .= do_shortcode($content); $html .= '
'; } break; - case '4' : { + case 4 : { $html .= '
'; $html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" boxed="yes"]') : null; $html .= ( $title ) ? '

'.$title.'

' : null; $html .= do_shortcode($content); $html .= '
'; } break; - case '5' : { + case 6 : { $html .= '
'; $html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" boxed="yes" size="4x"]') : null; $html .= '
'; diff --git a/shortcodes/buttons.php b/shortcodes/buttons.php index 2b8eca7..c553afc 100644 --- a/shortcodes/buttons.php +++ b/shortcodes/buttons.php @@ -36,6 +36,6 @@ function curly_buttons( $atts, $content = null ) { $rel_val = ( isset($rel) ) ? 'rel="'.$rel.'"' : null; // Return - return ''.do_shortcode( $content ).''; + return ''.do_shortcode($content).''; } ?> \ No newline at end of file diff --git a/shortcodes/client-list.php b/shortcodes/client-list.php index 82caeb8..de93f30 100644 --- a/shortcodes/client-list.php +++ b/shortcodes/client-list.php @@ -10,7 +10,7 @@ function curly_clients( $atts, $content = null ) { $GLOBALS['rand_carousel'] = ( isset($GLOBALS['rand_carousel']) ) ? + 1 : 0; $rand_carousel = 'carousel-'.$GLOBALS['rand_carousel']; - $html = '
    '.do_shortcode($content).'
'; + $html = '
    '.apply_filters( 'the_content', $content).'
'; $html .= '
diff --git a/shortcodes/columns.php b/shortcodes/columns.php index 6cc8709..206377b 100644 --- a/shortcodes/columns.php +++ b/shortcodes/columns.php @@ -22,8 +22,8 @@ function curly_column( $atts, $content = null ) { } $inline = ($margin != null) ? ' style="margin-bottom: '.$margin.'px" ' : null; - - return ( $last == 'yes' ) ? '
'.do_shortcode($content).'
' : '
'.do_shortcode($content).'
'; + $content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content; + return ( $last == 'yes' ) ? '
'.apply_filters( 'the_content', $content).'
' : '
'.apply_filters( 'the_content', $content).'
'; } ?> \ No newline at end of file diff --git a/shortcodes/dividers.php b/shortcodes/dividers.php index 9877a40..8502bb4 100644 --- a/shortcodes/dividers.php +++ b/shortcodes/dividers.php @@ -10,12 +10,12 @@ function curly_dividers( $atts, $content = null ) { $css = 'divider'; - switch ($style){ - case '1' : $css .= ' one'; break; - case '2' : $css .= ' two'; break; - case '3' : $css .= ' three'; break; - case '4' : $css .= ' four'; break; - case '5' : $css .= ' five'; break; + switch( intval( $style ) ){ + case 1 : $css .= ' one'; break; + case 2 : $css .= ' two'; break; + case 3 : $css .= ' three'; break; + case 4 : $css .= ' four'; break; + case 5 : $css .= ' five'; break; } $inline = null; diff --git a/shortcodes/fullwidth.php b/shortcodes/fullwidth.php index 3dda7fb..f3305ab 100644 --- a/shortcodes/fullwidth.php +++ b/shortcodes/fullwidth.php @@ -36,7 +36,7 @@ function curly_fullwidthbox( $atts, $content = null ) { $html = '
'; $html .= '
'; - $html .= do_shortcode($content); + $html .= apply_filters( 'the_content', $content); $html .= '
'; $html .= '
'; diff --git a/shortcodes/highlight.php b/shortcodes/highlight.php index a31fd7a..a48900d 100644 --- a/shortcodes/highlight.php +++ b/shortcodes/highlight.php @@ -16,7 +16,7 @@ function curly_highlight( $atts, $content = null ) { default : $style = null; } - return '
'.do_shortcode($content).'
'; + return '
'.apply_filters( 'the_content', $content).'
'; } ?> \ No newline at end of file diff --git a/shortcodes/lists.php b/shortcodes/lists.php index 0a23da1..97fec03 100644 --- a/shortcodes/lists.php +++ b/shortcodes/lists.php @@ -17,8 +17,10 @@ function curly_lists( $atts, $content = null ) { case 'none' : $css = 'list-none'; break; default : $css = 'list-none'; } + + $content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content; - return '
'.do_shortcode($content).'
'; + return '
'.apply_filters( 'the_content', $content ).'
'; } ?> \ No newline at end of file diff --git a/shortcodes/map-maker.php b/shortcodes/map-maker.php index 1951138..80221df 100644 --- a/shortcodes/map-maker.php +++ b/shortcodes/map-maker.php @@ -38,7 +38,7 @@ function curly_mapmaker( $atts, $content = null ) { if ( $content ) { $markers = 'marker:{ - values:['.do_shortcode( $content ).'], + values:['.apply_filters( 'the_content', $content ).'], events:{ mouseover: function(marker, event, context){ var map = jQuery(this).gmap3("get"), diff --git a/shortcodes/marker.php b/shortcodes/marker.php index ed9a1e2..c2e7156 100644 --- a/shortcodes/marker.php +++ b/shortcodes/marker.php @@ -15,7 +15,7 @@ function curly_marker( $atts, $content = null ) { default : $css = 'label-primary'; } - return ''.do_shortcode($content).''; + return ''.apply_filters( 'the_content', $content).''; } diff --git a/shortcodes/person.php b/shortcodes/person.php index d88a785..d0a2008 100644 --- a/shortcodes/person.php +++ b/shortcodes/person.php @@ -16,23 +16,26 @@ function curly_person( $atts, $content = null ) { $html = '
'; + $style = is_null( $style ) ? 'normal' : $style; + $picture = is_numeric( $picture ) ? wp_get_attachment_url( $picture ) : $picture; + $content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content; if ( $style ) { if($style == 'mini') { $html .= ( $picture ) ? ''.$name.'' : null; $html .= '
'; $html .= ( $name ) ? ''.$name.'
' : null; $html .= ( $position ) ? $position.'
' : null; - $html .= ( $content ) ? do_shortcode($content) : null; + $html .= ( $content ) ? apply_filters( 'the_content', $content) : null; $html .= '
'; } else{ $html .= ( $picture ) ? '

'.$name.'

' : null; $html .= '
'; $html .= ( $name ) ? '
'.$name.'
' : null; $html .= ( $position ) ? $position.'

' : null; - $html .= ( $content ) ? '

'.do_shortcode($content).'

' : null; + $html .= ( $content ) ? '

'.apply_filters( 'the_content', $content).'

' : null; $html .= ( $facebook || $twitter || $linkedin || $email ) ? '

' : null; $html .= ( $facebook ) ? ''.do_shortcode('[icon icon="facebook" boxed="yes"]').' ' : null; - $html .= ( $twitter ) ? ''.do_shortcode('[icon icon="twitter" boxed="yes"]').' ' : null; + $html .= ( $twitter ) ? ''.do_shortcode( '[icon icon="twitter" boxed="yes"]').' ' : null; $html .= ( $linkedin ) ? ''.do_shortcode('[icon icon="linkedin" boxed="yes"]').' ' : null; $html .= ( $email ) ? ''.do_shortcode('[icon icon="envelope" boxed="yes"]').' ' : null; $html .= ( $facebook || $twitter || $linkedin || $email ) ? '

' : null; diff --git a/shortcodes/photo-frame.php b/shortcodes/photo-frame.php index 046babe..1422b4a 100644 --- a/shortcodes/photo-frame.php +++ b/shortcodes/photo-frame.php @@ -1,6 +1,6 @@ '.do_shortcode($content).'
'; + return '
'.apply_filters( 'the_content', $content ).'
'; } ?> \ No newline at end of file diff --git a/shortcodes/pretty-photo.php b/shortcodes/pretty-photo.php index f0998de..930e215 100644 --- a/shortcodes/pretty-photo.php +++ b/shortcodes/pretty-photo.php @@ -11,7 +11,7 @@ function curly_prettyphoto( $atts, $content = null ) { $display = ( $visible == 'no' ) ? ' style="display:none"' : null; - return ''.do_shortcode($content).''; + return ''.apply_filters( 'the_content', $content).''; } diff --git a/shortcodes/pricing.php b/shortcodes/pricing.php index 98074c0..fc16f63 100644 --- a/shortcodes/pricing.php +++ b/shortcodes/pricing.php @@ -1,5 +1,6 @@ '.do_shortcode($content).'
'; + return '
'.apply_filters( 'the_content', $content).'
'; } -add_shortcode("pricing-header", "curly_pricing_table_header"); +add_shortcode("pricing-header", "curly_pricing_table_header"); +add_shortcode("curly_pricing_header", "curly_pricing_table_header"); function curly_pricing_table_header( $atts, $content = null ) { extract(shortcode_atts(array( @@ -32,7 +34,9 @@ function curly_pricing_table_header( $atts, $content = null ) { return $html; } -add_shortcode("pricing-column", "curly_pricing_table_column"); +add_shortcode("pricing-column", "curly_pricing_table_column"); +add_shortcode("curly_pricing_column", "curly_pricing_table_column"); + function curly_pricing_table_column( $atts, $content = null ) { extract(shortcode_atts(array( @@ -50,20 +54,22 @@ function curly_pricing_table_column( $atts, $content = null ) { default : $css .= ' one-four'; } - $css .= ( $highlight == "yes" ) ? " highlight-column" : null; + $css .= ( filter_var( $highlight, FILTER_VALIDATE_BOOLEAN ) === true ) ? " highlight-column" : null; $css .= ( $last == "yes" ) ? " last" : null; - return ( $content ) ? '
'.do_shortcode($content).'
' : null; + return ( $content ) ? '
'.apply_filters( 'the_content', $content).'
' : null; } -add_shortcode("pricing-row", "curly_pricing_table_row"); +add_shortcode("pricing-row", "curly_pricing_table_row"); +add_shortcode("curly_pricing_row", "curly_pricing_table_row"); function curly_pricing_table_row( $atts, $content = null ) { return ( $content ) ? ''.$content.'' : null; } -add_shortcode("pricing-footer", "curly_pricing_table_footer"); +add_shortcode("pricing-footer", "curly_pricing_table_footer"); +add_shortcode("curly_pricing_footer", "curly_pricing_table_footer"); function curly_pricing_table_footer( $atts, $content = null ) { return ( $content ) ? '
'.do_shortcode($content).'
' : null; diff --git a/shortcodes/quotes.php b/shortcodes/quotes.php index 18add36..e6aff94 100644 --- a/shortcodes/quotes.php +++ b/shortcodes/quotes.php @@ -9,7 +9,7 @@ function curly_blockquote( $atts, $content = null ) { ), $atts)); $img = ( $image ) ? '' : null; - - return ( $content ) ? '
'.$img.$content.( ( $cite ) ? ''.$cite.'' : null ).'
' : null; + //$content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content; + return ( $content ) ? '
' . $img . do_shortcode( $content ) . ( $cite ? ''.$cite . '' : null ) . '
' : null; } ?> \ No newline at end of file diff --git a/shortcodes/slider-ios.php b/shortcodes/slider-ios.php index bad2bd9..6a14239 100644 --- a/shortcodes/slider-ios.php +++ b/shortcodes/slider-ios.php @@ -19,7 +19,7 @@ function curly_iosslider( $atts, $content = null ) { $html = '
'; // Populate Slider - $html .= '
'.do_shortcode($content).'
'; + $html .= '
'.apply_filters( 'the_content', $content).'
'; // Navigation Arrows $html .= ''; diff --git a/shortcodes/slider-roundabout.php b/shortcodes/slider-roundabout.php index 8b59afc..e7f205d 100644 --- a/shortcodes/slider-roundabout.php +++ b/shortcodes/slider-roundabout.php @@ -17,7 +17,7 @@ function curly_roundaboutslider( $atts, $content = null ) { } // Populate Slider - $html = '
    '.do_shortcode($content).'
'; + $html = '
    '.apply_filters( 'the_content', $content).'
'; function curly_shortcode_roundabout() { $html = ""; @@ -25,7 +25,7 @@ function curly_slider( $atts, $content = null ) { function curly_slide( $atts, $content = null ) { $GLOBALS['carouselSlideID']++; if($GLOBALS['carouselSlideID'] % 100 == 1) $css = ' active'; else $css = null; - return '
  • '.do_shortcode($content).'
    • '; + return '
  • '.apply_filters( 'the_content', $content).'
    • '; } ?> \ No newline at end of file diff --git a/shortcodes/tabs.php b/shortcodes/tabs.php index 50330ed..67a7186 100644 --- a/shortcodes/tabs.php +++ b/shortcodes/tabs.php @@ -1,6 +1,6 @@ '; $html .= '
    '; - $html .= do_shortcode($content); + $html .= apply_filters( 'the_content', $content); $html .= '
    '; $html .= '
    '; @@ -29,7 +29,7 @@ function curly_tabs( $atts, $content = null ) { } add_shortcode('tab', 'curly_tab'); - function curly_tab( $atts, $content = null ) { +function curly_tab( $atts, $content = null ) { $GLOBALS['tabsSlideID']++; extract(shortcode_atts(array(), $atts)); if( $GLOBALS['tabsSlideID'] % 100 == 1 ) { @@ -37,9 +37,83 @@ function curly_tab( $atts, $content = null ) { } else { $css = null; } - $html = '
    ' . do_shortcode($content) .'
    '; + $html = '
    ' . apply_filters( 'the_content', $content) .'
    '; return $html; } +add_shortcode('curly_tabs', 'curly_tabs_vc'); +function curly_tabs_vc( $atts, $content = null ) { + + $GLOBALS['tabsID'] = ( isset($GLOBALS['tabsID']) ) ? $GLOBALS['tabsID'] + 1 : 0; + $GLOBALS['tabsSlideID'] = $GLOBALS['tabsID'] * 100; + + $pattern = get_shortcode_regex(); + + preg_match_all( "/$pattern/", $content, $shortcodes ); + + $shortcodes_array = $shortcodes[2]; + $shortcodes_values_array = $shortcodes[3]; + $shortcodes_content_array = $shortcodes[5]; + + extract( shortcode_atts( array() , $atts ) ); + + if( has_shortcode( $content, 'curly_tab' ) ){ + + $html = '
    '; + + $html .= '
      '; + + $tabs_keys = array_keys( $shortcodes_array, 'curly_tab' ); + + $index = 0; + + foreach( $tabs_keys as $key => $tab ){ + + extract( + shortcode_atts( + array( + 'title' => null + ), + shortcode_parse_atts( $shortcodes_values_array[ $tab ] ), 'curly_tab' + ) + ); + + $html .= '
    • ' . $title . '
      • '; + + $index++; + } + + $html .= '
    '; + + $html .= '
    '; + + $html .= do_shortcode( $content ); + + $html .= '
    '; + + $html .= '
    '; + + return $html; + + } + +} + + +add_shortcode('curly_tab', 'curly_tab_vc'); +function curly_tab_vc( $atts, $content = null ) { + $GLOBALS['tabsSlideID']++; + extract(shortcode_atts(array(), $atts)); + if( $GLOBALS['tabsSlideID'] % 100 == 1 ) { + $css = ' active'; + } else { + $css = null; + } + $html = '
    ' . apply_filters( 'the_content', $content) .'
    '; + + return $html; +} + + ?> \ No newline at end of file diff --git a/shortcodes/testimonials.php b/shortcodes/testimonials.php index 06c9038..7b0fa4d 100644 --- a/shortcodes/testimonials.php +++ b/shortcodes/testimonials.php @@ -11,7 +11,7 @@ function curly_testimonials( $atts, $content = null ) { $GLOBALS['carouselID'] = ( isset($GLOBALS['carouselID']) ) ? +1 : 0; $GLOBALS['carouselSlideID'] = $GLOBALS['carouselID'] * 100; - $html = ''; + $html = ''; if ( $height && $height == "equal" ) { $html .= ""; diff --git a/shortcodes/toggle-box.php b/shortcodes/toggle-box.php index ea7b520..f0a1b6c 100644 --- a/shortcodes/toggle-box.php +++ b/shortcodes/toggle-box.php @@ -1,5 +1,6 @@
    '.$title.'
    '.do_shortcode($content).'
    '; + return '
    '.$title.'
    '.apply_filters( 'the_content', $content).'
    '; } ?> \ No newline at end of file