Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit ada6d1a

Browse files
committed
Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
1 parent b8080a7 commit ada6d1a

File tree

24 files changed

+270
-704
lines changed

24 files changed

+270
-704
lines changed

res/css/_components.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
@import "./views/context_menus/_MessageContextMenu.scss";
5656
@import "./views/context_menus/_StatusMessageContextMenu.scss";
5757
@import "./views/context_menus/_TagTileContextMenu.scss";
58-
@import "./views/context_menus/_WidgetContextMenu.scss";
5958
@import "./views/dialogs/_AddressPickerDialog.scss";
6059
@import "./views/dialogs/_Analytics.scss";
6160
@import "./views/dialogs/_BugReportDialog.scss";

res/css/views/context_menus/_WidgetContextMenu.scss

Lines changed: 0 additions & 36 deletions
This file was deleted.

res/css/views/right_panel/_BaseCard.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ limitations under the License.
130130
}
131131

132132
&.mx_AccessibleButton_disabled {
133-
padding: 10px 12px;
133+
padding-right: 12px;
134134
&::after {
135135
content: unset;
136136
}

res/css/views/right_panel/_RoomSummaryCard.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ limitations under the License.
157157
}
158158

159159
.mx_RoomSummaryCard_Button {
160-
padding-left: 12px;
161-
padding-top: 6px;
162-
padding-bottom: 6px;
160+
padding: 6px 24px 6px 12px;
163161
color: $tertiary-fg-color;
164162
flex: 1;
165163

res/css/views/right_panel/_WidgetCard.scss

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,35 @@ limitations under the License.
2424
border: 0;
2525
}
2626

27-
&.mx_WidgetCard_noEdit {
28-
.mx_AccessibleButton_kind_secondary {
29-
margin: 0 12px;
27+
.mx_BaseCard_header {
28+
display: inline-flex;
3029

31-
&:first-child {
32-
// expand the Pin to room primary action
33-
flex-grow: 1;
34-
}
30+
& > h2 {
31+
margin-right: 0;
32+
flex-grow: 1;
3533
}
36-
}
37-
38-
.mx_WidgetCard_optionsButton {
39-
position: relative;
40-
height: 18px;
41-
width: 26px;
4234

43-
&::before {
44-
content: "";
45-
position: absolute;
46-
width: 20px;
35+
.mx_WidgetCard_optionsButton {
36+
position: relative;
37+
margin-right: 44px;
4738
height: 20px;
48-
top: 6px;
49-
left: 20px;
50-
mask-repeat: no-repeat;
51-
mask-position: center;
52-
mask-size: contain;
53-
mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
54-
background-color: $secondary-fg-color;
39+
width: 20px;
40+
min-width: 20px; // prevent crushing by the flexbox
41+
padding: 0;
42+
43+
&::before {
44+
content: "";
45+
position: absolute;
46+
width: 20px;
47+
height: 20px;
48+
top: 0;
49+
left: 4px;
50+
mask-repeat: no-repeat;
51+
mask-position: center;
52+
mask-size: contain;
53+
mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
54+
background-color: $secondary-fg-color;
55+
}
5556
}
5657
}
5758
}

res/css/views/rooms/_AppsDrawer.scss

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,6 @@ $MiniAppTileHeight: 200px;
118118
height: $MiniAppTileHeight;
119119
}
120120

121-
.mx_AppTile.mx_AppTile_minimised,
122-
.mx_AppTileFullWidth.mx_AppTile_minimised,
123-
.mx_AppTile_mini.mx_AppTile_minimised {
124-
height: 14px;
125-
}
126-
127121
.mx_AppTile .mx_AppTile_persistedWrapper,
128122
.mx_AppTileFullWidth .mx_AppTile_persistedWrapper,
129123
.mx_AppTile_mini .mx_AppTile_persistedWrapper {
@@ -143,11 +137,7 @@ $MiniAppTileHeight: 200px;
143137
flex-direction: row;
144138
align-items: center;
145139
justify-content: space-between;
146-
cursor: pointer;
147140
width: 100%;
148-
}
149-
150-
.mx_AppTileMenuBar_expanded {
151141
padding-bottom: 5px;
152142
}
153143

@@ -179,31 +169,12 @@ $MiniAppTileHeight: 200px;
179169
margin: 0 3px;
180170
}
181171

182-
.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_minimise {
183-
mask-image: url('$(res)/img/feather-customised/widget/minimise.svg');
184-
background-color: $accent-color;
185-
}
186-
187-
.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_maximise {
188-
mask-image: url('$(res)/img/feather-customised/widget/maximise.svg');
189-
background-color: $accent-color;
190-
}
191-
192-
.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout {
172+
.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout { // TODO replace icon
193173
mask-image: url('$(res)/img/feather-customised/widget/external-link.svg');
194174
}
195175

196176
.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_menu {
197-
mask-image: url('$(res)/img/icon_context.svg');
198-
}
199-
200-
.mx_AppTileMenuBarWidgetDelete {
201-
filter: none;
202-
}
203-
204-
.mx_AppTileMenuBarWidget:hover {
205-
border: 1px solid $primary-fg-color;
206-
border-radius: 2px;
177+
mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
207178
}
208179

209180
.mx_AppTileBody {

res/css/views/rooms/_RoomHeader.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,13 @@ limitations under the License.
241241
width: 26px;
242242
}
243243

244+
.mx_RoomHeader_appsButton::before {
245+
mask-image: url('$(res)/img/element-icons/room/apps.svg');
246+
}
247+
.mx_RoomHeader_appsButton_highlight::before {
248+
background-color: $accent-color;
249+
}
250+
244251
.mx_RoomHeader_searchButton::before {
245252
mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
246253
}
Lines changed: 6 additions & 0 deletions
Loading

res/img/element-icons/room/integrations.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.

res/img/icon_context.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)