Changeset 2547943
- Timestamp:
- 06/15/2021 07:23:23 AM (5 years ago)
- Location:
- jackmail-newsletters
- Files:
-
- 8 added
- 8 edited
- 1 copied
-
tags/1.2.16 (copied) (copied from jackmail-newsletters/trunk)
-
tags/1.2.16/css/jackmail.css (modified) (8 diffs)
-
tags/1.2.16/img/apps-hover.svg (added)
-
tags/1.2.16/img/apps.svg (added)
-
tags/1.2.16/img/header_menu.png (added)
-
tags/1.2.16/img/logo_header.png (added)
-
tags/1.2.16/jackmail-newsletters.php (modified) (1 diff)
-
tags/1.2.16/js/directives.js (modified) (4 diffs)
-
tags/1.2.16/readme.txt (modified) (2 diffs)
-
trunk/css/jackmail.css (modified) (8 diffs)
-
trunk/img/apps-hover.svg (added)
-
trunk/img/apps.svg (added)
-
trunk/img/header_menu.png (added)
-
trunk/img/logo_header.png (added)
-
trunk/jackmail-newsletters.php (modified) (1 diff)
-
trunk/js/directives.js (modified) (4 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
jackmail-newsletters/tags/1.2.16/css/jackmail.css
r2408890 r2547943 23 23 .jackmail_plugin #wpcontent { 24 24 padding-left: 0 !important; 25 min-width: 1 150px;25 min-width: 1300px; 26 26 } 27 27 … … 36 36 .jackmail_plugin #wpadminbar, .jackmail_plugin.auto-fold #adminmenuback { 37 37 position: fixed !important; 38 } 39 40 .jackmail_plugin #products_page { 41 z-index: 100000; 38 42 } 39 43 … … 76 80 77 81 .jackmail .jackmail_header > div:first-child { 78 background: # 8fbb24;82 background: #292d30; 79 83 padding: 10px; 80 84 height: 58px; … … 109 113 } 110 114 115 .jackmail .jackmail_header_apps_icon { 116 display: inline-block; 117 width: 25px; 118 height: 25px; 119 cursor: pointer; 120 background: url('../img/apps.svg') no-repeat center center; 121 position: relative; 122 top: 8px; 123 margin-right: 5px; 124 } 125 126 .jackmail .jackmail_header_apps_icon:hover { 127 background: url('../img/apps-hover.svg') no-repeat center center; 128 } 129 111 130 .jackmail .jackmail_header_search { 112 131 cursor: pointer; 113 132 margin-right: 7px; 133 display: inline-block; 134 } 135 136 .jackmail .jackmail_header_search { 137 color: #949698!important; 138 } 139 140 .jackmail .jackmail_header_search:hover { 141 color: white!important; 114 142 } 115 143 … … 353 381 } 354 382 383 .jackmail .jackmail_header_button_menu { 384 cursor: pointer; 385 } 386 355 387 .jackmail .jackmail_header_button_menu > div.jackmail_dropdown_button_content > span { 356 388 padding: 8px 35px 8px 15px; … … 360 392 background: #8fbb24; 361 393 color: white; 394 } 395 396 .jackmail .jackmail_header_button_menu > span { 397 display: inline-block; 398 height: 37px; 399 line-height: 37px; 400 vertical-align: middle; 401 } 402 403 .jackmail .jackmail_header_dropdown_button { 404 background: url('../img/header_menu.png') no-repeat center center; 405 width: 20px; 362 406 } 363 407 … … 420 464 } 421 465 422 .jackmail .jackmail_header span.dashicons.dashicons-menu { 423 cursor: pointer; 424 width: 21px; 425 height: 21px; 426 color: white; 466 .jackmail .jackmail_header .jackmail_header_logo { 427 467 display: inline-block; 428 font-size: 21px; 429 } 430 431 .jackmail .jackmail_header span.jackmail_header_logo_container { 432 overflow: hidden; 433 display: inline-block; 434 height: 32px; 435 width: 90px; 436 } 437 438 .jackmail .jackmail_header span.jackmail_header_logo { 439 display: inline-block; 440 width: 120px; 441 height: 60px; 442 cursor: pointer; 443 background: url('../img/logo.svg') no-repeat top left; 444 background-size: 120px 60px; 445 position: relative; 446 top: -16px; 447 left: -13px; 468 width: 37px; 469 height: 37px; 470 background: url('../img/logo_header.png') no-repeat center center; 471 } 472 473 .jackmail .jackmail_header_logo_text { 474 font-size: 14px; 448 475 } 449 476 450 477 .jackmail .jackmail_header_menu { 451 478 float: left; 452 width: 140px;453 padding-top: 5px;454 479 position: relative; 455 480 z-index: 1003; 456 }457 458 .jackmail .jackmail_header_menu img {459 cursor: pointer;460 padding-bottom: 15px;461 float: left;462 481 } 463 482 … … 490 509 color: white; 491 510 font-weight: bold; 511 margin-left: 15px; 492 512 } 493 513 -
jackmail-newsletters/tags/1.2.16/jackmail-newsletters.php
r2430167 r2547943 4 4 Plugin URI: https://www.jackmail.com 5 5 Description: Create and send responsive newsletter with a professional routing platform and a lot of features: automated emails and newsletters, statistics, email & Live Support etc. 6 Version: 1.2.1 56 Version: 1.2.16 7 7 Author: Jackmail & Sarbacane 8 8 Author URI: https://www.jackmail.com -
jackmail-newsletters/tags/1.2.16/js/directives.js
r2408890 r2547943 530 530 controllerAs: 'djhm', 531 531 template: [ 532 '<div class="jackmail_header_button_menu jackmail_dropdown_button_container jackmail_dropdown_button_left_container" ng-mouseleave="djhm.hide_menu_button()">' +533 ' <span ng-click="djhm.display_or_hide_menu_button()" class="dashicons dashicons-menu"></span>' +534 ' <span class="jackmail_header_logo _container">' +535 ' <span ng-click="djhm.display_or_hide_menu_button()" class="jackmail_header_logo"></span>' +536 ' < /span>' +532 '<div class="jackmail_header_button_menu jackmail_dropdown_button_container jackmail_dropdown_button_left_container"' + 533 ' ng-mouseleave="djhm.hide_menu_button()" ng-click="djhm.display_or_hide_menu_button()">' + 534 ' <span class="jackmail_header_logo"></span>' + 535 ' <span class="jackmail_header_logo_text">Jackmail</span>' + 536 ' <span class="jackmail_header_dropdown_button"></span>' + 537 537 ' <div ng-show="djhm.display_menu_button">' + 538 538 ' <div class="jackmail_dropdown_button_border_container">' + … … 1766 1766 1767 1767 angular.module( 'jackmail.directives' ).directive( 'jackmailSearch', [ 1768 '$timeout', '$rootScope', 1769 function( $timeout, $rootScope ) {1768 '$timeout', '$rootScope', '$http', 1769 function( $timeout, $rootScope, $http ) { 1770 1770 return { 1771 1771 restrict: 'A', … … 1775 1775 ' <span ng-click="djs.display_hide_help()" class="jackmail_header_search">' + 1776 1776 ' <span class="dashicons dashicons-search"></span>' + 1777 ' <span >{{$root.translations.needHelp}}</span>' +1777 ' <span class="jackmail_header_search_text">{{$root.translations.needHelp}}</span>' + 1778 1778 ' </span>' + 1779 ' <span ng-click="djs.display_apps()" class="jackmail_header_apps_icon"></span>' + 1779 1780 ' <div ng-show="$root.show_help1" class="jackmail_header">' + 1780 1781 ' <div>' + … … 1813 1814 } ); 1814 1815 } 1816 }; 1817 1818 vm.display_apps = function() { 1819 var lang = $rootScope.settings.language; 1820 var url = 'https://www.sarbacanegroup-cdn.com/products_modal/?lang=' + lang + '&selectedProduct=jackmail&selectedProductConnected=true'; 1821 $http.get( url ).then( function( args ) { 1822 angular.element( 'body' ).append( args.data ); 1823 }); 1815 1824 }; 1816 1825 -
jackmail-newsletters/tags/1.2.16/readme.txt
r2430167 r2547943 5 5 Tested up to: 5.5 6 6 Requires PHP : 5.4 7 Stable tag: 1.2.1 57 Stable tag: 1.2.16 8 8 License: GPLv2 9 9 … … 166 166 == Changelog == 167 167 168 = 1.2.16 = 169 * New header 170 171 = 1.2.11 to 1.2.15 = 172 * Update EmailBuilder 173 * Texts changes 174 168 175 = 1.2.9 & 1.2.10 = 169 176 * Update Freemium version on the campaign builder -
jackmail-newsletters/trunk/css/jackmail.css
r2408890 r2547943 23 23 .jackmail_plugin #wpcontent { 24 24 padding-left: 0 !important; 25 min-width: 1 150px;25 min-width: 1300px; 26 26 } 27 27 … … 36 36 .jackmail_plugin #wpadminbar, .jackmail_plugin.auto-fold #adminmenuback { 37 37 position: fixed !important; 38 } 39 40 .jackmail_plugin #products_page { 41 z-index: 100000; 38 42 } 39 43 … … 76 80 77 81 .jackmail .jackmail_header > div:first-child { 78 background: # 8fbb24;82 background: #292d30; 79 83 padding: 10px; 80 84 height: 58px; … … 109 113 } 110 114 115 .jackmail .jackmail_header_apps_icon { 116 display: inline-block; 117 width: 25px; 118 height: 25px; 119 cursor: pointer; 120 background: url('../img/apps.svg') no-repeat center center; 121 position: relative; 122 top: 8px; 123 margin-right: 5px; 124 } 125 126 .jackmail .jackmail_header_apps_icon:hover { 127 background: url('../img/apps-hover.svg') no-repeat center center; 128 } 129 111 130 .jackmail .jackmail_header_search { 112 131 cursor: pointer; 113 132 margin-right: 7px; 133 display: inline-block; 134 } 135 136 .jackmail .jackmail_header_search { 137 color: #949698!important; 138 } 139 140 .jackmail .jackmail_header_search:hover { 141 color: white!important; 114 142 } 115 143 … … 353 381 } 354 382 383 .jackmail .jackmail_header_button_menu { 384 cursor: pointer; 385 } 386 355 387 .jackmail .jackmail_header_button_menu > div.jackmail_dropdown_button_content > span { 356 388 padding: 8px 35px 8px 15px; … … 360 392 background: #8fbb24; 361 393 color: white; 394 } 395 396 .jackmail .jackmail_header_button_menu > span { 397 display: inline-block; 398 height: 37px; 399 line-height: 37px; 400 vertical-align: middle; 401 } 402 403 .jackmail .jackmail_header_dropdown_button { 404 background: url('../img/header_menu.png') no-repeat center center; 405 width: 20px; 362 406 } 363 407 … … 420 464 } 421 465 422 .jackmail .jackmail_header span.dashicons.dashicons-menu { 423 cursor: pointer; 424 width: 21px; 425 height: 21px; 426 color: white; 466 .jackmail .jackmail_header .jackmail_header_logo { 427 467 display: inline-block; 428 font-size: 21px; 429 } 430 431 .jackmail .jackmail_header span.jackmail_header_logo_container { 432 overflow: hidden; 433 display: inline-block; 434 height: 32px; 435 width: 90px; 436 } 437 438 .jackmail .jackmail_header span.jackmail_header_logo { 439 display: inline-block; 440 width: 120px; 441 height: 60px; 442 cursor: pointer; 443 background: url('../img/logo.svg') no-repeat top left; 444 background-size: 120px 60px; 445 position: relative; 446 top: -16px; 447 left: -13px; 468 width: 37px; 469 height: 37px; 470 background: url('../img/logo_header.png') no-repeat center center; 471 } 472 473 .jackmail .jackmail_header_logo_text { 474 font-size: 14px; 448 475 } 449 476 450 477 .jackmail .jackmail_header_menu { 451 478 float: left; 452 width: 140px;453 padding-top: 5px;454 479 position: relative; 455 480 z-index: 1003; 456 }457 458 .jackmail .jackmail_header_menu img {459 cursor: pointer;460 padding-bottom: 15px;461 float: left;462 481 } 463 482 … … 490 509 color: white; 491 510 font-weight: bold; 511 margin-left: 15px; 492 512 } 493 513 -
jackmail-newsletters/trunk/jackmail-newsletters.php
r2430167 r2547943 4 4 Plugin URI: https://www.jackmail.com 5 5 Description: Create and send responsive newsletter with a professional routing platform and a lot of features: automated emails and newsletters, statistics, email & Live Support etc. 6 Version: 1.2.1 56 Version: 1.2.16 7 7 Author: Jackmail & Sarbacane 8 8 Author URI: https://www.jackmail.com -
jackmail-newsletters/trunk/js/directives.js
r2408890 r2547943 530 530 controllerAs: 'djhm', 531 531 template: [ 532 '<div class="jackmail_header_button_menu jackmail_dropdown_button_container jackmail_dropdown_button_left_container" ng-mouseleave="djhm.hide_menu_button()">' +533 ' <span ng-click="djhm.display_or_hide_menu_button()" class="dashicons dashicons-menu"></span>' +534 ' <span class="jackmail_header_logo _container">' +535 ' <span ng-click="djhm.display_or_hide_menu_button()" class="jackmail_header_logo"></span>' +536 ' < /span>' +532 '<div class="jackmail_header_button_menu jackmail_dropdown_button_container jackmail_dropdown_button_left_container"' + 533 ' ng-mouseleave="djhm.hide_menu_button()" ng-click="djhm.display_or_hide_menu_button()">' + 534 ' <span class="jackmail_header_logo"></span>' + 535 ' <span class="jackmail_header_logo_text">Jackmail</span>' + 536 ' <span class="jackmail_header_dropdown_button"></span>' + 537 537 ' <div ng-show="djhm.display_menu_button">' + 538 538 ' <div class="jackmail_dropdown_button_border_container">' + … … 1766 1766 1767 1767 angular.module( 'jackmail.directives' ).directive( 'jackmailSearch', [ 1768 '$timeout', '$rootScope', 1769 function( $timeout, $rootScope ) {1768 '$timeout', '$rootScope', '$http', 1769 function( $timeout, $rootScope, $http ) { 1770 1770 return { 1771 1771 restrict: 'A', … … 1775 1775 ' <span ng-click="djs.display_hide_help()" class="jackmail_header_search">' + 1776 1776 ' <span class="dashicons dashicons-search"></span>' + 1777 ' <span >{{$root.translations.needHelp}}</span>' +1777 ' <span class="jackmail_header_search_text">{{$root.translations.needHelp}}</span>' + 1778 1778 ' </span>' + 1779 ' <span ng-click="djs.display_apps()" class="jackmail_header_apps_icon"></span>' + 1779 1780 ' <div ng-show="$root.show_help1" class="jackmail_header">' + 1780 1781 ' <div>' + … … 1813 1814 } ); 1814 1815 } 1816 }; 1817 1818 vm.display_apps = function() { 1819 var lang = $rootScope.settings.language; 1820 var url = 'https://www.sarbacanegroup-cdn.com/products_modal/?lang=' + lang + '&selectedProduct=jackmail&selectedProductConnected=true'; 1821 $http.get( url ).then( function( args ) { 1822 angular.element( 'body' ).append( args.data ); 1823 }); 1815 1824 }; 1816 1825 -
jackmail-newsletters/trunk/readme.txt
r2430167 r2547943 5 5 Tested up to: 5.5 6 6 Requires PHP : 5.4 7 Stable tag: 1.2.1 57 Stable tag: 1.2.16 8 8 License: GPLv2 9 9 … … 166 166 == Changelog == 167 167 168 = 1.2.16 = 169 * New header 170 171 = 1.2.11 to 1.2.15 = 172 * Update EmailBuilder 173 * Texts changes 174 168 175 = 1.2.9 & 1.2.10 = 169 176 * Update Freemium version on the campaign builder
Note: See TracChangeset
for help on using the changeset viewer.