فهرست منبع

Merge pull request #14886 from jeclrsg/hpcc-25575-dgrid-pagination-css

HPCC-25575 DGrid pagination CSS

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 سال پیش
والد
کامیت
e4cadc1288
2فایلهای تغییر یافته به همراه42 افزوده شده و 13 حذف شده
  1. 35 3
      esp/src/src-react/components/DojoGrid.css
  2. 7 10
      esp/src/src-react/layouts/HpccJSAdapter.css

+ 35 - 3
esp/src/src-react/components/DojoGrid.css

@@ -1,5 +1,4 @@
 :root {
 :root {
-    --grid-font-family: "Segoe WPC", "Segoe UI", sans-serif;
     --header-font-size: 14px;
     --header-font-size: 14px;
     --row-font-size: 13px;
     --row-font-size: 13px;
     --grid-background: transparent;
     --grid-background: transparent;
@@ -10,7 +9,6 @@
 }
 }
 
 
 .flat .dojo-component.dgrid.dgrid-grid {
 .flat .dojo-component.dgrid.dgrid-grid {
-    font-family: var(--grid-font-family);
     border-style: hidden;
     border-style: hidden;
 }
 }
 
 
@@ -33,7 +31,6 @@
 }
 }
 
 
 .flat .dojo-component.dgrid .dgrid-row {
 .flat .dojo-component.dgrid .dgrid-row {
-    font-family: var(--grid-font-family);
     font-size: var(--row-font-size);
     font-size: var(--row-font-size);
     line-height: 22px;
     line-height: 22px;
 }
 }
@@ -63,4 +60,39 @@
 .flat .dojo-component.dgrid .dgrid-fakeline {
 .flat .dojo-component.dgrid .dgrid-fakeline {
     border: 0px;
     border: 0px;
     margin: 2px;
     margin: 2px;
+}
+
+.flat .dgrid-footer {
+    background-color: var(--grid-background);
+}
+
+.flat .dgrid-pagination {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    line-height: 14px;
+    padding: 4px 8px;
+}
+
+.flat .dgrid-pagination .dgrid-status {
+    flex-grow: 1;
+    padding: 0;
+}
+
+.flat .dgrid-pagination .dgrid-page-size {
+    margin: 0 10px 0 0;
+    padding: 2px;
+    width: 46px;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+.flat .dgrid-pagination .dgrid-navigation .dgrid-page-input {
+    padding: 0;
+    margin: 0;
+    background: var(--grid-background);
+    border-style: solid;
+    border-width: 1px;
+    color: inherit;
 }
 }

+ 7 - 10
esp/src/src-react/layouts/HpccJSAdapter.css

@@ -1,16 +1,14 @@
-:root{
-    --grid-font-family: "Segoe WPC", "Segoe UI", sans-serif;
+:root {
     --header-font-size: 14px;
     --header-font-size: 14px;
     --row-font-size: 13px;
     --row-font-size: 13px;
-    --grid-background:transparent;
-    --grid-selectionForeground:rgb(50, 49, 48);
+    --grid-background: transparent;
+    --grid-selectionForeground: rgb(50, 49, 48);
     --grid-selectionBackground: rgb(235, 235, 235);
     --grid-selectionBackground: rgb(235, 235, 235);
     --grid-hoverBackground: rgb(247, 245, 243);
     --grid-hoverBackground: rgb(247, 245, 243);
-    --grid-selectionHoverBackground:  rgb(227, 225, 223);
+    --grid-selectionHoverBackground: rgb(227, 225, 223);
 }
 }
 
 
 .flat .dojo-component.dgrid.dgrid-grid {
 .flat .dojo-component.dgrid.dgrid-grid {
-    font-family: var(--grid-font-family);
     border-style: hidden;
     border-style: hidden;
 }
 }
 
 
@@ -21,7 +19,7 @@
 }
 }
 
 
 .flat .dojo-component.dgrid .dgrid-header-row .dgrid-cell {
 .flat .dojo-component.dgrid .dgrid-header-row .dgrid-cell {
-    border-bottom-color:  var(--grid-selectionBackground);
+    border-bottom-color: var(--grid-selectionBackground);
 }
 }
 
 
 .flat .dojo-component.dgrid .dgrid-header-row:focus {
 .flat .dojo-component.dgrid .dgrid-header-row:focus {
@@ -33,7 +31,6 @@
 }
 }
 
 
 .flat .dojo-component.dgrid .dgrid-row {
 .flat .dojo-component.dgrid .dgrid-row {
-    font-family: var(--grid-font-family);
     font-size: var(--row-font-size);
     font-size: var(--row-font-size);
     line-height: 22px;
     line-height: 22px;
 }
 }
@@ -61,6 +58,6 @@
 }
 }
 
 
 .flat .dojo-component.dgrid .dgrid-fakeline {
 .flat .dojo-component.dgrid .dgrid-fakeline {
-    border:0px;
-    margin:2px;
+    border: 0px;
+    margin: 2px;
 }
 }