Merge branch 'ahancer-dev' of github.com:Laki7877/col-sp-ui into ahan…

…cer-dev
Laki7877 · Mar 1, 2016 · 5793449 · 5793449
2 parents 2f3eb01 + 74b24b4
commit 5793449
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/assets/_add_product_page.sass b/assets/_add_product_page.sass
@@ -147,6 +147,8 @@
 .variation-table
 	$table-column-padding: $table-cell-padding * 2
 	width: 940px - 60px - 2px // - 2px for border, -60px for form padding
+	> tbody > tr:first-child > td
+		padding-top: 20px
 
 	.column-sku, .column-price, .column-sale-price, .column-inventory, .column-pid
 		width: 90px + $table-column-padding // + 16px for table's column padding
@@ -165,7 +167,7 @@
 
 	&.no-margin
 		margin-top: 0
-	
+
 	.confirmation-modal-text
 		@extend .clearfix
 		@include make-xs-column(12)
@@ -191,4 +193,4 @@
 			float: left
 
 		.btn + .btn
-			margin-left: 18px
+			margin-left: 18px
diff --git a/assets/screen.scss b/assets/screen.scss
@@ -267,6 +267,11 @@ ng-transclude.has-error .form-control{
   }
 }
 
+.color-warning{
+	color: #8a6d3b;
+	line-height: 16px;
+}
+
 @keyframes shake {
   0% {transform: translateX(0);}
   12.5% {transform: translateX(-6px) rotateY(-5deg)}

diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css
@@ -14397,38 +14397,42 @@ html, body {
 .variation-table {
   width: 878px;
 }
-/* line 151, ../../../assets/_add_product_page.sass */
+/* line 150, ../../../assets/_add_product_page.sass */
+.variation-table > tbody > tr:first-child > td {
+  padding-top: 20px;
+}
+/* line 153, ../../../assets/_add_product_page.sass */
 .variation-table .column-sku, .variation-table .column-price, .variation-table .column-sale-price, .variation-table .column-inventory, .variation-table .column-pid {
   width: 106px;
 }
-/* line 153, ../../../assets/_add_product_page.sass */
+/* line 155, ../../../assets/_add_product_page.sass */
 .variation-table .column-detail {
   width: 136px;
 }
-/* line 155, ../../../assets/_add_product_page.sass */
+/* line 157, ../../../assets/_add_product_page.sass */
 .variation-table .column-visibility {
   width: 96px;
 }
 
-/* line 158, ../../../assets/_add_product_page.sass */
+/* line 160, ../../../assets/_add_product_page.sass */
 .modal-size-warning {
   width: 400px;
 }
 
-/* line 161, ../../../assets/_add_product_page.sass */
+/* line 163, ../../../assets/_add_product_page.sass */
 .modal-product-image img {
   width: 100%;
 }
 
-/* line 163, ../../../assets/_add_product_page.sass */
+/* line 165, ../../../assets/_add_product_page.sass */
 .confirmation-modal {
   margin-top: 20px;
 }
-/* line 166, ../../../assets/_add_product_page.sass */
+/* line 168, ../../../assets/_add_product_page.sass */
 .confirmation-modal.no-margin {
   margin-top: 0;
 }
-/* line 169, ../../../assets/_add_product_page.sass */
+/* line 171, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-modal-text {
   position: relative;
   float: left;
@@ -14437,21 +14441,21 @@ html, body {
   padding-left: 15px;
   padding-right: 15px;
 }
-/* line 173, ../../../assets/_add_product_page.sass */
+/* line 175, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-modal-text .sign-icon {
   float: left;
   width: 60px;
   height: 50px;
 }
-/* line 177, ../../../assets/_add_product_page.sass */
+/* line 179, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-modal-text .sign-icon > .fa {
   font-size: 50px;
 }
-/* line 180, ../../../assets/_add_product_page.sass */
+/* line 182, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-modal-text .warning-text {
   display: block;
 }
-/* line 183, ../../../assets/_add_product_page.sass */
+/* line 185, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-action {
   position: relative;
   float: left;
@@ -14462,16 +14466,16 @@ html, body {
   text-align: center;
   margin-top: 30px;
 }
-/* line 187, ../../../assets/_add_product_page.sass */
+/* line 189, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-action.no-margin {
   margin-top: 0;
 }
-/* line 189, ../../../assets/_add_product_page.sass */
+/* line 191, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-action .btn {
   width: 160px;
   float: left;
 }
-/* line 193, ../../../assets/_add_product_page.sass */
+/* line 195, ../../../assets/_add_product_page.sass */
 .confirmation-modal .confirmation-action .btn + .btn {
   margin-left: 18px;
 }