Skip to content

Commit 6261a9f

Browse files
clefebvreclefebvre
committed
Adapt to new menu improvements
1 parent 2c87a91 commit 6261a9f

File tree

4 files changed

+214
-131
lines changed

4 files changed

+214
-131
lines changed

‎src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css‎

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,34 +1777,56 @@ On-Screen Keyboard (>= Cinnamon 6.6)
17771777
padding: 0;
17781778
}
17791779

1780-
.appmenu-system-box {
1781-
spacing: 6px;
1782-
padding-left: 9px;
1783-
padding-right: 9px;
1780+
.appmenu-main-box {
1781+
spacing: 10px;
17841782
}
17851783

1786-
.appmenu-categories-box {
1787-
padding-top: 10px;
1788-
padding-left: 30px;
1789-
padding-right: 30px;
1790-
padding-bottom: 10px;
1784+
.appmenu-right-box {
1785+
spacing: 5px;
1786+
padding: 10px 10px;
1787+
}
1788+
1789+
.appmenu-search-box {
1790+
spacing: 10px;
1791+
}
1792+
1793+
.appmenu-categories-applications-box {
1794+
spacing: 15px;
1795+
padding: 10px 10px;
1796+
}
1797+
1798+
.appmenu-categories-applications-box:top {
1799+
/* Extra padding at the top of the categories/apps
1800+
when the search box is at the bottom */
1801+
padding-top: 5px;
1802+
}
1803+
1804+
.appmenu-applications-box {
1805+
/* Extra gap between the highlighted app and the scroll handle */
1806+
padding-right: 5px;
1807+
}
1808+
1809+
.appmenu-system-box {
1810+
spacing: 10px;
17911811
}
17921812

17931813
.appmenu-sidebar {
1814+
padding: 10px 0px;
1815+
spacing: 5px;
17941816
background-color: #dadada;
17951817
border: 1px solid rgb(192, 192, 192);
17961818
border-radius: 4px 0 0 4px;
1797-
padding: 0.5em;
17981819
border-right-width: 1px;
17991820
}
18001821

1801-
.appmenu-sidebar-user-box {
1802-
padding-top: 5px;
1803-
padding-bottom: 5px;
1822+
.appmenu-sidebar .appmenu-system-button-lock:hover {
1823+
background-color: #444444;
1824+
color: white;
18041825
}
18051826

1806-
.appmenu-applications-scrollbox {
1807-
padding-right: 3px;
1827+
.appmenu-sidebar .appmenu-system-button-logout:hover {
1828+
background-color: #444444;
1829+
color: white;
18081830
}
18091831

18101832
.appmenu-application-button-label:ltr {
@@ -1843,11 +1865,13 @@ On-Screen Keyboard (>= Cinnamon 6.6)
18431865
}
18441866

18451867
.appmenu-system-button-lock:hover {
1846-
background-color: #dadada;
1868+
background-color: #444444;
1869+
color: white;
18471870
}
18481871

18491872
.appmenu-system-button-logout:hover {
1850-
background-color: #dadada;
1873+
background-color: #444444;
1874+
color: white;
18511875
}
18521876

18531877
.appmenu-system-button-shutdown:hover {
@@ -1916,14 +1940,6 @@ On-Screen Keyboard (>= Cinnamon 6.6)
19161940
padding-right: 5px;
19171941
}
19181942

1919-
.appmenu-context-menu {
1920-
}
1921-
1922-
.appmenu-search-box {
1923-
padding: 12px 6px 6px 36px;
1924-
border-color: rgba(200, 200, 200, 1);;
1925-
}
1926-
19271943
.appmenu-search-entry-icon {
19281944
icon-size: 1em;
19291945
color: #2b2b2b;
@@ -2622,9 +2638,12 @@ On-Screen Keyboard (>= Cinnamon 6.6)
26222638
margin: 6px;
26232639
}
26242640

2641+
.user-widget.vertical {
2642+
spacing: 10px;
2643+
}
2644+
26252645
.user-widget.vertical .user-widget-label {
26262646
color: rgb(70, 70, 70);
2627-
padding-top: 10px;
26282647
text-align: center;
26292648
font-size: 1.2em;
26302649
}

‎src/Mint-Y/cinnamon/cinnamon-dark.css‎

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,32 +1021,50 @@ StScrollBar {
10211021
.appmenu-background .popup-menu-content {
10221022
padding: 0; }
10231023

1024+
.appmenu-main-box {
1025+
spacing: 10px; }
1026+
1027+
.appmenu-right-box {
1028+
spacing: 5px;
1029+
padding: 10px 10px; }
1030+
1031+
.appmenu-categories-applications-box {
1032+
spacing: 15px; }
1033+
.appmenu-categories-applications-box:top {
1034+
padding-top: 5px; }
1035+
1036+
.appmenu-applications-box {
1037+
padding-right: 5px; }
1038+
1039+
.appmenu-search-box {
1040+
spacing: 10px; }
1041+
10241042
.appmenu-sidebar {
1043+
padding: 15px 0px;
10251044
background-color: #303036;
10261045
border-radius: 7.5px 0 0 7.5px;
10271046
border-right-width: 1px;
1028-
border-color: #303036; }
1029-
.appmenu-sidebar-user-box {
1030-
padding-top: 9px;
1031-
padding-bottom: 4.5px; }
1047+
border-color: #303036;
1048+
spacing: 5px; }
1049+
.appmenu-sidebar .appmenu-system-button {
1050+
background-color: #494951; }
1051+
.appmenu-sidebar .appmenu-system-button-lock:hover {
1052+
background-color: #55555f; }
1053+
.appmenu-sidebar .appmenu-system-button-logout:hover {
1054+
background-color: #55555f; }
1055+
.appmenu-sidebar .appmenu-system-button-shutdown {
1056+
color: white;
1057+
background-color: #c01c28; }
1058+
.appmenu-sidebar .appmenu-system-button-shutdown:hover {
1059+
color: white;
1060+
background-color: #d61f2d; }
10321061

10331062
.appmenu-system-box {
1034-
spacing: 6px;
1035-
padding-left: 6px;
1036-
padding-right: 6px; }
1037-
1038-
.appmenu-categories-box {
1039-
padding: 9px 21px; }
1040-
1041-
.appmenu-applications-box {
1042-
padding: 9px; }
1043-
1044-
.appmenu-applications-scrollbox {
1045-
padding-right: 3px; }
1063+
spacing: 10px; }
10461064

10471065
.appmenu-sidebar-button {
10481066
padding: 3px 7px 3px 7px;
1049-
margin: 0 9px 0 9px; }
1067+
margin: 0 10px 0 10px; }
10501068
.appmenu-sidebar-button:hover {
10511069
background-color: #44444c;
10521070
border-color: #303036; }
@@ -1055,21 +1073,23 @@ StScrollBar {
10551073
padding: 8.4px;
10561074
border: 1px solid #303036;
10571075
border-radius: 9999px;
1058-
background-color: #303036; }
1076+
background-color: #3c3c44; }
1077+
.appmenu-system-button-shutdown {
1078+
color: white;
1079+
background-color: #c01c28; }
10591080
.appmenu-system-button-lock:hover {
1060-
background-color: #44444c; }
1081+
background-color: #494951; }
10611082
.appmenu-system-button-logout:hover {
1062-
background-color: #44444c; }
1083+
background-color: #494951; }
10631084
.appmenu-system-button-shutdown:hover {
1064-
background-color: #c01c28; }
1085+
color: white;
1086+
background-color: #d61f2d; }
10651087

10661088
.appmenu-application-button-label {
10671089
padding: 0; }
10681090

10691091
.appmenu-application-button-description {
1070-
color: #a0a0a0;
1071-
font-weight: 400;
1072-
font-size: 0.818em; }
1092+
color: #a0a0a0; }
10731093

10741094
.appmenu-application-button:highlighted {
10751095
font-weight: bold; }
@@ -1094,17 +1114,9 @@ StScrollBar {
10941114
.appmenu-category-button-greyed StIcon {
10951115
opacity: 0.5; }
10961116

1097-
.appmenu-search-box {
1098-
padding: 7px 7px 7px 9px;
1099-
border-bottom-width: 1px;
1100-
border-color: #303036; }
1101-
11021117
.appmenu-search-entry-icon {
11031118
icon-size: 1em; }
11041119

1105-
#appmenu-search-entry {
1106-
margin: 9px; }
1107-
11081120
.window-list-box {
11091121
spacing: 6px;
11101122
padding-left: 10px;
@@ -1504,9 +1516,11 @@ StScrollBar {
15041516
.user-widget.horizontal {
15051517
spacing: 7px; }
15061518

1519+
.user-widget.vertical {
1520+
spacing: 10px; }
1521+
15071522
.user-widget.vertical .user-widget-label {
15081523
color: #e1e1e1;
1509-
padding-top: 10px;
15101524
text-align: center; }
15111525

15121526
.applet-cornerbar {
@@ -1611,7 +1625,7 @@ StScrollBar {
16111625
background-color: rgba(0, 0, 0, 0);
16121626
border-radius: 0px; }
16131627

1614-
.prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label, .run-dialog-description, .message-dialog-content .message-dialog-caption, .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description {
1628+
.prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label, .run-dialog-description, .message-dialog-content .message-dialog-caption, .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description, .appmenu-application-button-description {
16151629
font-weight: 400;
16161630
font-size: 0.818em; }
16171631

‎src/Mint-Y/cinnamon/cinnamon.css‎

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,32 +1021,50 @@ StScrollBar {
10211021
.appmenu-background .popup-menu-content {
10221022
padding: 0; }
10231023

1024+
.appmenu-main-box {
1025+
spacing: 10px; }
1026+
1027+
.appmenu-right-box {
1028+
spacing: 5px;
1029+
padding: 10px 10px; }
1030+
1031+
.appmenu-categories-applications-box {
1032+
spacing: 15px; }
1033+
.appmenu-categories-applications-box:top {
1034+
padding-top: 5px; }
1035+
1036+
.appmenu-applications-box {
1037+
padding-right: 5px; }
1038+
1039+
.appmenu-search-box {
1040+
spacing: 10px; }
1041+
10241042
.appmenu-sidebar {
1043+
padding: 15px 0px;
10251044
background-color: #d3d3d7;
10261045
border-radius: 7.5px 0 0 7.5px;
10271046
border-right-width: 1px;
1028-
border-color: #b5b5bd; }
1029-
.appmenu-sidebar-user-box {
1030-
padding-top: 9px;
1031-
padding-bottom: 4.5px; }
1047+
border-color: #b5b5bd;
1048+
spacing: 5px; }
1049+
.appmenu-sidebar .appmenu-system-button {
1050+
background-color: #eeeeef; }
1051+
.appmenu-sidebar .appmenu-system-button-lock:hover {
1052+
background-color: #fbfbfb; }
1053+
.appmenu-sidebar .appmenu-system-button-logout:hover {
1054+
background-color: #fbfbfb; }
1055+
.appmenu-sidebar .appmenu-system-button-shutdown {
1056+
color: white;
1057+
background-color: #F04A50; }
1058+
.appmenu-sidebar .appmenu-system-button-shutdown:hover {
1059+
color: white;
1060+
background-color: #f26267; }
10321061

10331062
.appmenu-system-box {
1034-
spacing: 6px;
1035-
padding-left: 6px;
1036-
padding-right: 6px; }
1037-
1038-
.appmenu-categories-box {
1039-
padding: 9px 21px; }
1040-
1041-
.appmenu-applications-box {
1042-
padding: 9px; }
1043-
1044-
.appmenu-applications-scrollbox {
1045-
padding-right: 3px; }
1063+
spacing: 10px; }
10461064

10471065
.appmenu-sidebar-button {
10481066
padding: 3px 7px 3px 7px;
1049-
margin: 0 9px 0 9px; }
1067+
margin: 0 10px 0 10px; }
10501068
.appmenu-sidebar-button:hover {
10511069
background-color: #b0b0b8;
10521070
border-color: #b5b5bd; }
@@ -1055,21 +1073,23 @@ StScrollBar {
10551073
padding: 8.4px;
10561074
border: 1px solid #b5b5bd;
10571075
border-radius: 9999px;
1058-
background-color: #d3d3d7; }
1076+
background-color: #e0e0e3; }
1077+
.appmenu-system-button-shutdown {
1078+
color: white;
1079+
background-color: #F04A50; }
10591080
.appmenu-system-button-lock:hover {
1060-
background-color: #b0b0b8; }
1081+
background-color: #eeeeef; }
10611082
.appmenu-system-button-logout:hover {
1062-
background-color: #b0b0b8; }
1083+
background-color: #eeeeef; }
10631084
.appmenu-system-button-shutdown:hover {
1064-
background-color: #F04A50; }
1085+
color: white;
1086+
background-color: #f26267; }
10651087

10661088
.appmenu-application-button-label {
10671089
padding: 0; }
10681090

10691091
.appmenu-application-button-description {
1070-
color: #636363;
1071-
font-weight: 400;
1072-
font-size: 0.818em; }
1092+
color: #636363; }
10731093

10741094
.appmenu-application-button:highlighted {
10751095
font-weight: bold; }
@@ -1094,17 +1114,9 @@ StScrollBar {
10941114
.appmenu-category-button-greyed StIcon {
10951115
opacity: 0.5; }
10961116

1097-
.appmenu-search-box {
1098-
padding: 7px 7px 7px 9px;
1099-
border-bottom-width: 1px;
1100-
border-color: #b5b5bd; }
1101-
11021117
.appmenu-search-entry-icon {
11031118
icon-size: 1em; }
11041119

1105-
#appmenu-search-entry {
1106-
margin: 9px; }
1107-
11081120
.window-list-box {
11091121
spacing: 6px;
11101122
padding-left: 10px;
@@ -1504,9 +1516,11 @@ StScrollBar {
15041516
.user-widget.horizontal {
15051517
spacing: 7px; }
15061518

1519+
.user-widget.vertical {
1520+
spacing: 10px; }
1521+
15071522
.user-widget.vertical .user-widget-label {
15081523
color: #303030;
1509-
padding-top: 10px;
15101524
text-align: center; }
15111525

15121526
.applet-cornerbar {
@@ -1611,7 +1625,7 @@ StScrollBar {
16111625
background-color: rgba(0, 0, 0, 0);
16121626
border-radius: 0px; }
16131627

1614-
.prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label, .run-dialog-description, .message-dialog-content .message-dialog-caption, .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description {
1628+
.prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label, .run-dialog-description, .message-dialog-content .message-dialog-caption, .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description, .appmenu-application-button-description {
16151629
font-weight: 400;
16161630
font-size: 0.818em; }
16171631

0 commit comments

Comments
 (0)