Skip to content

refactor: propagate compact size when ui5-content-density-compact class is set #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 17, 2020
Merged

refactor: propagate compact size when ui5-content-density-compact class is set #1136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06fae7a
refactor: propagate compact size when sapUiCompactSize class is set
MapTo0 Jan 13, 2020
74b73f1
Merge remote-tracking branch 'origin/master' into cosy-compact-refact…
MapTo0 Jan 16, 2020
9234ab8
adopt components
MapTo0 Jan 16, 2020
2ad2310
adopt documentation, playground and samples
MapTo0 Jan 16, 2020
112de5d
improve readme
MapTo0 Jan 16, 2020
63cbb48
Merge remote-tracking branch 'origin/master' into cosy-compact-refact…
MapTo0 Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions packages/main/src/themes/Button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,6 @@
margin-left: 0;
}

:host([data-ui5-compact-size]) .ui5-button-icon {
font-size: 1rem;
}

:host([data-ui5-compact-size]) {
height: var(--_ui5_button_compact_height);
min-width: var(--_ui5_button_base_min_compact_width);
}

:host([data-ui5-compact-size]) .ui5-button-root {
padding: 0 var(--_ui5_button_compact_padding);
}

.ui5-button-root {
min-width: inherit;
cursor: inherit;
Expand All @@ -70,7 +57,7 @@
}

.ui5-button-icon {
font-size: var(--_ui5_button_base_icon_only_font_size);
font-size: var(--_ui5_button_icon_font_size);
height: 0;
top: -.5rem;
position: relative;
Expand Down
15 changes: 3 additions & 12 deletions packages/main/src/themes/CalendarHeader.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

.ui5-calheader-root {
display: flex;
height: 3rem;
padding: 0.25rem 0;
height: var(--_ui5_calendar_header_height);
padding: var(--_ui5_calendar_header_padding);
box-sizing: border-box;
}

Expand All @@ -18,7 +18,7 @@
display: flex;
justify-content: center;
align-items: center;
width: 2.5rem;
width: var(--_ui5_calendar_header_arrow_button_width);
background-color: var(--sapButton_Lite_Background);
color: var(--sapButton_TextColor);
cursor: pointer;
Expand Down Expand Up @@ -96,15 +96,6 @@
border-color: var(--sapContent_ContrastFocusColor);
}

:host([data-ui5-compact-size]) .ui5-calheader-root {
height: 2rem;
padding: 0;
}

:host([data-ui5-compact-size]) .ui5-calheader-arrowbtn {
width: 2rem;
}

[dir=rtl] .ui5-calheader-root-midcontainer .ui5-calheader-middlebtn:first-child {
margin-left: 0.5rem;
margin-right: 0;
Expand Down
69 changes: 6 additions & 63 deletions packages/main/src/themes/CheckBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
/* wrap */
:host([wrap][text]) .ui5-checkbox-root {
min-height: auto;
padding-top: .6875rem;
box-sizing: border-box;
padding-bottom: .6875rem;
align-items: flex-start;
padding-top: var(--_ui5_checkbox_root_side_padding);
padding-bottom: var(--_ui5_checkbox_root_side_padding);
}

:host([wrap][text]) .ui5-checkbox-root .ui5-checkbox-inner,
Expand Down Expand Up @@ -151,57 +151,9 @@ https://github.com/philipwalton/flexbugs/issues/231
-webkit-user-select: none;
}

/* Compact */
:host([text][data-ui5-compact-size]) .ui5-checkbox-root {
padding-right: 0;
}
:host([text][data-ui5-compact-size]) .ui5-checkbox-root:focus::before {
right: 0;
}

:host([wrap][text][data-ui5-compact-size]) .ui5-checkbox-root {
min-height: auto;
padding-top: var(--_ui5_checkbox_wrapped_focus_padding);
padding-bottom: var(--_ui5_checkbox_wrapped_focus_padding);
}

:host([wrap][text][data-ui5-compact-size]) .ui5-checkbox-root .ui5-checkbox-label {
margin-top: var(--_ui5_checkbox_compact_wrapped_label_margin_top);
}

:host([wrap][data-ui5-compact-size]) .ui5-checkbox-root:focus::before {
bottom: var(--_ui5_checkbox_compact_focus_position);
}

:host([data-ui5-compact-size]) .ui5-checkbox-root {
min-height: var(--_ui5_checkbox_compact_width_height);
min-width: var(--_ui5_checkbox_compact_width_height);
padding: 0 var(--_ui5_checkbox_compact_wrapper_padding);
}

