Merge pull request #6499 from JesseOC/master

CSS updated and seo_url fixed
opencart · Apr 9, 2018 · 2da62da · 2da62da
2 parents 03e247d + fe57977
commit 2da62da
Show file tree

Hide file tree

Showing 37 changed files with 345 additions and 324 deletions.
diff --git a/upload/admin/view/stylesheet/bootstrap.css b/upload/admin/view/stylesheet/bootstrap.css
@@ -2827,6 +2827,7 @@ tbody.collapse.show {
     color: #6c757d;
     content: "\f105";
     font-family: FontAwesome; }
+
   .breadcrumb-item + .breadcrumb-item:hover::before {
     text-decoration: underline; }
   .breadcrumb-item + .breadcrumb-item:hover::before {

diff --git a/upload/admin/view/stylesheet/scss/_variables.scss b/upload/admin/view/stylesheet/scss/_variables.scss
@@ -34,6 +34,7 @@ $grays: map-merge((
   "900": $gray-900
 ), $grays);
 
+
 $blue:    #1e91cf !default;
 $indigo:  #6610f2 !default;
 $purple:  #6f42c1 !default;

diff --git a/upload/admin/view/stylesheet/stylesheet.css b/upload/admin/view/stylesheet/stylesheet.css
@@ -26,6 +26,7 @@ legend {
     margin-bottom: 20px;
 }
 
+
 .page-header {
     vertical-align: middle;
     margin: 20px 0 15px 0;
@@ -43,6 +44,40 @@ legend {
     text-shadow: 0 1px #fff;
 }
 
+.page-header nav {
+  display: contents;
+}
+.page-header nav .breadcrumb {
+  width: 50%;
+  display: inline-block;
+  background: none;
+  margin: 8px 0 19px 0;
+  padding: 0 10px;
+  border-radius: 0;
+}
+
+.page-header nav .breadcrumb li {
+  display: inline-block;
+}
+
+.breadcrumb li + li:before {
+    content: "\f105";
+    font-family: 'FontAwesome';
+    color: #BBBBBB;
+    padding: 0 5px;
+    font-size: 10px;
+}
+
+.breadcrumb li a {
+    color: #999999;
+    font-size: 14px;
+    padding: 0px;
+    margin: 0px;
+}
+
+.breadcrumb > li:last-child a {
+    color: #1e91cf;
+}
 
 
 a:hover, a:focus {

diff --git a/upload/catalog/controller/startup/seo_url.php b/upload/catalog/controller/startup/seo_url.php
@@ -85,7 +85,7 @@ public function rewrite($link) {
 				}
 
 				if ($query) {
-					$query = '?' . str_replace('&', '&amp;', trim($query, '&'));
+					$query = '?' . str_replace('&', '&amp;', trim(str_replace('%2F', '/', $query), '&'));
 				}
 			}
 
@@ -94,4 +94,4 @@ public function rewrite($link) {
 			return $link;
 		}
 	}
-}
+}
diff --git a/upload/catalog/view/theme/default/stylesheet/_stylesheet.scss b/upload/catalog/view/theme/default/stylesheet/_stylesheet.scss
@@ -569,11 +569,7 @@ div.required .col-form-label:before {
   }
 }
 
-
-.btn-group {
-
-}
-.btn-default {
+.btn-light {
 	color: #777;
 	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 	background-color: #e7e7e7;
@@ -589,13 +585,12 @@ div.required .col-form-label:before {
     color: #333;
     background-color: #e6e6e6;
     border-color: #adadad;
-    background-position: 0 -15px;
+    background-position: 0;
   }
 }
 .btn-primary {
 	color: #ffffff;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #229ac8;
 	background-image: linear-gradient(to bottom, #23a1d1, #1f90bb);
 	background-repeat: repeat-x;
 	border-color: #1f90bb #1f90bb #145e7a;
@@ -605,14 +600,12 @@ div.required .col-form-label:before {
   &.active,
   &.disabled,
   &[disabled] {
-    background-color: #1f90bb;
-  	background-position: 0 -15px;
+  	background-position: 0;
   }
 }
 .btn-warning {
 	color: #ffffff;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #faa732;
 	background-image: linear-gradient(to bottom, #fbb450, #f89406);
 	background-repeat: repeat-x;
 	border-color: #f89406 #f89406 #ad6704;
@@ -628,7 +621,6 @@ div.required .col-form-label:before {
 .btn-danger {
 	color: #ffffff;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #da4f49;
 	background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
 	background-repeat: repeat-x;
 	border-color: #bd362f #bd362f #802420;
@@ -644,7 +636,6 @@ div.required .col-form-label:before {
 .btn-success {
 	color: #ffffff;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #5bb75b;
 	background-image: linear-gradient(to bottom, #62c462, #51a351);
 	background-repeat: repeat-x;
 	border-color: #51a351 #51a351 #387038;
@@ -660,7 +651,6 @@ div.required .col-form-label:before {
 .btn-info {
 	color: #ffffff;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #df5c39;
 	background-image: linear-gradient(to bottom, #e06342, #dc512c);
 	background-repeat: repeat-x;
 	border-color: #dc512c #dc512c #a2371a;