Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
psperkins committed Apr 20, 2015
1 parent 55641c9 commit 15f8290
Show file tree
Hide file tree
Showing 74 changed files with 2,806 additions and 1,080 deletions.
8 changes: 4 additions & 4 deletions admin/bootstrap/css/bootstrap.css
Expand Up @@ -868,7 +868,7 @@ input[type="submit"].btn.btn-mini {
padding: 9px 15px;
border-bottom: 1px solid #eee;
}
.modal-header .close {
#wptouch-settings-area .modal-header .close {
margin-top: 2px;
}
.modal-header h3 {
Expand Down Expand Up @@ -1190,7 +1190,7 @@ input[type="submit"].btn.btn-mini {
.carousel-caption p {
margin-bottom: 0;
}
.close {
#wptouch-settings-area .close {
float: right;
font-size: 20px;
font-weight: bold;
Expand All @@ -1200,14 +1200,14 @@ input[type="submit"].btn.btn-mini {
opacity: 0.2;
filter: alpha(opacity=20);
}
.close:hover {
#wptouch-settings-area .close:hover {
color: #000000;
text-decoration: none;
cursor: pointer;
opacity: 0.4;
filter: alpha(opacity=40);
}
button.close {
#wptouch-settings-area button.close {
padding: 0;
cursor: pointer;
background: transparent;
Expand Down
67 changes: 28 additions & 39 deletions admin/css/wptouch-admin-3.css
@@ -1,15 +1,12 @@
/* @override
http://wptp3.local.com/wp-content/plugins/wptouch-pro-3/admin/css/wptouch-admin-3.css?ver=3.4.4
https://wptp3.local.com/wp-content/plugins/wptouch-pro-3/admin/css/wptouch-admin-3.css?ver=3.4.9
http://wptp3.local.com/wp-content/plugins/wptouch-pro-3/admin/css/wptouch-admin-3.css?ver=3.5
*/
/* @override http://wptp3.local.com/wp-content/plugins/wptouch-pro-3/admin/css/wptouch-admin-3.css?ver=3.7.5 */

/* @group General */

#wpadminbar, #wptouch-settings-area {
-webkit-font-smoothing: antialiased;
}


#wptouch-settings-area {
font-size: 13px;
}
Expand Down Expand Up @@ -85,6 +82,10 @@
overflow: hidden;
}

#wptouch-settings-area .wptouch-section .advanced {
display: none;
}

#wptouch-settings-area .wptouch-section .pro a {
color: #fff;
border-radius: 3px;
Expand Down Expand Up @@ -739,7 +740,8 @@ html[xmlns] .clearfix {
filter: alpha(opacity=40);
opacity: 0.4;
position: relative;
top: 1px;
top: 3px;
font-size: 16px;
}

.theme-tag.wptouch-tooltip {
Expand Down Expand Up @@ -863,10 +865,10 @@ input#preview.disabled {
padding-top: 10px;
padding-right: 18px;
padding-bottom: 10px;
font-weight: bold;
font-size: 15px;
text-transform: capitalize;
float: left;
font-weight: 400;
}

#wptouch-settings-area .wptouch-section ul.padded {
Expand Down Expand Up @@ -995,9 +997,9 @@ input#preview.disabled {
}

#touchboard-news ul li {
padding: 0 15px;
padding-right: 15px;
padding-left: 15px;
margin: 0;
background-color: #fff;
}

#touchboard-news ul li:after {
Expand All @@ -1010,7 +1012,7 @@ input#preview.disabled {

#touchboard-news ul li .date {
padding-top: 8px;
color: rgba(0,0,0,0.41);
color: rgba(0,0,0,0.50);
font-size: 10px;
text-transform: uppercase;
font-weight: normal;
Expand All @@ -1022,6 +1024,9 @@ input#preview.disabled {
color: #666;
font-size: 13px;
line-height: 1.3;
display: block;
padding-bottom: 10px;
padding-top: 10px;
}

#touchboard-news ul li a {
Expand All @@ -1031,15 +1036,7 @@ input#preview.disabled {
line-height: 1.3em;
}

.overview-right-wrap h3:last-child {
border-bottom-style: none;
border-top: 1px solid #E5E5E5;
position: absolute;
z-index: 1;
bottom: 0;
left: 0;
right: 0;
}


.overview-right-wrap h3 a {
font-weight: normal;
Expand All @@ -1051,14 +1048,10 @@ input#preview.disabled {
.overview-right-wrap h3 i {
position: relative;
bottom: 0;
font-size: 10px;
font-size: 11px;
}

.overview-right-wrap h3:last-child i {
margin-right: 7px;
margin-left: 7px;
font-size: 16px;
}


/* @end */

Expand Down Expand Up @@ -1093,11 +1086,11 @@ input#preview.disabled {
}

#plugin-compat-setting.nano {
height: 300px;
height: 280px;
border: 1px solid #e5e5e5;
border-radius: 2px;
width: 75%;
background-color: #fff;
margin-top: 5px;
}

#plugin-compat-setting.nano p {
Expand All @@ -1119,7 +1112,7 @@ input#preview.disabled {
}

#plugin-compat-setting.nano li:nth-child(odd) {
background-color: #fbfbfb;
border-bottom: 1px solid #f8f7f9;
}

#plugin-compat-setting label {
Expand Down Expand Up @@ -1265,6 +1258,10 @@ input#preview.disabled {
height: 50px;
}

#setting-webapp_mode_unavailable input {
display: none;
}