:host([data-ui5-compact-size]) .ui5-checkbox-root:focus::before {
top: var(--_ui5_checkbox_compact_focus_position);
left: var(--_ui5_checkbox_compact_focus_position);
right: var(--_ui5_checkbox_compact_focus_position);
bottom: var(--_ui5_checkbox_compact_focus_position);
border: var(--_ui5_checkbox_focus_outline);
}

:host([data-ui5-compact-size]) .ui5-checkbox-inner {
max-height: var(--_ui5_checkbox_compact_inner_size);
height: var(--_ui5_checkbox_compact_inner_size);
max-width: var(--_ui5_checkbox_compact_inner_size);
min-width: var(--_ui5_checkbox_compact_inner_size);
font-size: .625rem;
}

:host([data-ui5-compact-size]) .ui5-checkbox-root .ui5-checkbox-label {
margin-left: var(--_ui5_checkbox_compact_wrapper_padding);
}

:host([data-ui5-compact-size]) .ui5-checkbox-icon {
width: 0.75rem;
height: 0.75rem;
.ui5-checkbox-icon {
width: var(--_ui5_checkbox_icon_size);
height: var(--_ui5_checkbox_icon_size);
}

/* RTL */
Expand All @@ -218,13 +170,4 @@ https://github.com/philipwalton/flexbugs/issues/231
:host([text]) [dir="rtl"].ui5-checkbox-root .ui5-checkbox-label {
margin-left: 0;
margin-right: var(--_ui5_checkbox_compact_wrapper_padding);
}

/* RTL + Compact */
:host([data-ui5-compact-size][text]) [dir="rtl"].ui5-checkbox-root {
padding-right: var(--_ui5_checkbox_compact_wrapper_padding);
}

:host([data-ui5-compact-size][text]) [dir="rtl"].ui5-checkbox-root:focus::before {
right: var(--_ui5_checkbox_compact_focus_position);
}
}
17 changes: 3 additions & 14 deletions packages/main/src/themes/CustomListItem.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

:host {
height: 3rem;
height: var(--_ui5_custom_list_item_height);
box-sizing: border-box;
}

Expand All @@ -26,16 +26,5 @@ ui5-radiobutton.ui5-li-singlesel-radiobtn {
.ui5-li-root.ui5-custom-li-root,
ui5-checkbox.ui5-li-singlesel-radiobtn,
ui5-radiobutton.ui5-li-singlesel-radiobtn {
min-width: 3rem;
}

/* Compact size */
:host([data-ui5-compact-size]) {
height: 2rem;
}

:host([data-ui5-compact-size]) .ui5-li-root.ui5-custom-li-root,
:host([data-ui5-compact-size]) ui5-checkbox.ui5-li-singlesel-radiobtn,
:host([data-ui5-compact-size]) ui5-radiobutton.ui5-li-singlesel-radiobtn {
min-width: 2rem;
}
min-width: var(--_ui5_custom_list_item_rb_min_width);
}
24 changes: 4 additions & 20 deletions packages/main/src/themes/DayPicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
.ui5-dp-weekname,
.ui5-dp-dayname,
.ui5-dp-item {
width: 2.25rem;
height: 2.875rem;
width: var(--_ui5_day_picker_item_width);
height: var(--_ui5_day_picker_item_height);
margin-top: var(--_ui5_daypicker_item_margin);
margin-right: var(--_ui5_daypicker_item_margin);
font-family: var(--sapFontFamily);
Expand Down Expand Up @@ -150,21 +150,5 @@
}

.ui5-dp-emptyweek {
height: 3rem;
}

/* Compact size */
:host([data-ui5-compact-size]) .ui5-dp-weeknumber-container {
padding-top: 2rem;
}

:host([data-ui5-compact-size]) .ui5-dp-weekname,
:host([data-ui5-compact-size]) .ui5-dp-dayname,
:host([data-ui5-compact-size]) .ui5-dp-item {
width: 2rem;
height: 2rem;
}

:host([data-ui5-compact-size]) .ui5-dp-emptyweek {
height: 2.125rem;
}
height: var(--_ui5_day_picker_empty_height);
}
19 changes: 1 addition & 18 deletions packages/main/src/themes/Input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
box-sizing: border-box;
}

:host([data-ui5-compact-size]) {
height: var(--_ui5_input_compact_height);
}

:host([data-ui5-compact-size]) [inner-input] {
padding: 0 0.5rem;
}

