Styling fixes

modularcoder · modularcoder · commit d440bd26f501 · 2017-08-19T04:20:37.000+04:00
diff --git a/src/_common/_styles/layout.scss b/src/_common/_styles/layout.scss
@@ -42,7 +42,7 @@
 	margin-bottom: $content-padding-y-md - $card-margin-bottom;
 
 
-	@include media(xl) {
+	@include media-up(xl) {
 		margin-bottom: $content-padding-y-xl - $card-margin-bottom;
 	}
 
diff --git a/src/_common/card/card.scss b/src/_common/card/card.scss
@@ -5,7 +5,7 @@
 	.card {
 		box-shadow: none;
 	}
-	
+
 	margin-bottom: $card-margin-bottom;
 	border-radius: 0;
 	border: none;
@@ -43,7 +43,7 @@
 			padding: 0.5rem $card-padding-x;;
 
 
-			@include media(xl) {
+			@include media-up(xl) {
 				padding: 0.5rem $card-padding-x-xl;
 			}
 
diff --git a/src/_common/items-list/items-list.scss b/src/_common/items-list/items-list.scss
@@ -14,7 +14,7 @@ $item-list-col-shrink: 3 !default;
 	margin: 0;
 	margin-bottom: 0;
 	line-height: $item-list-line-height;
-	
+
 	@include media(lg) {
 		font-size: 1rem;
 	}
@@ -149,7 +149,7 @@ $item-list-col-shrink: 3 !default;
 		font-size: 0.9rem;
 		display: none;
 		color: #666;
-		font-weight: 700;	
+		font-weight: 700;
 		padding-right: $item-list-padding-x;
 
 		@include media-down(sm) {
@@ -378,11 +378,11 @@ $item-list-col-shrink: 3 !default;
 .card > .item-list .item > .item-row {
 	padding: 0 $card-padding-x;
 
-	@include media(xl) {
+	@include media-up(xl) {
 		padding: 0 $card-padding-x-xl;
 	}
 
 	@include media-down(sm) {
 		padding: 0 $card-padding-x-sm;
 	}
-}
+}
diff --git a/src/app/_common/sidebar/sidebar.scss b/src/app/_common/sidebar/sidebar.scss
@@ -87,6 +87,24 @@
 			background-color: $sidebar-color-secondary;
 		}
 
+		.arrow {
+			float: right;
+			font-size: 18px;
+			line-height: initial;
+			transition: all 0.3s ease;
+			margin-right: 0;
+
+			&:before {
+				content: "\f105" !important;
+			}
+		}
+
+		li.open > a {
+			.arrow {
+				transform: rotate(90deg);
+			}
+		}
+
 
 		// First level items
 		&> li {
@@ -96,7 +114,7 @@
 				padding-top: 15px;
 				padding-bottom: 15px;
 				padding-left: 20px;
-				padding-right: 10px;
+				padding-right: 15px;
 			}
 
 			// First level active links have primary background
@@ -111,28 +129,14 @@
 				background-color: darken($sidebar-color-primary, 3%);
 			}
 
-			// Open items links
-			&.open > a {
-				i.arrow {
-					transform: rotate(90deg);
-				}
-			}
-
 			// First level item links arrow
 			& > a {
 				i {
 					margin-right: 5px;
 					font-size: 16px;
 
 					&.arrow {
-						float: right;
 						font-size: 20px;
-						line-height: initial;
-						transition: all 0.3s ease;
-
-						&:before {
-							content: "\f105" !important;
-						}
 					}
 				}
 			}
@@ -149,6 +153,7 @@
 				padding-top: 10px;
 				padding-bottom: 10px;
 				padding-left: 50px;
+				padding-right: 15px;
 				background-color: darken($sidebar-color-primary, 3%);
 			}
 
@@ -162,6 +167,7 @@
 			& > .sidebar-nav > li {
 				a {
 					padding-left: 60px;
+					padding-right: 15px;
 				}
 
 				& > .sidebar-nav > li {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`margin-bottom: $content-padding-y-md - $card-margin-bottom;`
`43`	`43`
`44`	`44`
`45`		`- @include media(xl) {`
	`45`	`+ @include media-up(xl) {`
`46`	`46`	`margin-bottom: $content-padding-y-xl - $card-margin-bottom;`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`.card {`
`6`	`6`	`box-shadow: none;`
`7`	`7`	`}`
`8`		`-`
	`8`	`+`
`9`	`9`	`margin-bottom: $card-margin-bottom;`
`10`	`10`	`border-radius: 0;`
`11`	`11`	`border: none;`
`@@ -43,7 +43,7 @@`
`43`	`43`	`padding: 0.5rem $card-padding-x;;`
`44`	`44`
`45`	`45`
`46`		`- @include media(xl) {`
	`46`	`+ @include media-up(xl) {`
`47`	`47`	`padding: 0.5rem $card-padding-x-xl;`
`48`	`48`	`}`
`49`	`49`