Skip to content

Commit 671ad6b

Browse files
author
David Monllao
committed
Merge branch 'MDL-44538-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE
2 parents 49bfb1e + a3809c4 commit 671ad6b

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

theme/bootstrapbase/less/moodle/core.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,12 +2102,6 @@ img#persona_signin {
21022102
color: @dropdownLinkColorHover;
21032103
background-color: @dropdownLinkBackgroundHover;
21042104
}
2105-
&:first-child {
2106-
.border-top-radius(4px);
2107-
}
2108-
&:last-child {
2109-
.border-bottom-radius(4px);
2110-
}
21112105
}
21122106
a.hidden {
21132107
display: none;
@@ -2122,6 +2116,12 @@ img#persona_signin {
21222116
}
21232117
> li {
21242118
display: block;
2119+
&:first-child a {
2120+
.border-top-radius(4px);
2121+
}
2122+
&:last-child a {
2123+
.border-bottom-radius(4px);
2124+
}
21252125
}
21262126

21272127
/** bottom left of button **/

theme/bootstrapbase/style/moodle.css

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4534,22 +4534,6 @@ img#persona_signin {
45344534
color: #fff;
45354535
background-color: #0070a8;
45364536
}
4537-
.moodle-actionmenu[data-enhanced].show .menu a:first-child {
4538-
-webkit-border-top-right-radius: 4px;
4539-
-moz-border-radius-topright: 4px;
4540-
border-top-right-radius: 4px;
4541-
-webkit-border-top-left-radius: 4px;
4542-
-moz-border-radius-topleft: 4px;
4543-
border-top-left-radius: 4px;
4544-
}
4545-
.moodle-actionmenu[data-enhanced].show .menu a:last-child {
4546-
-webkit-border-bottom-right-radius: 4px;
4547-
-moz-border-radius-bottomright: 4px;
4548-
border-bottom-right-radius: 4px;
4549-
-webkit-border-bottom-left-radius: 4px;
4550-
-moz-border-radius-bottomleft: 4px;
4551-
border-bottom-left-radius: 4px;
4552-
}
45534537
.moodle-actionmenu[data-enhanced].show .menu a.hidden {
45544538
display: none;
45554539
}
@@ -4564,6 +4548,22 @@ img#persona_signin {
45644548
.moodle-actionmenu[data-enhanced].show .menu > li {
45654549
display: block;
45664550
}
4551+
.moodle-actionmenu[data-enhanced].show .menu > li:first-child a {
4552+
-webkit-border-top-right-radius: 4px;
4553+
-moz-border-radius-topright: 4px;
4554+
border-top-right-radius: 4px;
4555+
-webkit-border-top-left-radius: 4px;
4556+
-moz-border-radius-topleft: 4px;
4557+
border-top-left-radius: 4px;
4558+
}
4559+
.moodle-actionmenu[data-enhanced].show .menu > li:last-child a {
4560+
-webkit-border-bottom-right-radius: 4px;
4561+
-moz-border-radius-bottomright: 4px;
4562+
border-bottom-right-radius: 4px;
4563+
-webkit-border-bottom-left-radius: 4px;
4564+
-moz-border-radius-bottomleft: 4px;
4565+
border-bottom-left-radius: 4px;
4566+
}
45674567
.moodle-actionmenu[data-enhanced].show .menu.align-tl-bl {
45684568
top: 100%;
45694569
left: 0;

0 commit comments

Comments
 (0)