:host([focused]) {
outline: var(--_ui5_input_focus_border_width) dotted var(--sapContent_FocusColor);
outline-offset: -3px;
Expand Down Expand Up @@ -63,7 +55,7 @@
-webkit-appearance: none;
-moz-appearance: textfield;
line-height: normal;
padding: 0 0.75rem;
padding: var(--_ui5_input_inner_padding);
box-sizing: border-box;
min-width: 3rem;
text-overflow: ellipsis;
Expand Down Expand Up @@ -184,19 +176,10 @@
align-items: center;
}

:host([data-ui5-compact-size]) .ui5-input-icon-root {
min-width: var(--sap_wc_input_compact_min_width);
width: var(--sap_wc_input_compact_min_width);
}

/* TODO: Remove this after parser is fixed
- this statement is transformed to "ui5-multi-combobox ui5-icon" which
affects all icons in the combobox incuding these in the list items
*/
::slotted(ui5-icon[slot="icon"]) {
padding: var(--_ui5_input_icon_padding);
}

:host([data-ui5-compact-size]) ::slotted(ui5-icon[slot="icon"]) {
padding: .25rem .5rem;
}
6 changes: 1 addition & 5 deletions packages/main/src/themes/InputIcon.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
color: var(--sapContent_IconColor);
cursor: pointer;
outline: none;
padding: var(--_ui5-input-icon-padding);
padding: var(--_ui5_input_icon_padding);
border-left: 1px solid transparent;
min-width: 1rem;
min-height: 1rem;
}

[input-icon][data-ui5-compact-size] {
padding: .25rem .5rem;
}

[input-icon][pressed] {
background: var(--sapButton_Selected_Background);
color: var(--sapButton_Active_TextColor);
Expand Down
11 changes: 3 additions & 8 deletions packages/main/src/themes/List.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,13 @@
background-color: var(--sapList_Background);
border-bottom: 1px solid var(--sapList_BorderColor);
padding: 0 1rem !important;
height:3rem;
height: var(--_ui5_list_no_data_height);
font-size: var(--sapFontMediumSize);
}


.ui5-list-root .ui5-list-nodata-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

/* Compact size */
:host([data-ui5-compact-size]) .ui5-list-root .ui5-list-nodata {
height: 2rem;
font-size: var(--sapFontMediumSize);
}
}
27 changes: 6 additions & 21 deletions packages/main/src/themes/ListItem.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,10 @@
}

/* ui5-li: item with title and description */
:host([data-ui5-compact-size][has-title][description]),
:host([has-title][description]) {
height: 5rem;
}

:host([data-ui5-compact-size][has-title][description]) .ui5-li-title,
:host([has-title][description]) .ui5-li-title {
padding-bottom: 0.375rem;
}
Expand All @@ -76,7 +74,7 @@

.ui5-li-title {
color: var(--sapTextColor);
font-size: var(--sapMFontLargeSize);
font-size: var(--_ui5_list_item_title_size);
}

.ui5-li-title,
Expand All @@ -102,9 +100,9 @@
}

.ui5-li-img {
width: 2rem;
margin: 0.5rem 0.75rem 0.5rem 0rem;
height: 2rem;
width: var(--_ui5_list_item_img_size);
height: var(--_ui5_list_item_img_size);
margin: var(--_ui5_list_item_img_margin);
}

.ui5-li-icon {
Expand All @@ -129,21 +127,8 @@
align-items: center;
}

/* Compact size */
:host([data-ui5-compact-size]) .ui5-li-title {
height: 2rem;
line-height: 2rem;
font-size: var(--sapFontMediumSize);
}

:host([data-ui5-compact-size]:not([has-title]):not([description])) .ui5-li-img {
width: 1.75rem;
height: 1.75rem;
margin-top: 0.55rem;
}

:host([data-ui5-compact-size]) ui5-checkbox.ui5-li-singlesel-radiobtn {
margin-right: 0.5rem;
:host() ui5-checkbox.ui5-li-singlesel-radiobtn {
margin-right: var(--_ui5_list_item_cb_margin_right);
}

/* RTL */
Expand Down
9 changes: 2 additions & 7 deletions packages/main/src/themes/ListItemBase.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

:host {
height: 3rem;
height: var(--_ui5_list_item_base_height);
background: var(--ui5-listitem-background-color);
box-sizing: border-box;
}
Expand Down Expand Up @@ -61,9 +61,4 @@
min-height: 1px; /* IE specific: fixes vertical centering with flex */
font-family: var(--sapFontFamily);
pointer-events: none; /* IE specific: fixes focus crrectly applied*/
}

/* Compact size */
:host([data-ui5-compact-size]) {
height: 2rem;
}
}
Loading