Merge remote-tracking branch 'joomla/staging' into shop

joomla · Aug 31, 2016 · 702ffb0 · 702ffb0
2 parents e1693f1 + 6e1be22
commit 702ffb0
Show file tree

Hide file tree

Showing 10 changed files with 331 additions and 214 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,6 +50,7 @@ matrix:
   allow_failures:
     - php: 7.1
     - php: hhvm
+    - node_js: 6.1
 
 services:
   - memcache

diff --git a/installation/sql/sqlazure/sample_data.sql b/installation/sql/sqlazure/sample_data.sql
diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
@@ -628,9 +628,6 @@ public function getUserStateFromRequest($key, $request, $default = null, $type =
 	 */
 	protected function initialiseApp($options = array())
 	{
-		// Set the configuration in the API.
-		$this->config = JFactory::getConfig();
-
 		// Check that we were given a language in the array (since by default may be blank).
 		if (isset($options['language']))
 		{

diff --git a/libraries/joomla/application/cli.php b/libraries/joomla/application/cli.php
@@ -243,7 +243,7 @@ public function in()
 	 * for your specific application.
 	 *
 	 * @param   string  $file   The path and filename of the configuration file. If not provided, configuration.php
-	 *                          in JPATH_BASE will be used.
+	 *                          in JPATH_CONFIGURATION will be used.
 	 * @param   string  $class  The class name to instantiate.
 	 *
 	 * @return  mixed   Either an array or object to be loaded into the configuration object.
@@ -255,12 +255,11 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig')
 		// Instantiate variables.
 		$config = array();
 
-		if (empty($file) && defined('JPATH_BASE'))
+		if (empty($file))
 		{
-			$file = JPATH_BASE . '/configuration.php';
+			$file = JPATH_CONFIGURATION . '/configuration.php';
 
-			// Applications can choose not to have any configuration data
-			// by not implementing this method and not having a config file.
+			// Applications can choose not to have any configuration data by not implementing this method and not having a config file.
 			if (!file_exists($file))
 			{
 				$file = '';

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
@@ -870,7 +870,7 @@ protected function detectRequestUri()
 	 * for your specific application.
 	 *
 	 * @param   string  $file   The path and filename of the configuration file. If not provided, configuration.php
-	 *                          in JPATH_BASE will be used.
+	 *                          in JPATH_CONFIGURATION will be used.
 	 * @param   string  $class  The class name to instantiate.
 	 *
 	 * @return  mixed   Either an array or object to be loaded into the configuration object.
@@ -883,9 +883,9 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig')
 		// Instantiate variables.
 		$config = array();
 
-		if (empty($file) && defined('JPATH_ROOT'))
+		if (empty($file))
 		{
-			$file = JPATH_ROOT . '/configuration.php';
+			$file = JPATH_CONFIGURATION . '/configuration.php';
 
 			// Applications can choose not to have any configuration data
 			// by not implementing this method and not having a config file.

diff --git a/templates/protostar/css/template.css b/templates/protostar/css/template.css
@@ -214,12 +214,12 @@ body {
 	background-color: #fff;
 }
 a {
-	color: #08c;
+	color: #005e8d;
 	text-decoration: none;
 }
 a:hover,
 a:focus {
-	color: #005580;
+	color: #002b41;
 	text-decoration: underline;
 }
 .img-rounded {
@@ -2017,29 +2017,29 @@ table th[class*="span"],
 .dropdown-submenu:focus > a {
 	text-decoration: none;
 	color: #fff;
-	background-color: #0081c2;
-	background-image: -moz-linear-gradient(top,#08c,#0077b3);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
-	background-image: -webkit-linear-gradient(top,#08c,#0077b3);
-	background-image: -o-linear-gradient(top,#08c,#0077b3);
-	background-image: linear-gradient(to bottom,#08c,#0077b3);
+	background-color: #005783;
+	background-image: -moz-linear-gradient(top,#005e8d,#004d74);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#004d74));
+	background-image: -webkit-linear-gradient(top,#005e8d,#004d74);
+	background-image: -o-linear-gradient(top,#005e8d,#004d74);
+	background-image: linear-gradient(to bottom,#005e8d,#004d74);
 	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff004c73', GradientType=0);
 }
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
 	color: #333;
 	text-decoration: none;
 	outline: 0;
-	background-color: #0081c2;
-	background-image: -moz-linear-gradient(top,#08c,#0077b3);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
-	background-image: -webkit-linear-gradient(top,#08c,#0077b3);
-	background-image: -o-linear-gradient(top,#08c,#0077b3);
-	background-image: linear-gradient(to bottom,#08c,#0077b3);
+	background-color: #005783;
+	background-image: -moz-linear-gradient(top,#005e8d,#004d74);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#004d74));
+	background-image: -webkit-linear-gradient(top,#005e8d,#004d74);
+	background-image: -o-linear-gradient(top,#005e8d,#004d74);
+	background-image: linear-gradient(to bottom,#005e8d,#004d74);
 	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff004c73', GradientType=0);
 }
 .dropdown-menu > .disabled > a,
 .dropdown-menu > .disabled > a:hover,
@@ -2383,16 +2383,16 @@ input[type="button"].btn-block {
 .btn-primary {
 	color: #fff;
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
-	background-color: #006dcc;
-	background-image: -moz-linear-gradient(top,#08c,#0044cc);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0044cc));
-	background-image: -webkit-linear-gradient(top,#08c,#0044cc);
-	background-image: -o-linear-gradient(top,#08c,#0044cc);
-	background-image: linear-gradient(to bottom,#08c,#0044cc);
+	background-color: #004b8d;
+	background-image: -moz-linear-gradient(top,#005e8d,#002f8d);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#002f8d));
+	background-image: -webkit-linear-gradient(top,#005e8d,#002f8d);
+	background-image: -o-linear-gradient(top,#005e8d,#002f8d);
+	background-image: linear-gradient(to bottom,#005e8d,#002f8d);
 	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0043cc', GradientType=0);
-	border-color: #0044cc #0044cc #002a80;
-	*background-color: #0044cc;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff002e8d', GradientType=0);
+	border-color: #002f8d #002f8d #001641;
+	*background-color: #002f8d;
 	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-primary:hover,
@@ -2402,12 +2402,12 @@ input[type="button"].btn-block {
 .btn-primary.disabled,
 .btn-primary[disabled] {
 	color: #fff;
-	background-color: #0044cc;
-	*background-color: #003bb3;
+	background-color: #002f8d;
+	*background-color: #002674;
 }
 .btn-primary:active,
 .btn-primary.active {
-	background-color: #003399 \9;
+	background-color: #001e5a \9;
 }
 .btn-warning {
 	color: #fff;
@@ -2591,14 +2591,14 @@ input[type="submit"].btn.btn-mini {
 .btn-link {
 	border-color: transparent;
 	cursor: pointer;
-	color: #08c;
+	color: #005e8d;
 	-webkit-border-radius: 0;
 	-moz-border-radius: 0;
 	border-radius: 0;
 }
 .btn-link:hover,
 .btn-link:focus {
-	color: #005580;
+	color: #002b41;
 	text-decoration: underline;
 	background-color: transparent;
 }
@@ -2737,7 +2737,7 @@ input[type="submit"].btn.btn-mini {
 	background-color: #e6e6e6;
 }
 .btn-group.open .btn-primary.dropdown-toggle {
-	background-color: #0044cc;
+	background-color: #002f8d;
 }
 .btn-group.open .btn-warning.dropdown-toggle {
 	background-color: #f89406;
@@ -2930,7 +2930,7 @@ input[type="submit"].btn.btn-mini {
 .nav-list > .active > a:focus {
 	color: #fff;
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
-	background-color: #08c;
+	background-color: #005e8d;
 }
 .nav-list [class^="icon-"],
 .nav-list [class*=" icon-"] {
@@ -3013,7 +3013,7 @@ input[type="submit"].btn.btn-mini {
 .nav-pills > .active > a:hover,
 .nav-pills > .active > a:focus {
 	color: #fff;
-	background-color: #08c;
+	background-color: #005e8d;
 }
 .nav-stacked > li {
 	float: none;
@@ -3068,14 +3068,14 @@ input[type="submit"].btn.btn-mini {
 	border-radius: 6px;
 }
 .nav .dropdown-toggle .caret {
-	border-top-color: #08c;
-	border-bottom-color: #08c;
+	border-top-color: #005e8d;
+	border-bottom-color: #005e8d;
 	margin-top: 6px;
 }
 .nav .dropdown-toggle:hover .caret,
 .nav .dropdown-toggle:focus .caret {
-	border-top-color: #005580;
-	border-bottom-color: #005580;
+	border-top-color: #002b41;
+	border-bottom-color: #002b41;
 }
 .nav-tabs .dropdown-toggle .caret {
 	margin-top: 8px;
@@ -4243,7 +4243,7 @@ input[type="submit"].btn.btn-mini {
 }
 a.thumbnail:hover,
 a.thumbnail:focus {
-	border-color: #08c;
+	border-color: #005e8d;
 	-webkit-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
 	-moz-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
 	box-shadow: 0 1px 4px rgba(0,105,214,0.25);
@@ -7135,14 +7135,14 @@ body.site.fluid {
 	font-weight: bold;
 }
 .brand {
-	color: #004466;
+	color: #001a27;
 	-webkit-transition: color .5s linear;
 	-moz-transition: color .5s linear;
 	-o-transition: color .5s linear;
 	transition: color .5s linear;
 }
 .brand:hover {
-	color: #08c;
+	color: #005e8d;
 	text-decoration: none;
 }
 .header {
@@ -7268,8 +7268,9 @@ p {
 .breadcrumb {
 	margin: 10px 0;
 }
-.breadcrumb > li {
-	color: #999;
+.breadcrumb > li,
+.breadcrumb > .active {
+	color: #515151;
 }
 .img_caption .left {
 	float: left;
@@ -7418,15 +7419,15 @@ figcaption {
 .navigation .nav-child:hover > a {
 	text-decoration: none;
 	color: #fff;
-	background-color: #08c;
-	background-color: #0081c2;
-	background-image: -moz-linear-gradient(top,#08c,#0077b3);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
-	background-image: -webkit-linear-gradient(top,#08c,#0077b3);
-	background-image: -o-linear-gradient(top,#08c,#0077b3);
-	background-image: linear-gradient(to bottom,#08c,#0077b3);
+	background-color: #005e8d;
+	background-color: #005783;
+	background-image: -moz-linear-gradient(top,#005e8d,#004d74);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#004d74));
+	background-image: -webkit-linear-gradient(top,#005e8d,#004d74);
+	background-image: -o-linear-gradient(top,#005e8d,#004d74);
+	background-image: linear-gradient(to bottom,#005e8d,#004d74);
 	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff004c73', GradientType=0);
 }
 .categories-list .collapse {
 	margin-left: 20px;

diff --git a/templates/protostar/index.php b/templates/protostar/index.php
@@ -203,7 +203,7 @@
 			<hr />
 			<jdoc:include type="modules" name="footer" style="none" />
 			<p class="pull-right">
-				<a href="#top" id="back-top">
+				<a href="#" id="back-top">
 					<?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?>
 				</a>
 			</p>

diff --git a/templates/protostar/js/template.js b/templates/protostar/js/template.js
@@ -50,5 +50,10 @@
 				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-success');
 			}
 		});
+
+		$('#back-top').on('click', function(e) {
+			e.preventDefault();
+			$("html, body").animate({scrollTop: 0}, 1000);
+		});
 	})
 })(jQuery);
diff --git a/templates/protostar/less/template.less b/templates/protostar/less/template.less
@@ -231,8 +231,9 @@ p {
 .breadcrumb {
 	margin: 10px 0;
 }
-.breadcrumb > li {
-   color: #999;
+.breadcrumb > li,
+.breadcrumb > .active {
+   color: #515151;
 }
 /* Caption fixes */
 .img_caption .left {

diff --git a/templates/protostar/less/variables.less b/templates/protostar/less/variables.less
@@ -38,7 +38,7 @@
 
 // Links
 // -------------------------
-@linkColor:             #08c;
+@linkColor:             #005e8d;
 @linkColorHover:        darken(@linkColor, 15%);