Skip to content

Commit

Permalink
Merge branch 'MDL-75157-master-1' of https://github.com/mihailges/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@junpataleta @ilyatregubov
junpataleta authored and ilyatregubov committed Oct 21, 2022
2 parents 31419c1 + 48f39b0 commit 492662a
Show file tree
Hide file tree
Showing 15 changed files with 115 additions and 14 deletions.
3 changes: 2 additions & 1 deletion grade/templates/course_outcomes_action_bar.mustache
View file
Expand Up @@ -73,12 +73,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#manageoutcomesbutton}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/export_action_bar.mustache
View file
Expand Up @@ -83,12 +83,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#exportselector}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/export_key_manager_action_bar.mustache
View file
Expand Up @@ -95,12 +95,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#exportselector}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/export_publish_action_bar.mustache
View file
Expand Up @@ -34,12 +34,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#backbutton}}
<div class="navitem">
{{>core/single_button}}
</div>
<div class="navitem-divider"></div>
{{/backbutton}}
</div>
</div>
3 changes: 2 additions & 1 deletion grade/templates/general_action_bar.mustache
View file
Expand Up @@ -61,12 +61,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
</div>
</div>
3 changes: 2 additions & 1 deletion grade/templates/grade_letters_action_bar.mustache
View file
Expand Up @@ -73,12 +73,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#editbutton}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/gradebook_setup_action_bar.mustache
View file
Expand Up @@ -97,12 +97,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#addgradeitembutton}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/import_action_bar.mustache
View file
Expand Up @@ -83,12 +83,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#importselector}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/import_key_manager_action_bar.mustache
View file
Expand Up @@ -95,12 +95,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#importselector}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/manage_outcomes_action_bar.mustache
View file
Expand Up @@ -70,12 +70,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#backbutton}}
<div class="navitem">
{{>core/single_button}}
</div>
<div class="navitem-divider"></div>
{{/backbutton}}
{{#addoutcomebutton}}
<div class="navitem">
Expand Down
3 changes: 2 additions & 1 deletion grade/templates/scales_action_bar.mustache
View file
Expand Up @@ -73,12 +73,13 @@
}
}
}}
<div class="container-fluid tertiary-navigation">
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
{{/generalnavselector}}
{{#addnewscalebutton}}
<div class="navitem">
Expand Down
33 changes: 32 additions & 1 deletion theme/boost/scss/moodle/tertiarynavigation.scss
View file
@@ -1,11 +1,37 @@
.tertiary-navigation {
padding-top: 10px;

.navitem {
&.full-width-bottom-border {
width: calc(100% + 1rem + 30px);
margin-left: calc(-0.5rem - 15px);
margin-right: calc(-0.5rem - 15px);
border-bottom: 1px solid $gray-300;
margin-bottom: 25px;

@include media-breakpoint-down(sm) {
width: calc(100% + 1rem);
margin-left: -0.5rem;
margin-right: -0.5rem;
}

.row {
margin: 0;
padding-left: 0.5rem;
padding-right: 0.5rem;
}
}

.navitem,
.navitem-divider {
display: flex;
margin-bottom: 25px;
}

.navitem-divider {
width: 1px;
background-color: $gray-300;
}

& > a.btn,
& > div.urlselect {
margin-bottom: 25px;
Expand All @@ -22,6 +48,11 @@
font-weight: bold;
}
}

.navitem:not(:last-child),
.navitem-divider:not(:last-child) {
margin-right: 20px;
}
}

@media print {
Expand Down
24 changes: 23 additions & 1 deletion theme/boost/style/moodle.css
View file
Expand Up @@ -21773,9 +21773,28 @@ div.editor_atto_toolbar button .icon {

.tertiary-navigation {
padding-top: 10px; }
.tertiary-navigation .navitem {
.tertiary-navigation.full-width-bottom-border {
width: calc(100% + 1rem + 30px);
margin-left: calc(-0.5rem - 15px);
margin-right: calc(-0.5rem - 15px);
border-bottom: 1px solid #dee2e6;
margin-bottom: 25px; }
@media (max-width: 767.98px) {
.tertiary-navigation.full-width-bottom-border {
width: calc(100% + 1rem);
margin-left: -0.5rem;
margin-right: -0.5rem; } }
.tertiary-navigation.full-width-bottom-border .row {
margin: 0;
padding-left: 0.5rem;
padding-right: 0.5rem; }
.tertiary-navigation .navitem,
.tertiary-navigation .navitem-divider {
display: flex;
margin-bottom: 25px; }
.tertiary-navigation .navitem-divider {
width: 1px;
background-color: #dee2e6; }
.tertiary-navigation > a.btn,
.tertiary-navigation > div.urlselect {
margin-bottom: 25px; }
Expand All @@ -21785,6 +21804,9 @@ div.editor_atto_toolbar button .icon {
padding: 0;
font-size: 1.4rem;
font-weight: bold; }
.tertiary-navigation .navitem:not(:last-child),
.tertiary-navigation .navitem-divider:not(:last-child) {
margin-right: 20px; }

@media print {
.tertiary-navigation {
Expand Down
15 changes: 15 additions & 0 deletions theme/classic/scss/moodle.scss
View file
Expand Up @@ -17,3 +17,18 @@ img.userpicture {
font-weight: bold;
}
}

.tertiary-navigation {

&.full-width-bottom-border {
width: calc(100% + 2.5rem);
margin-left: -1.25rem;
margin-right: -1.25rem;

@include media-breakpoint-down(sm) {
width: calc(100% + 2rem);
margin-left: -1rem;
margin-right: -1rem;
}
}
}
24 changes: 23 additions & 1 deletion theme/classic/style/moodle.css
View file
Expand Up @@ -21719,9 +21719,28 @@ div.editor_atto_toolbar button .icon {

.tertiary-navigation {
padding-top: 10px; }
.tertiary-navigation .navitem {
.tertiary-navigation.full-width-bottom-border {
width: calc(100% + 1rem + 30px);
margin-left: calc(-0.5rem - 15px);
margin-right: calc(-0.5rem - 15px);
border-bottom: 1px solid #dee2e6;
margin-bottom: 25px; }
@media (max-width: 767.98px) {
.tertiary-navigation.full-width-bottom-border {
width: calc(100% + 1rem);
margin-left: -0.5rem;
margin-right: -0.5rem; } }
.tertiary-navigation.full-width-bottom-border .row {
margin: 0;
padding-left: 0.5rem;
padding-right: 0.5rem; }
.tertiary-navigation .navitem,
.tertiary-navigation .navitem-divider {
display: flex;
margin-bottom: 25px; }
.tertiary-navigation .navitem-divider {
width: 1px;
background-color: #dee2e6; }
.tertiary-navigation > a.btn,
.tertiary-navigation > div.urlselect {
margin-bottom: 25px; }
Expand All @@ -21731,6 +21750,9 @@ div.editor_atto_toolbar button .icon {
padding: 0;
font-size: 1.4rem;
font-weight: bold; }
.tertiary-navigation .navitem:not(:last-child),
.tertiary-navigation .navitem-divider:not(:last-child) {
margin-right: 20px; }

@media print {
.tertiary-navigation {
Expand Down

0 comments on commit 492662a

Please sign in to comment.