From e1d9fce953b78649beea3fd60234930d39f6a42e Mon Sep 17 00:00:00 2001 From: pmasalkin Date: Tue, 23 Jun 2020 10:33:47 +0500 Subject: [PATCH 1/2] Add mobile sorting view style --- .../components/flexberry-objectlistview.overrides | 13 ++++++++++++- .../components/flexberry-objectlistview.variables | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/themes/ghost/components/flexberry-objectlistview.overrides b/src/themes/ghost/components/flexberry-objectlistview.overrides index 547dd21..01e3ffa 100644 --- a/src/themes/ghost/components/flexberry-objectlistview.overrides +++ b/src/themes/ghost/components/flexberry-objectlistview.overrides @@ -665,4 +665,15 @@ tbody tr td .icon.button.hierarchy-expand { } } } -} \ No newline at end of file + + .ui.button.mobile-sorting-setting-button { + width: @navbarSortingMobileWidth; + white-space: @navbarSortingMobileWhiteSpace; + overflow: @navbarSortingMobileOverflow; + text-overflow: @navbarSortingMobileTextOverflow; + font-size: @navbarSortingMobileFontSize; + font-weight: @navbarSortingMobileTextWeight; + display: @navbarSortingMobileDisplay; + align-items: @navbarSortingMobileAlignItems; + } +} diff --git a/src/themes/ghost/components/flexberry-objectlistview.variables b/src/themes/ghost/components/flexberry-objectlistview.variables index 25753a4..beefc73 100644 --- a/src/themes/ghost/components/flexberry-objectlistview.variables +++ b/src/themes/ghost/components/flexberry-objectlistview.variables @@ -221,6 +221,16 @@ @navbarMobileButtonWidth: 2rem; @navbarMobileButtonPadding: 0 0.625rem; +/*Navbar sorting*/ +@navbarSortingMobileWidth: 180px; +@navbarSortingMobileWhiteSpace: nowrap; +@navbarSortingMobileOverflow: hidden; +@navbarSortingMobileTextOverflow: ellipsis; +@navbarSortingMobileFontSize: 1rem; +@navbarSortingMobileTextWeight: bold; +@navbarSortingMobileDisplay: flex; +@navbarSortingMobileAlignItems: center; + /* Mobile selected row menu */ @olvContainerPosition: relative; @checkRowsContainerDisplay: flex; From 525de1282f1a8ce39a2240c93964b507c796941f Mon Sep 17 00:00:00 2001 From: pmasalkin Date: Wed, 8 Jul 2020 17:26:56 +0500 Subject: [PATCH 2/2] Add mobile sorting style to bluesky --- .../components/flexberry-objectlistview.overrides | 7 +++++++ .../components/flexberry-objectlistview.variables | 8 +++++++- .../ghost/components/flexberry-objectlistview.overrides | 6 +----- .../ghost/components/flexberry-objectlistview.variables | 6 +----- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/themes/blue-sky/components/flexberry-objectlistview.overrides b/src/themes/blue-sky/components/flexberry-objectlistview.overrides index ccc4f3d..56a993d 100644 --- a/src/themes/blue-sky/components/flexberry-objectlistview.overrides +++ b/src/themes/blue-sky/components/flexberry-objectlistview.overrides @@ -35,6 +35,13 @@ } } +.ui.button.mobile-sorting-setting-button { + max-width: @navbarSortingMobileMaxWidth; + white-space: @navbarSortingMobileWhiteSpace; + overflow: @navbarSortingMobileOverflow; + text-overflow: @navbarSortingMobileTextOverflow; +} + // Fix for ie @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { .ui.action.input.search-field, diff --git a/src/themes/blue-sky/components/flexberry-objectlistview.variables b/src/themes/blue-sky/components/flexberry-objectlistview.variables index 9a80dc4..c8537d6 100644 --- a/src/themes/blue-sky/components/flexberry-objectlistview.variables +++ b/src/themes/blue-sky/components/flexberry-objectlistview.variables @@ -46,4 +46,10 @@ --------------------*/ @olvOperationsButtonLineHeight: unit(20 / 14, em); @olvOperationsButtonBorderColor: transparent; -@olvOperationsButtonMargin: 0; \ No newline at end of file +@olvOperationsButtonMargin: 0; + +/*Navbar sorting*/ +@navbarSortingMobileMaxWidth: 180px; +@navbarSortingMobileWhiteSpace: nowrap; +@navbarSortingMobileOverflow: hidden; +@navbarSortingMobileTextOverflow: ellipsis; diff --git a/src/themes/ghost/components/flexberry-objectlistview.overrides b/src/themes/ghost/components/flexberry-objectlistview.overrides index 01e3ffa..1330ad4 100644 --- a/src/themes/ghost/components/flexberry-objectlistview.overrides +++ b/src/themes/ghost/components/flexberry-objectlistview.overrides @@ -667,13 +667,9 @@ tbody tr td .icon.button.hierarchy-expand { } .ui.button.mobile-sorting-setting-button { - width: @navbarSortingMobileWidth; + max-width: @navbarSortingMobileMaxWidth; white-space: @navbarSortingMobileWhiteSpace; overflow: @navbarSortingMobileOverflow; text-overflow: @navbarSortingMobileTextOverflow; - font-size: @navbarSortingMobileFontSize; - font-weight: @navbarSortingMobileTextWeight; - display: @navbarSortingMobileDisplay; - align-items: @navbarSortingMobileAlignItems; } } diff --git a/src/themes/ghost/components/flexberry-objectlistview.variables b/src/themes/ghost/components/flexberry-objectlistview.variables index beefc73..e8b99a4 100644 --- a/src/themes/ghost/components/flexberry-objectlistview.variables +++ b/src/themes/ghost/components/flexberry-objectlistview.variables @@ -222,14 +222,10 @@ @navbarMobileButtonPadding: 0 0.625rem; /*Navbar sorting*/ -@navbarSortingMobileWidth: 180px; +@navbarSortingMobileMaxWidth: 180px; @navbarSortingMobileWhiteSpace: nowrap; @navbarSortingMobileOverflow: hidden; @navbarSortingMobileTextOverflow: ellipsis; -@navbarSortingMobileFontSize: 1rem; -@navbarSortingMobileTextWeight: bold; -@navbarSortingMobileDisplay: flex; -@navbarSortingMobileAlignItems: center; /* Mobile selected row menu */ @olvContainerPosition: relative;