Skip to content

Commit

Permalink
Merge pull request #87 from MachoThemes/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Robciuc Ioan committed Mar 8, 2016
2 parents 9ce3fee + 8a1822c commit a896a01
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Lastly, Decode has social icons that can link to your profiles from every side o
- My NCBI Bibliography
- Amazon Wishlist
- Periscope
- PGP
- Keybase
- PayPal

To find un-minified, vendor-prefixed CSS, look no further than the .css files in the "styles" directory. No seriously, don't look any further because the styles/src directory contains un-prefixed sass files that you may not want to work with.
Expand Down
6 changes: 3 additions & 3 deletions inc/customizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ public static function decode_customize_register( $wp_customize ) {
'sanitize_callback' => 'decode_sanitize_string',
) );

$wp_customize->add_setting( 'pgp_username', array(
$wp_customize->add_setting( 'keybase_username', array(
'default' => '',
'sanitize_callback' => 'decode_sanitize_string',
) );
Expand Down Expand Up @@ -1234,8 +1234,8 @@ public static function decode_customize_register( $wp_customize ) {
'priority' => 63,
) );

$wp_customize->add_control( 'pgp_username', array(
'label' => sprintf( __( '%s Username', 'decode' ), 'PGP' ),
$wp_customize->add_control( 'keybase_username', array(
'label' => sprintf( __( '%s Username', 'decode' ), 'Keybase' ),
'section' => 'decode_social_options',
'active_callback' => 'decode_social_icons_are_enabled',
'type' => 'text',
Expand Down
10 changes: 8 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: responsive-layout, one-column, two-columns, left-sidebar, right-sidebar, c

Requires at least: 4.0
Tested up to: 4.2.2
Stable tag: 3.11.0
Stable tag: 3.12.0
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand All @@ -32,6 +32,12 @@ Decode includes support for:

== Changelog ==

### v3.12.0
Improved:
- Has been changed the permalink on "More Info Here" from style.css file.
- Has been changed the screenshot.
- Has been changed "Keybase" instead "PHP" in social options.

### v3.11.0
Added:
- Has been added Bangladesh language.
Expand All @@ -50,7 +56,7 @@ Decode includes support for:
- Social Icon for Amazon Wishlist.
- Live update for fields.
- Add Periscope Icon.
- Social icon for PGP public key.
- Social icon for Keybase.
- Add PayPal donation button to the Social buttons.

Improved:
Expand Down
Binary file modified screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions social-links.php
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,8 @@
</a>
<?php endif; ?>

<?php if ( get_theme_mod( 'pgp_username', '' ) !== '' ) : ?>
<a class="contact-link KeyBaseLink" href="https://keybase.io/<?php echo esc_attr( get_theme_mod( 'pgp_username', '' ) ); ?>" <?php if ( get_theme_mod( 'open_links_in_new_tab', false ) == true ) echo 'target="_blank"'; ?>>
<?php if ( get_theme_mod( 'keybase_username', '' ) !== '' ) : ?>
<a class="contact-link KeyBaseLink" href="https://keybase.io/<?php echo esc_attr( get_theme_mod( 'keybase_username', '' ) ); ?>" <?php if ( get_theme_mod( 'open_links_in_new_tab', false ) == true ) echo 'target="_blank"'; ?>>
<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg"> <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <path class="social-icon-fill SocialIconFill" d="m100 0c-39.323-0.5461-77.245 24.729-92.141 61.076-15.551 35.707-7.5052 80.064 19.754 107.91 26.228 28.23 69.437 38.53 105.62 25.36 37.5-12.74 65.15-49.58 66.64-89.2 2.49-38.519-19.83-77.018-54.34-94.211-14.02-7.2041-29.77-10.963-45.53-10.939zm1.15 67c3.52 0.084 7.02 0.624 10.21 1.453 9.38 2.495 13.32 12.117 12.94 20.344h-14.81c-0.12-3.513-1.01-7.405-4.02-9.83-6.291-5.094-13.998 1.787-14.14 8.064-1.735 10.935-1.668 22.239 0.508 33.119 0.596 5.83 7.962 10.75 13.592 6.62 6.03-3.71 4.81-10.76 4.91-16.5h-10.19v-10.21h25.01v37.08h-7.28c-2.47 0.15-5.13 0.48-4.1-2.59 0.98-6.84-2.43-0.08-6 1.55-7.43 3.24-17.135 2.92-23.997-1.37-8.273-6.41-8.374-17.2-8.957-26.32-0.035-11.275-1.018-23.767 6.135-33.592 4.65-5.982 12.453-8.002 20.189-7.818zm-55.777 0.088c6.94 0.053 14.177 1.817 18.174 7.432 5.617 8.448 5.716 20.577-1.225 28.43-6.895 7.16-17.885 6.55-27.386 6.5v28.09h-15.459v-70.376h22.951c0.969-0.056 1.954-0.084 2.945-0.076zm115.74 0c6.94 0.053 14.17 1.817 18.17 7.432 5.62 8.448 5.72 20.577-1.23 28.43-6.89 7.16-17.88 6.55-27.38 6.5v28.09h-15.46v-70.376h22.95c0.97-0.056 1.95-0.084 2.95-0.076zm-121.81 10.502c-1.507 0.016-2.994 0.067-4.365 0.021v21.387c3.349-0.101 6.777 0.271 10.074-0.361 7.734-1.813 8.464-11.072 5.711-16.727-2.212-4.102-6.9-4.367-11.42-4.32zm115.73 0c-1.5 0.016-2.99 0.067-4.36 0.021v21.387c3.35-0.101 6.78 0.271 10.07-0.361 7.74-1.813 8.47-11.072 5.72-16.727-2.22-4.102-6.91-4.367-11.43-4.32z" fill="#444444"></path> </g> </svg>
</a>
<?php endif; ?>
Expand Down
4 changes: 2 additions & 2 deletions styles/src/style.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
Theme Name: Decode
Theme URI: http://www.machothemes.com/themes/decode/
Version: 3.11.0
Version: 3.12.0
Author: Macho Themes
Author URI: http://www.machothemes.com/
Description: A minimal, modern theme, designed to be mobile first and fully responsive. Decode features the ability to change all the colors in the theme and an elegant sidebar conveniently accessed by tapping on the menu icon. The sidebar can fit all of your widgets and its position can be customized. You can also choose to keep the sidebar always visible on larger screens for a smooth two-column experience. You can even disable the sidebar and comment links if you choose. Decode supports link posts, where the title can be hyperlinked. Decode includes custom social icons in the header that you can easily link to your choice of 55 different social profiles from Twitter and Instagram, to Pinterest and LinkedIn, you will be sure to find support for the network you want alongside a bevy of customizations to make your site unique. Decode has been translated into Chinese, Dutch, French, German, Polish, Russian, and Spanish. <a href="http://scotthsmith.com/projects/decode/">More info here</a>
Description: A minimal, modern theme, designed to be mobile first and fully responsive. Decode features the ability to change all the colors in the theme and an elegant sidebar conveniently accessed by tapping on the menu icon. The sidebar can fit all of your widgets and its position can be customized. You can also choose to keep the sidebar always visible on larger screens for a smooth two-column experience. You can even disable the sidebar and comment links if you choose. Decode supports link posts, where the title can be hyperlinked. Decode includes custom social icons in the header that you can easily link to your choice of 55 different social profiles from Twitter and Instagram, to Pinterest and LinkedIn, you will be sure to find support for the network you want alongside a bevy of customizations to make your site unique. Decode has been translated into Chinese, Dutch, French, German, Polish, Russian, and Spanish. <a href="http://www.machothemes.com/themes/decode/">More info here</a>
Tags: responsive-layout, one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-header, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, black, blue, brown, gray, green, orange, pink, purple, red, silver, tan, white, yellow, dark, light
License: GNU General Public License v3.0
License URI: http://www.gnu.org/licenses/gpl-3.0-standalone.html
Expand Down

0 comments on commit a896a01

Please sign in to comment.