Просмотр исходного кода

Ticket #4920 - Grid Header layout clean up.

AntonLV 1 год назад
Родитель
Сommit
c0f2b41c37

+ 0 - 19
modules/base/general/template/css/manage_tools.css

@@ -1,19 +0,0 @@
-/*--- General ---*/
-div.bx-grid-header div.bx-form-element-wrapper {
-    position: relative;
-    float: left;
-    width: 165px;
-}
-
-/*--- Administration tools ---*/
-div.bx-grid-header div.bx-form-element-wrapper {
-    margin-right: 0.5rem;
-}
-div.bx-grid-header div.bx-form-element-wrapper:last-child {
-    margin-right: 0;
-}
-div.bx-grid-header div#bx-form-element-filter1,
-div.bx-grid-header div#bx-form-element-filter2,
-div.bx-grid-header div#bx-form-element-search {
-    margin-top: 0px;
-}

+ 0 - 19
modules/base/groups/template/css/main.css

@@ -5,25 +5,6 @@
     -webkit-border-radius:0.1875rem;
 }
 
-/*--- Role filter ---*/
-div.bx-grid-header div.bx-grid-header-controls-filter {
-    position: relative;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-align-items: center;
-    align-items: center;
-}
-div.bx-grid-header div.bx-form-element-wrapper {
-    margin: 0 0.5rem 0 0;
-}
-div.bx-grid-header div.bx-form-element-wrapper:last-child {
-    margin-right: 0;
-}
-div.bx-grid-header div#bx-form-element-role,
-div.bx-grid-header div#bx-form-element-search {
-    margin-top: 0px;
-}
-
 /*--- Set Role popup ---*/
 .bx-base-group-sr-role-cnt {
     display: -webkit-flex;

+ 0 - 19
modules/boonex/artificer/data/template/mod_groups/css/main.css

@@ -3,22 +3,3 @@
     -webkit-justify-content: flex-start;
     justify-content: flex-start;
 }
-
-/*--- Role filter ---*/
-div.bx-grid-header div.bx-grid-header-controls-filter {
-    position: relative;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-align-items: center;
-    align-items: center;
-}
-div.bx-grid-header div.bx-form-element-wrapper {
-    margin: 0 0.5rem 0 0;
-}
-div.bx-grid-header div.bx-form-element-wrapper:last-child {
-    margin-right: 0;
-}
-div.bx-grid-header div#bx-form-element-role,
-div.bx-grid-header div#bx-form-element-search {
-    margin-top: 0px;
-}

+ 0 - 20
modules/boonex/payment/template/css/orders.css

@@ -73,24 +73,4 @@ div.bx-payment-vo-items {
 	TEXT-OVERFLOW: ellipsis;
     -o-text-overflow: ellipsis;
     white-space: nowrap;
-}
-
-
-/*--- Filters ---*/
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div.bx-form-element-wrapper {
-    position: relative;
-    float: left;
-    width: 165px;
-}
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-client,
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-author,
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-module,
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-item {
-    margin-right: 20px;
-}
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-author,
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-module,
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-item,
-#bx-grid-wrap-bx_payment_grid_orders_processed div.bx-grid-header div#bx-form-element-keyword {
-    margin-top: 0px;
 }

+ 2 - 7
studio/template/css/grid.css

@@ -3,18 +3,13 @@
 /**
  * Overwrite default styles
  */
-.bx-grid-header-controls-independent .bx-btn {
-    margin-top: 0;
-    margin-bottom: 0;
-}
 .bx-grid-table td,
-.bx-grid-table th
-{
+.bx-grid-table th {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
     font-size: 14px;
 }
-.bx-grid-table tr:not(.bx-grid-table-row-hr) td{
+.bx-grid-table tr:not(.bx-grid-table-row-hr) td {
     height: 55px;
     white-space: nowrap;
     text-overflow: ellipsis;

+ 16 - 15
template/css/grid.css

@@ -35,6 +35,10 @@
 .bx-grid-table-wrapper .bx-def-hr {
     margin:0;
 }
+.bx-grid-header div.bx-form-element-wrapper {
+    width: 10rem;
+    margin: 0;
+}
 .bx-grid-header-cnt {
     position: relative;
     display: -webkit-flex;
@@ -44,13 +48,19 @@
     -webkit-justify-content: flex-start;
     justify-content: flex-start;
     flex-wrap: wrap;
-    gap:10px;
+    gap: 10px;
 }
-.bx-grid-header-controls-filter {
-    margin-bottom: -0.25rem;
+.bx-grid-header-controls-filter,
+.bx-grid-header-controls-independent {
+    position: relative;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    column-gap: 0.5rem;
+    row-gap: 0.25rem;
 }
-.bx-grid-header-controls-filter div.bx-form-element-wrapper {
-    margin-bottom: 0.25rem;
+.bx-grid-header-controls-independent {
+    justify-content: flex-end;
 }
 .bx-grid-header-controls-counter {
     -webkit-flex-grow: 2;
@@ -58,7 +68,6 @@
 
     white-space: nowrap;
 }
-.bx-grid-header-controls-independent {}
 .bx-gh-no-counter .bx-grid-header-controls-independent {
     -webkit-flex-grow: 2;
     flex-grow: 2;
@@ -66,6 +75,7 @@
     text-align: right;
 }
 .bx-grid-header-controls-independent .bx-btn {
+    margin: 0;
     float: none;
     white-space: nowrap;
 }
@@ -76,15 +86,6 @@
     flex-direction: column;
     align-items: flex-start;
 }
-.bx-media-phone .bx-grid-header-controls-filter{
-    margin: 0px !important;
-}
-.bx-media-phone .bx-grid-header-controls-filter .bx-form-element-wrapper{
-    width: calc(50% - 0.5rem);
-}
-.bx-media-phone div.bx-grid-header div.bx-form-element-wrapper:last-child {
-    margin-bottom: 0; 
-}
 .bx-media-phone .bx-grid-header-controls-counter{
     text-align: left;
 }

+ 0 - 17
template/css/manage_tools.css

@@ -1,21 +1,4 @@
-/*--- General ---*/
-div.bx-grid-header div.bx-form-element-wrapper {
-    position: relative;
-    float: left;
-    width: 10rem;
-}
-
 /*--- Administration tools ---*/
-div.bx-grid-header div.bx-form-element-wrapper {
-    margin-right: 0.5rem;
-}
-div.bx-grid-header div.bx-form-element-wrapper:last-child {
-    margin-right: 0;
-}
-div.bx-grid-header div#bx-form-element-search {
-    margin-top: 0px !important;
-}
-
 /*+++ Controls filter +++*/
 div.bx-grid-header div.bx-grid-header-controls-filter {
     position: relative;