.uploader {
position: relative;
clear: both;
Expand Down Expand Up @@ -2470,7 +2467,7 @@ textarea#homepage_message {

/* @end */

/* @group WordPress 3.8 */
/* @group WordPress 3.8+ Admin Themes */

/* @group Coffee */

Expand Down Expand Up @@ -2611,16 +2608,8 @@ textarea#homepage_message {
}

#touchboard-left {
width: auto;
margin: auto;
}

width: auto !important;
margin: auto !important;
}

#wptouch-settings-area iframe header {
display: none;
}

#setting-webapp_mode_unavailable input {
display: none;
}
19 changes: 7 additions & 12 deletions admin/js/wptouch-admin-3.js
Expand Up @@ -662,7 +662,7 @@ function wptouchHandlePluginCompat() {
jQuery( '#plugin-compat-setting.nano' ).nanoScroller({
preventPageScrolling: true
});
jQuery( '#plugin-compat-setting' ).find( 'i.wptouch-tooltip' ).tooltip( { placement:'right' } );
//jQuery( '#plugin-compat-setting' ).find( 'i.wptouch-tooltip' ).tooltip( { placement:'right' } );
},
0 );
});
Expand Down Expand Up @@ -752,9 +752,9 @@ function wptouchSetupRadios() {
function wptouchRefreshOverviewHeight(){
if ( jQuery( '#touchboard-news' ).length ) {
if ( jQuery( '.wptouch-free' ).length ) {
var leftHeight = ( jQuery( '#touchboard-left' ).height() - 216 );
var leftHeight = ( jQuery( '#touchboard-left' ).height() - 240 );
} else {
var leftHeight = ( jQuery( '#touchboard-left' ).height() - 192 );
var leftHeight = ( jQuery( '#touchboard-left' ).height() - 190 );
}
jQuery( '#touchboard-news' ).height( leftHeight );
}
Expand Down Expand Up @@ -784,13 +784,13 @@ function toggle_remove_shortcodes( myTarget ) {

function wptouchSetupAdminToggles() {
// Enable iOS Web-App Mode
wptouchCheckToggle( '#webapp_mode_enabled', '#setting-webapp_enable_persistence, #section-notice-message, #section-iphone-startup-screen, #section-retina-iphone-startup-screen, #section-iphone-5-startup-screen, #section-iphone-6-startup-screen, #section-iphone-6plus-startup-screen, #section-ipad-mini-and-ipad-startup-screens, #setting-webapp_ignore_urls, #setting-webapp_external_message, #section-retina-ipad-startup-screens' );
wptouchCheckToggle( '#webapp_mode_enabled', '#section-admin_menu_homescreen_icons_options, #setting-webapp_enable_persistence, #section-notice-message, #section-iphone-startup-screen, #section-retina-iphone-startup-screen, #section-iphone-5-startup-screen, #section-iphone-6-startup-screen, #section-iphone-6plus-startup-screen, #section-ipad-mini-and-ipad-startup-screens, #setting-webapp_ignore_urls, #setting-webapp_external_message, #section-retina-ipad-startup-screens' );
// Show a notice message for iPhone, iPod touch & iPad visitors about Web-App Mode
wptouchCheckToggle( '#webapp_show_notice', '#setting-webapp_notice_message, #setting-webapp_notice_expiry_days' );
// Include functions.php from Desktop theme method
wptouchCheckToggle( '#include_functions_from_desktop_theme', '#setting-functions_php_loading_method' );
// Filter URLS
wptouchCheckToggle( '#enable_url_filter', '#setting-url_filter_behaviour, #setting-filtered_urls' );
//wptouchCheckToggle( '#enable_url_filter', '#setting-url_filter_behaviour, #setting-filtered_urls' );
// Cache menu settings (advanced)
wptouchCheckToggle( '#show_share', '#setting-share_location, #setting-share_colour_scheme' );
wptouchCheckToggle( '#automatically_backup_settings', '#setting-backup' );
Expand Down Expand Up @@ -964,7 +964,7 @@ function wptouchLoadTouchBoardArea() {
var ajaxParams = {};
wptouchAdminAjax( 'load-touchboard-area', ajaxParams, function( result ) {
touchboard.html( result );
setTimeout( function(){ wptouchAdminResize(); }, 200 );
setTimeout( function(){ wptouchAdminResize(); }, 220 );
});
}
}
Expand All @@ -980,7 +980,7 @@ function wptouchLoadUpgradeArea() {
var ajaxParams = {};
wptouchAdminAjax( 'load-upgrade-area', ajaxParams, function( result ) {
upgrade.html( result );
setTimeout( function(){ wptouchAdminResize(); }, 200 );
setTimeout( function(){ wptouchAdminResize(); }, 220 );
});
}
}
Expand Down Expand Up @@ -1168,10 +1168,6 @@ function wptouchLoadAddons() {
}
}

function wptouchAdminHandleGeneral() {
wptouchCheckToggle( '#show_wptouch_in_footer', '#setting-add_referral_code' );
}

function wptouchHandleThemePreview() {
function triggerPreview( targetImage ) {
jQuery( '#' + targetImage.attr( 'id' ) + '-preview' ).trigger( 'click' );
Expand Down Expand Up @@ -1217,7 +1213,6 @@ function wptouchAdminReady() {
wptouchHandleLicensePanel();
wptouchHandleMenuArea();
wptouchHandleIconDragDrop();
wptouchAdminHandleGeneral();

wptouchSetupHomescreenUploaders();
wptouchHandleCustomIconUpload();
Expand Down

0 comments on commit 15f8290

Please sign in to comment.