Merge branch 'issue-1653-grid-styling-admin-area' into develop

mariannk · mariannk · commit ea8cce2ae526 · 2017-01-26T19:30:57.000+03:00
diff --git a/src/Presentation/Nop.Web/Administration/Content/styles.css b/src/Presentation/Nop.Web/Administration/Content/styles.css
@@ -186,6 +186,9 @@ table.adminContent {
     box-shadow: none;
     -webkit-box-shadow: none;
 }
+.k-grid .k-button, .k-grid tbody td > .k-grid-delete, table .btn {
+    margin: 2px;
+}
 .k-picker-wrap.k-state-default,
 .k-numeric-wrap.k-state-default {
     border-radius: 0;
@@ -367,9 +370,6 @@ td.k-state-focused.k-state-selected {
 .k-popup .k-list .k-item.k-state-focused {
     box-shadow: none;
 }
-.k-grid tbody td > .k-grid-delete {
-    margin-top: 0;
-}
 .k-grid table tr:hover > td {
     background: #e3e3e3 !important;
 }
diff --git a/src/Presentation/Nop.Web/Administration/Content/styles.rtl.css b/src/Presentation/Nop.Web/Administration/Content/styles.rtl.css
@@ -193,6 +193,9 @@ table.adminContent {
     box-shadow: none;
     -webkit-box-shadow: none;
 }
+.k-grid .k-button, .k-grid tbody td > .k-grid-delete, table .btn {
+    margin: 2px;
+}
 .k-picker-wrap.k-state-default,
 .k-numeric-wrap.k-state-default {
     border-radius: 0;
@@ -377,9 +380,6 @@ td.k-state-focused.k-state-selected {
 .k-popup .k-list .k-item.k-state-focused {
     box-shadow: none;
 }
-.k-grid tbody td > .k-grid-delete {
-    margin-top: 0;
-}
 .k-grid table tr:hover > td {
     background: #e3e3e3 !important;
 }

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,9 @@ table.adminContent {`
`186`	`186`	`box-shadow: none;`
`187`	`187`	`-webkit-box-shadow: none;`
`188`	`188`	`}`
	`189`	`+.k-grid .k-button, .k-grid tbody td > .k-grid-delete, table .btn {`
	`190`	`+ margin: 2px;`
	`191`	`+}`
`189`	`192`	`.k-picker-wrap.k-state-default,`
`190`	`193`	`.k-numeric-wrap.k-state-default {`
`191`	`194`	`border-radius: 0;`
`@@ -367,9 +370,6 @@ td.k-state-focused.k-state-selected {`
`367`	`370`	`.k-popup .k-list .k-item.k-state-focused {`
`368`	`371`	`box-shadow: none;`
`369`	`372`	`}`
`370`		`-.k-grid tbody td > .k-grid-delete {`
`371`		`- margin-top: 0;`
`372`		`-}`
`373`	`373`	`.k-grid table tr:hover > td {`
`374`	`374`	`background: #e3e3e3 !important;`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,9 @@ table.adminContent {`
`193`	`193`	`box-shadow: none;`
`194`	`194`	`-webkit-box-shadow: none;`
`195`	`195`	`}`
	`196`	`+.k-grid .k-button, .k-grid tbody td > .k-grid-delete, table .btn {`
	`197`	`+ margin: 2px;`
	`198`	`+}`
`196`	`199`	`.k-picker-wrap.k-state-default,`
`197`	`200`	`.k-numeric-wrap.k-state-default {`
`198`	`201`	`border-radius: 0;`
`@@ -377,9 +380,6 @@ td.k-state-focused.k-state-selected {`
`377`	`380`	`.k-popup .k-list .k-item.k-state-focused {`
`378`	`381`	`box-shadow: none;`
`379`	`382`	`}`
`380`		`-.k-grid tbody td > .k-grid-delete {`
`381`		`- margin-top: 0;`
`382`		`-}`
`383`	`383`	`.k-grid table tr:hover > td {`
`384`	`384`	`background: #e3e3e3 !important;`
`385`	`385`	`}`