Commit 2e67a4e9 authored by Sarah Kirby's avatar Sarah Kirby Committed by Rebecca Blundell
Browse files

Bug 1765276: Fixes to: Login header, footer links, btn-secondary

page-header, gray-200 var, tinymce. Primary fixes to
page - /view/blocks.php

behatnotneeded

Change-Id: If4a232198328d4e3de17f8d62f47226d36a24307
parent 3439c154
......@@ -22,7 +22,7 @@ defined('INTERNAL') || die();
function get_manual_help_link($keys) {
$data = get_manual_help_link_array($keys);
$manuallink = sprintf('<a id="footerhelp" target="_blank" href="%s/%s/%s/%s">' . get_string('Help') . '</a>',
$manuallink = sprintf('<a id="footerhelp" class="nav-link" href="%s/%s/%s/%s">' . get_string('Help') . '</a>',
$data['prefix'],
$data['language'],
$data['version'],
......
.move-indicator {
@extend .text-muted;
font-size: $font-size-base - 3;
font-size: $font-size-base * .786;
vertical-align: middle;
margin-left: -4px;
opacity: 0.7;
......
......@@ -88,7 +88,7 @@ $width-sm: 90%;
}
.modal-header,
.mce-card .mce-window-head {
.mce-panel .mce-window-head {
background: $card-bg;
padding: 10px 15px;
h4, .mce-title {
......
......@@ -20,7 +20,7 @@ $logged-in-height-mobile: 100px;
border-top: 3px solid $dashboard-widget-color;
background-color: scale-color($dashboard-widget-bg, $lightness: -3.25%);
@include media-breakpoint-between(md, lg) {
@include media-breakpoint-between(md, lg) {
height: $logged-in-height-mobile;
padding: 7px 15px;
}
......
......@@ -5,6 +5,10 @@
.icon-stack {
font-size: 0.75em;
}
.nav-link:hover {
background-color: $navbar-default-link-hover-bg;
color: $link-color;
}
}
.footer-performance-info {
......
......@@ -14,7 +14,7 @@
&.blockinstance.card {
background-color: transparent;
.card-heading {
background-color: $card-bg;
background-color: $card-heading-bg;
}
}
> .card-heading, .card-heading-nested {
......
......@@ -35,7 +35,7 @@
display: none;
}
.nav-tabs>li.active>a {
.nav-tabs.nav>li>a.active {
color: $link-color;
border: 1px solid transparent;
border-bottom: 3px solid $nav-tabs-link-hover-border-color;
......
......@@ -9,16 +9,16 @@
}
}
.mce-card.mce-tinymce {
.mce-panel.mce-tinymce {
background: $card-bg;
border: 0;
.mce-card {
background: $card-bg;
.mce-panel {
background: $card-heading-bg;
}
.mce-statusbar.mce-container{
margin-top: 5px;
background: $card-bg;
background: $card-heading-bg;
}
}
......
......@@ -29,7 +29,9 @@ h1 {
}
.page-header {
margin-bottom:20px;
padding-bottom: $line-height-computed / 2;
margin-bottom: 20px;
border-bottom: 1px solid $gray-200;
~ .with-heading {
margin-top: -16px;
@include media-breakpoint-down(sm) {
......
......@@ -13,7 +13,7 @@
$white: #fff !default;
$black: #000 !default;
$gray-100: lighten($black, 93.5%) !default; // #eee
$gray-200: #ececec !default;
$gray-200: #cccccc !default;
$gray-300: lighten($black, 46.7%) !default; // #777
$gray-400: #ced4da !default;
$gray-500: lighten($black, 33.5%) !default; // #555
......@@ -291,8 +291,8 @@ $h6-font-size: $font-size-base * 0.85 !default;
$headings-margin-bottom: ($spacer / 2) !default;
$headings-font-family: $font-family-serif !default;
$headings-font-weight: 300 !default;
$headings-line-height: 1.2 !default;
$headings-color: inherit !default;
$headings-line-height: 1.3 !default;
$headings-color: rgb(51, 51, 51) !default;
$display1-size: 6rem !default;
$display2-size: 5.5rem !default;
......@@ -445,7 +445,7 @@ $btn-transition: color .15s ease-in-out, background-color .15s ease
$btn-secondary-color: #333 !default;
$btn-secondary-bg: #F9F9F9 !default;
$btn-secondary-border: #ccc !default;
$btn-secondary-border: $secondary !default;
$btn-primary-color: #fff !default;
$btn-primary-bg: theme-color("primary") !default;
......
......@@ -39,7 +39,7 @@
{if $item.fullurl}
{$item.fullurl|safe}
{else}
<a href="{$item.url}">{$item.title}</a>
<a href="{$item.url}" class="nav-link">{$item.title}</a>
{/if}
</li>
{/foreach}
......
......@@ -3,7 +3,7 @@
<div class="row">
<div class="col-md-3 login-card">
<div class="card card-secondary">
<h3 class="card-heading">
<h3 class="card-header">
{str tag="login"}
<span class="float-right">{contextualhelp plugintype='core' pluginname='core' section='loginbox'}</span>
</h3>
......
<div class="card card-secondary">
<h3 class="card-heading">
<h3 class="card-header">
{str tag="login"}
<span class="float-right">{contextualhelp plugintype='core' pluginname='core' section='loginbox'}</span>
</h3>
......@@ -8,4 +8,4 @@
{dynamic}{$messages.loginbox|safe}{/dynamic}
<div id="loginform_container">{$sbdata.loginform|safe}</div>
</div>
</div>
\ No newline at end of file
</div>
......@@ -23,10 +23,10 @@
</div>
{/if}
<div class="row view-container" selected='content' data-target="col-collapse">
<div class="view-container" selected='content' data-target="col-collapse">
{if $columns}
<form action="{$formurl}" method="post">
<form action="{$formurl}" method="post" class="row">
<input type="submit" name="{$action_name}" id="action-dummy" class="d-none">
<input type="hidden" id="viewid" name="id" value="{$view}">
<input type="hidden" name="change" value="1">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment