diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index 38814be20..ac23d9584 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -17,6 +17,7 @@ define('WHOS_USING_URL' , 'http://sourcefabric.org/en/airtime/whosus define('TERMS_AND_CONDITIONS_URL' , 'http://www.sourcefabric.org/en/about/policy/'); define('PRIVACY_POLICY_URL' , 'http://www.sourcefabric.org/en/about/policy/'); define('USER_MANUAL_URL' , 'http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters'); +define('ABOUT_AIRTIME_URL' , 'https://www.airtime.pro/support/'); define('AIRTIME_TRANSIFEX_URL' , 'https://www.transifex.com/projects/p/airtime/'); define('WHMCS_PASSWORD_RESET_URL' , 'https://account.sourcefabric.com/pwreset.php'); diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index c6c23ade4..42cc89da0 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -134,11 +134,9 @@ $pages = array( 'target' => "_blank" ), array( - 'label' => _('About'), - 'module' => 'default', - 'controller' => 'dashboard', - 'action' => 'about', - 'resource' => 'dashboard' + 'label' => _(sprintf("About %s", PRODUCT_NAME)), + 'uri' => ABOUT_AIRTIME_URL, + 'target' => "_blank" ), array( 'label' => _(sprintf("Help Translate %s", PRODUCT_NAME)), diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css index 1b0e9d342..6dbb4a3a6 100644 --- a/airtime_mvc/public/css/_showbuilder.css +++ b/airtime_mvc/public/css/_showbuilder.css @@ -2,43 +2,6 @@ div.ColVis_collectionBackground { background-color: transparent; } -/* ~ Moved to styles.css ~ - -.wrapper { - *//*background: #242424;*//* - background: #111; - top: 105px; - left: 130px; - right: 0; - bottom: 0; - padding: 5px 10px 40px; - *//*padding: 0;*//* - border: none; - - display: -webkit-box; - display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -webkit-flex-flow: row wrap; - flex-flow: row wrap; - - overflow: auto; - - -webkit-transition: top 0.2s linear, padding 0.2s linear; - -moz-transition: top 0.2s linear, padding 0.2s linear; - -o-transition: top 0.2s linear, padding 0.2s linear; - transition: top 0.2s linear, padding 0.2s linear; -} - -.usability_hint { - left: 130px; - flex: 0 100%; - width: 100%; -} - -*/ - /* Scroll bars */ ::-webkit-scrollbar { @@ -107,7 +70,7 @@ div.ColVis_collectionBackground { flex: 1; } -@media screen and (max-width: 1475px) { +@media screen and (max-width: 1280px) { .wrapper { -webkit-flex-flow: column !important; flex-flow: column !important; @@ -116,10 +79,6 @@ div.ColVis_collectionBackground { height: auto !important; width: 100% !important; } - .wide-panel { - flex: 8 100%; - min-height: 50%; - } .spl_sortable { max-height: 50%; } @@ -535,6 +494,7 @@ li.ui-state-default { flex: 1 100%; margin: 4px 0; + min-height: 0; padding: 0; } @@ -562,19 +522,6 @@ li.ui-state-default { padding: 4px; } -/*#save_button, #webstream_save {*/ - /*background: #ff5d1a;*/ - /*color: #fff;*/ - /*border-radius: 4px;*/ - /*font-size: 16px;*/ - /*height: 38px;*/ - /*width: 120px;*/ -/*}*/ - -/*#save_button:active, #webstream_save {*/ - /*color: #fff !important;*/ -/*}*/ - #save_button:focus, #webstream_save { outline-width: 0; } diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index efc999591..3d4b27baa 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2108,17 +2108,17 @@ span.errors.sp-errors{ } .text-content { padding:20px 10px 40px 58px; - background: url(images/sf_arror.png) no-repeat 60% 0; + /*background: url(images/sf_arror.png) no-repeat 60% 0; */ min-height: 300px; } .text-content h2 { font-size:2.4em; - color:#1f1f1f; + color:#efefef; } .text-content p { font-size:1.6em; line-height:140%; - color:#1f1f1f; + color:#efefef; margin:0 0 1.4em 0; } .text-content a { @@ -2139,7 +2139,7 @@ span.errors.sp-errors{ margin:0 0 6px 0; font-size:1.7em; display:list-item; - color:#1f1f1f; + color:#efefef; } .gray-logo { margin:5px 0 0 20px; diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index ebfed5ffd..5368b1a03 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -415,6 +415,8 @@ var AIRTIME = (function(AIRTIME){ $pl.find("#spl_crossfade").show(); } } + + $('.zend_form + .spl-no-margin > div:has(*:visible):last').css('margin-left', 0); } function getId() {