1
0
mirror of https://github.com/flarum/core.git synced 2025-08-08 09:26:34 +02:00
This commit is contained in:
David Wheatley
2021-12-24 13:49:06 +01:00
parent ec0c233d15
commit 140a6e4477
3 changed files with 23 additions and 41 deletions

View File

@@ -27,16 +27,13 @@
box-shadow: 0 2px 6px var(--shadow-color); box-shadow: 0 2px 6px var(--shadow-color);
} }
} }
.App-primaryControl, .App-primaryControl, .App-titleControl, .App-backControl {
.App-titleControl,
.App-backControl {
position: absolute !important; position: absolute !important;
z-index: calc(~"var(--zindex-header) + 1"); z-index: calc(~"var(--zindex-header) + 1");
top: 0 !important; top: 0 !important;
margin: 0; margin: 0;
.App.affix &, .App.affix &, .Composer & {
.Composer & {
position: fixed !important; position: fixed !important;
} }
@@ -62,18 +59,15 @@
right: 0; right: 0;
&.Dropdown { &.Dropdown {
.Button, .Button, .Button-caret {
.Button-caret {
display: none !important; display: none !important;
} }
.Dropdown-toggle, .Dropdown-toggle, .Button-icon {
.Button-icon {
display: block !important; display: block !important;
} }
} }
} }
.App-primaryControl, .App-primaryControl, .App-backControl {
.App-backControl {
margin: 0 !important; margin: 0 !important;
> .Button { > .Button {
@@ -96,8 +90,7 @@
text-align: center; text-align: center;
color: var(--header-color) !important; color: var(--header-color) !important;
&, &, > .Button {
> .Button {
font-size: 16px; font-size: 16px;
} }
> .Button { > .Button {
@@ -206,15 +199,12 @@
> li { > li {
padding: 0 10px 0; padding: 0 10px 0;
} }
.FormControl, .FormControl, .ButtonGroup, .Button {
.ButtonGroup,
.Button {
width: 100%; width: 100%;
text-align: left; text-align: left;
} }
.Dropdown-menu { .Dropdown-menu {
.ButtonGroup, .ButtonGroup, .Button {
.Button {
width: auto; width: auto;
} }
} }
@@ -230,7 +220,7 @@
@media @phone { @media @phone {
.App-drawer { .App-drawer {
& when (@config-colored-header = true) { & when (@config-colored-header = true) {
.light-contents(@name: "header-colored"); .light-contents(@name: 'header-colored');
} }
} }
} }
@@ -254,7 +244,7 @@
} }
& when (@config-colored-header = true) { & when (@config-colored-header = true) {
.light-contents(@name: "header-colored"); .light-contents(@name: 'header-colored');
} }
} }
@@ -263,8 +253,7 @@
margin-right: 25px; margin-right: 25px;
} }
.Header-controls { .Header-controls {
&, &, > li {
> li {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }

View File

@@ -24,9 +24,7 @@
} }
> li { > li {
> a, > a, > button, > span {
> button,
> span {
padding: 8px 15px; padding: 8px 15px;
display: block; display: block;
width: 100%; width: 100%;
@@ -61,15 +59,13 @@
background: none !important; background: none !important;
} }
} }
> a, > a, > button {
> button {
&:hover { &:hover {
background: var(--control-bg); background: var(--control-bg);
} }
} }
&.active { &.active {
> a, > a, > button {
> button {
background: var(--control-bg); background: var(--control-bg);
} }
} }
@@ -104,6 +100,7 @@
height: 1px; height: 1px;
} }
.dropdown-backdrop { .dropdown-backdrop {
position: fixed; position: fixed;
left: 0; left: 0;
@@ -113,6 +110,7 @@
z-index: calc(~"var(--zindex-dropdown) - 10"); z-index: calc(~"var(--zindex-dropdown) - 10");
} }
.Dropdown--split { .Dropdown--split {
.Dropdown-toggle .Button-icon { .Dropdown-toggle .Button-icon {
display: none; display: none;
@@ -133,8 +131,7 @@
@media @tablet-up { @media @tablet-up {
.Dropdown-menu li:first-child { .Dropdown-menu li:first-child {
&, &, + li.Dropdown-separator {
+ li.Dropdown-separator {
display: none; display: none;
} }
} }
@@ -159,6 +156,7 @@
} }
} }
@media @phone { @media @phone {
.Dropdown.open { .Dropdown.open {
z-index: var(--zindex-modal); z-index: var(--zindex-modal);
@@ -183,8 +181,7 @@
transition: transform 0.3s, visibility 0s 0.3s; transition: transform 0.3s, visibility 0s 0.3s;
> li { > li {
> a, > a, > button {
> button {
background: var(--body-bg); background: var(--body-bg);
font-size: 16px; font-size: 16px;
padding: 15px 20px; padding: 15px 20px;
@@ -202,10 +199,8 @@
} }
} }
> .active { > .active {
> a, > a, > button {
> button { &, &:hover {
&,
&:hover {
background: var(--primary-color) !important; background: var(--primary-color) !important;
color: #fff !important; color: #fff !important;
} }

View File

@@ -60,8 +60,7 @@
flex-shrink: 0; flex-shrink: 0;
margin-right: 50px; margin-right: 50px;
&, &, > ul {
> ul {
width: 190px; width: 190px;
} }
> ul { > ul {
@@ -91,8 +90,7 @@
border-bottom: 1px solid var(--control-bg); border-bottom: 1px solid var(--control-bg);
} }
> ul > li, > ul > li, .Dropdown-menu > li {
.Dropdown-menu > li {
display: inline-block; display: inline-block;
margin: 0 20px 0 0; margin: 0 20px 0 0;
vertical-align: top; vertical-align: top;