Skip to content

Commit 2ed6965

Browse files
committed
Support right-to-left text direction in stylesheets and make sidebar-pane styles compatible with upstream elementary stylesheet
elementary/stylesheet#1327
1 parent efd1c71 commit 2ed6965

File tree

3 files changed

+31
-8
lines changed

3 files changed

+31
-8
lines changed

data/stylesheets/base.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,13 @@ styleselector checkbutton radio {
5252
min-height: 12px;
5353
min-width: 12px;
5454
padding: 2px;
55+
}
56+
styleselector checkbutton radio:dir(ltr) {
5557
transform: translate(16px, 10px);
5658
}
59+
styleselector checkbutton radio:dir(rtl) {
60+
transform: translate(-16px, 10px);
61+
}
5762
styleselector checkbutton radio:checked {
5863
-gtk-icon-source: -gtk-icontheme("object-select-symbolic");
5964
background-color: @accent_bg_color;

data/stylesheets/elementary-dark.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
overlay-split-view widget:not(.sidebar-pane) > toolbarview,
99
overlay-split-view widget:not(.sidebar-pane) > toolbarview searchbar,
1010
overlay-split-view widget:not(.sidebar-pane) > toolbarview listview {
11-
background-color: mix(@BLACK_500, @BLACK_700, 0.075);
11+
background-color: @insensitive_bg_color;
1212
}
1313

14-
overlay-split-view widget.sidebar-pane > toolbarview {
15-
background-color: mix(@BLACK_300, @BLACK_500, 0.725);
14+
overlay-split-view widget.sidebar-pane {
15+
background-color: @base_color;
1616
}
1717

1818

data/stylesheets/elementary.css

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,19 @@ windowcontrols button {
1717
* Decrease margins on main window controls
1818
*/
1919

20-
#main-window windowcontrols.start {
20+
#main-window windowcontrols.start:dir(ltr) {
2121
margin-right: 0;
2222
}
23+
#main-window windowcontrols.start:dir(rtl) {
24+
margin-left: 0;
25+
}
2326

24-
#main-window windowcontrols.end {
27+
#main-window windowcontrols.end:dir(ltr) {
2528
margin-left: 9px;
2629
}
30+
#main-window windowcontrols.end:dir(rtl) {
31+
margin-right: 9px;
32+
}
2733

2834

2935
/*
@@ -139,12 +145,19 @@ row.property label.subtitle {
139145
overlay-split-view widget:not(.sidebar-pane) > toolbarview,
140146
overlay-split-view widget:not(.sidebar-pane) > toolbarview searchbar,
141147
overlay-split-view widget:not(.sidebar-pane) > toolbarview listview {
142-
background-color: white;
148+
background-color: @base_color;
143149
}
144150

145-
overlay-split-view widget.sidebar-pane > toolbarview {
146-
background-color: mix(@SILVER_100, @SILVER_300, 0.225);
151+
overlay-split-view widget.sidebar-pane {
152+
background-color: @insensitive_bg_color;
153+
}
154+
overlay-split-view widget.sidebar-pane:dir(ltr) {
147155
border-left: 1px solid @menu_separator;
156+
border-right: none;
157+
}
158+
overlay-split-view widget.sidebar-pane:dir(rtl) {
159+
border-left: none;
160+
border-right: 1px solid @menu_separator;
148161
}
149162

150163

@@ -252,8 +265,13 @@ overlay-split-view .rich-list row button.error image {
252265

253266
#network-list > scrolledwindow > listview > row .network-node {
254267
border-radius: 50%;
268+
}
269+
#network-list > scrolledwindow > listview > row .network-node:dir(ltr) {
255270
margin-left: 6px;
256271
}
272+
#network-list > scrolledwindow > listview > row .network-node:dir(rtl) {
273+
margin-right: 6px;
274+
}
257275

258276
#network-list > scrolledwindow > listview > row .network-node-online {
259277
background: @LIME_300;

0 commit comments

Comments
 (0)