Permalink
Browse files

UI_Chooseicons (#7)

* add I_UI interface

* some tests

* test 2

* make some fixes

* upd

* add space

* UPD: style guid fixes

* UPD

* Add: travis things

* UPD: travis

* Add: ui-number

* ADD: ui-collection

* ADD: required

* REMOVE: travis

* Merge remote-tracking branch 'CherryFramework/master'

# Conflicts:
#
modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/min/ui-media.
min.js
#	modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/ui-media.js

* Travis

* Local travis

* Collection small fix

* ADD: page builder, taxonomy

* UPD: add to ignore

* UPD:Fix conflicts

* UPD

* ignore

* fix ignore

* ADD: page-builder, cherry-creator

* UPD: Travis fixes

* UPD

* UPD: fix taxonomies

* UPD: new utility

* UPD: style guide fixes

* ADD: new utilit

* UPD

* UPD: some fixes

* UPD: fix interface load

* UPD: travis

* UPD: travis

* ADD: ui-chooseicons

* UPD: cherry-ui-elements.php

* UPD: small fixes

* UPD: fix meta problem

* UPD: travis fixes

* UPD: travis fixe

* UPD: travis fixe

* UPD: travis fixes

* UPD: travis fixes

* UPD: travis fixes
  • Loading branch information...
1 parent 015dbe3 commit f10e81621060633d921d67e3e1ab29f496570723 @gcofficial gcofficial committed with MakhonkoDenis Apr 13, 2016
Showing with 7,113 additions and 70 deletions.
  1. +1 −0 .jscsrc
  2. +0 −1 .travis.yml
  3. +1 −0 modules/cherry-creator/cherry-creator.php
  4. +13 −13 modules/cherry-customizer/cherry-customizer.php
  5. +7 −7 modules/cherry-dynamic-css/cherry-dynamic-css.php
  6. +42 −42 modules/cherry-dynamic-css/inc/class-cherry-dynamic-css-utilities.php
  7. +3 −1 modules/cherry-post-meta/views/meta.php
  8. +2 −0 modules/cherry-ui-elements/cherry-ui-elements.php
  9. +2,086 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/css/font-awesome.css
  10. +2 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/css/ui-chooseicons.css
  11. +50 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/js/ui-chooseicons.min.js
  12. +932 −0 .../cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/material/material_icons_codepoints.list
  13. +55 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/sass/ui-chooseicons.scss
  14. +3,210 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/ts/jquery.d.ts
  15. +12 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/ts/tsconfig.json
  16. +126 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/ts/ui-chooseicons.ts
  17. +79 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/inc/icon-set-font-awesome.php
  18. +79 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/inc/icon-set-font-material.php
  19. +164 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/inc/icon-set.php
  20. +191 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/ui-chooseicons.php
  21. +32 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/views/choose-icons.php
  22. +13 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/views/font-awesome.php
  23. +13 −0 modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/views/material-icons.php
  24. +0 −6 travis.sh
View
@@ -29,5 +29,6 @@
"modules/cherry-ui-elements/inc/ui-elements/ui-collection/assets/js/ui-collection.js",
"modules/cherry-page-builder/assets/js/page-settings.min.js",
"modules/cherry-ui-elements/inc/ui-elements/ui-collection/assets/js/min/jquery.collection.min.js",
+ "modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/js/ui-chooseicons.min.js"
]
}
View
@@ -10,7 +10,6 @@ language: php
# Declare versions of PHP to use. Use one decimal max.
php:
-# - "7.0"
- "5.6"
- "5.5"
- "5.4"
@@ -1,5 +1,6 @@
<?php
/**
+ * Creator
*
* Module Name: Creator
* Description: Creator
@@ -531,7 +531,7 @@ public function get_value( $id, $default = null ) {
* Retrieve a default option value.
*
* @since 1.0.0
- * @param string $id Settings ID.
+ * @param [string] $id Settings ID.
* @return mixed
*/
public function get_default( $id ) {
@@ -542,7 +542,7 @@ public function get_default( $id ) {
* Whitelist for setting type.
*
* @since 1.0.0
- * @param string $type Settings type.
+ * @param [string] $type Settings type.
* @return bool
*/
public function sanitize_type( $type ) {
@@ -565,7 +565,7 @@ public function sanitize_type( $type ) {
* @author Cherry Team <cherryframework@gmail.com>
* @see wp_filter_post_kses() https://developer.wordpress.org/reference/functions/wp_filter_post_kses/
* @since 1.0.0
- * @param string $html HTML to sanitize.
+ * @param [string] $html HTML to sanitize.
* @return string Sanitized HTML.
*/
public function sanitize_text( $html ) {
@@ -586,7 +586,7 @@ public function sanitize_text( $html ) {
* @see sanitize_email() https://developer.wordpress.org/reference/functions/sanitize_key/
* @link sanitize_email() https://codex.wordpress.org/Function_Reference/sanitize_email
* @since 1.0.0
- * @param string $email Email address to sanitize.
+ * @param [string] $email Email address to sanitize.
* @param WP_Customize_Setting $setting Setting instance.
* @return string The sanitized email if not null; otherwise, the setting default.
*/
@@ -602,7 +602,7 @@ public function sanitize_email( $email, $setting ) {
* Textarea sanitization callback.
*
* @since 1.0.0
- * @param string $html HTML to sanitize.
+ * @param [string] $html HTML to sanitize.
* @return string Sanitized HTML.
*/
public function sanitize_textarea( $html ) {
@@ -623,7 +623,7 @@ public function sanitize_textarea( $html ) {
* @see sanitize_key() https://developer.wordpress.org/reference/functions/sanitize_key/
* @see $wp_customize->get_control() https://developer.wordpress.org/reference/classes/wp_customize_manager/get_control/
* @since 1.0.0
- * @param string $input Slug to sanitize.
+ * @param [string] $input Slug to sanitize.
* @param WP_Customize_Setting $setting Setting instance.
* @return string Sanitized slug if it is a valid choice; otherwise, the setting default.
*/
@@ -676,7 +676,7 @@ public function sanitize_checkbox( $checked ) {
* @see sanitize_hex_color() https://developer.wordpress.org/reference/functions/sanitize_hex_color/
* @link sanitize_hex_color_no_hash() https://developer.wordpress.org/reference/functions/sanitize_hex_color_no_hash/
* @since 1.0.0
- * @param string $hex_color HEX color to sanitize.
+ * @param [string] $hex_color HEX color to sanitize.
* @param WP_Customize_Setting $setting Setting instance.
* @return string The sanitized hex color if not null; otherwise, the setting default.
*/
@@ -701,7 +701,7 @@ public function sanitize_hex_color( $hex_color, $setting ) {
* @author Cherry Team <cherryframework@gmail.com>
* @see wp_check_filetype() https://developer.wordpress.org/reference/functions/wp_check_filetype/
* @since 1.0.0
- * @param string $image Image filename.
+ * @param [string] $image Image filename.
* @param WP_Customize_Setting $setting Setting instance.
* @return string The image filename if the extension is allowed; otherwise, the setting default.
*/
@@ -736,7 +736,7 @@ public function sanitize_image( $image, $setting ) {
* @author Cherry Team <cherryframework@gmail.com>
* @see esc_url_raw() https://developer.wordpress.org/reference/functions/esc_url_raw/
* @since 1.0.0
- * @param string $url URL to sanitize.
+ * @param [string] $url URL to sanitize.
* @return string Sanitized URL.
*/
public function sanitize_url( $url ) {
@@ -747,7 +747,7 @@ public function sanitize_url( $url ) {
* File URL sanitization callback.
*
* @since 1.0.0
- * @param string $url File URL to sanitize.
+ * @param [string] $url File URL to sanitize.
* @return string Sanitized URL.
*/
public function sanitize_file( $url ) {
@@ -904,7 +904,7 @@ public function get_fonts_data() {
* Retrieve array with font-family (for select element).
*
* @since 1.0.0
- * @param string $type Font type.
+ * @param [string] $type Font type.
* @return array
*/
public function get_fonts( $type = '' ) {
@@ -927,7 +927,7 @@ public function get_fonts( $type = '' ) {
*
* @since 1.0.0
* @global object $wp_filesystem
- * @param string $file File path.
+ * @param [string] $file File path.
* @return array Fonts data.
*/
public function read_font_file( $file ) {
@@ -1055,7 +1055,7 @@ public function clear_fonts() {
* Handler for custom `active_callback` feature.
*
* @since 1.0.0
- * @param string $callback Callback-function.
+ * @param [string] $callback Callback-function.
* @return mixed
*/
public function active_callback( $callback ) {
@@ -1,8 +1,8 @@
<?php
/**
- *
- * Module Name: Dynamic Css
- * Description: Generate Css
+ * Dynamic CSS parser
+ * Module Name: Dynamic CSS
+ * Description: CSS parser which uses variables & functions for CSS code optimization
* Version: 1.0.0
* Author: Cherry Team
* Author URI: http://www.cherryframework.com/
@@ -198,7 +198,7 @@ public function get_standard_vars() {
* Get path inside of current module
*
* @since 1.0.0
- * @param string $path file inside module directory to get path for.
+ * @param [type] $path file inside module directory to get path for.
* @return string
*/
public function get_path( $path = null ) {
@@ -256,7 +256,7 @@ public function get_css_functions() {
* Parse CSS string and replasce varaibles and functions
*
* @since 1.0.0
- * @param string $css CSS to parse.
+ * @param [type] $css CSS to parse.
* @return string
*/
public function parse( $css ) {
@@ -327,7 +327,7 @@ public function print_inline_css() {
* Callback function to replace CSS vars
*
* @since 1.0.0
- * @param string $matches founded vars.
+ * @param [string] $matches founded vars.
*/
function replace_vars( $matches ) {
@@ -371,7 +371,7 @@ function replace_vars( $matches ) {
* Callback function to replace CSS functions
*
* @since 1.0.0
- * @param string $matches founded dunction.
+ * @param [string] $matches founded dunction.
*/
function replace_func( $matches ) {
Oops, something went wrong.

0 comments on commit f10e816

Please sign in to comment.