Skip to content

GitLab

mahara
mahara
Commit ebd115dd authored by Liam's avatar Liam Committed by Rebecca Blundell
Browse files
Options

Bug 1765276: Mostly working on the tabs page - otherr small changes 

behatnotneeded

Change-Id: Ib93b54d3adaa57287426d859658fdeba962fb63c
parent cb35e7d2
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 18 deletions
htdocs/tags.php
View file @ ebd115dd
......@@ -75,12 +75,12 @@ jQuery(function($) {
// set all tabs to inactive
$('ul.nav-tabs li').each(function() {
$(this).removeClass('active');
$(this).find('a').removeClass('current-tab');
$(this).find('a').removeClass('active');
$(this).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ')');
});
// set current one to active
$(this).closest('li').addClass('active');
$(this).addClass('current-tab');
$(this).addClass('active');
$(this).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
return false;
......
htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofile.tpl
View file @ ebd115dd
{include file="header.tpl"}
<ul class="nav nav-tabs">
{foreach from=$navtabs item=item}
<li class="{if $item.class}{$item.class} d-none{/if} {if $item.selected} active{/if}" role="presentation" aria-hidden="true">
<a href="{$WWWROOT}{$item.url}#profileform_{$item.page}_container">
<li class="{if $item.class}{$item.class} d-none{/if}" role="presentation" aria-hidden="true">
<a href="{$WWWROOT}{$item.url}#profileform_{$item.page}_container" {if $item.selected}class="active"{/if}>
{$item.title}
<span class="accessible-hidden sr-only">({str tag=tab}{if $item.selected} {str tag=selected}{/if})</span>
</a>
......
htdocs/theme/raw/plugintype/search/elasticsearch/templates/facets.tpl
View file @ ebd115dd
......@@ -18,7 +18,7 @@
{foreach from=$facets item=term}
{if $term.count > 0}
<li class="{if $term.term == $selected}current-tab active{/if}">
<a href="{$WWWROOT}search/elasticsearch/index.php?query={$query}&mainfacetterm={$term.term}{if $tagsonly}&tagsonly=true{/if}&limit={$limit}#onsearch"{if $term.term == $selected} class="current-tab"{/if}>{str tag=$term.display section=search.elasticsearch} ({$term.count})
<a href="{$WWWROOT}search/elasticsearch/index.php?query={$query}&mainfacetterm={$term.term}{if $tagsonly}&tagsonly=true{/if}&limit={$limit}#onsearch"{if $term.term == $selected} class="current-tab {if $term.term == $selected}active{/if}"{/if}>{str tag=$term.display section=search.elasticsearch} ({$term.count})
<span class="accessible-hidden sr-only">({str tag=tab}{if $term.term == $selected} {str tag=selected}{/if})</span>
</a>
</li>
......
htdocs/theme/raw/sass/_custom.scss
View file @ ebd115dd
......@@ -686,3 +686,8 @@ a[type="submit"],
.pieform-fieldset.btn-group {
font-size: 0;
}
.elasticsearch-filters {
border-bottom: 1px solid $card-border;
background-color: $card-heading-bg;
}
htdocs/theme/raw/sass/components/_btn-group.scss
View file @ ebd115dd
......@@ -9,7 +9,7 @@
}
}
.btn-group .form-as-button:last-child {
.btn-group .form-as-button:last-of-type {
.btn {
@include border-right-radius($border-radius);
border-right-width: $border-width;
......
htdocs/theme/raw/sass/components/_list-group.scss
View file @ ebd115dd
......@@ -61,6 +61,8 @@
.list-group-item-heading {
font-family: $font-family-serif;
font-weight: 300;
margin-top: 0;
margin-bottom: 5px;
a {
&:hover {
color: $link-color;
......
htdocs/theme/raw/sass/components/_tags.scss
View file @ ebd115dd
......@@ -38,11 +38,13 @@
.tag-results .btn-top-right {
margin-right: -1px;
margin-top: -41px;
height: 40px;
}
.tag-filters {
@extend .clearfix;
background: scale-color($card-bg, $lightness: -1.40%);
background: scale-color($card-bg, $lightness: -1.5%);
padding: 10px 15px;
// margin-top: 40px;
}
//Edit tag page
......
htdocs/theme/raw/sass/features/_filebrowser.scss
View file @ ebd115dd
......@@ -73,6 +73,9 @@
float: left;
margin-bottom: 20px;
}
.file {
display: block;
}
}
.filelist {
......@@ -88,7 +91,7 @@
}
.fileedittablewrap {
background-color: $card-bg;
background-color: $table-accent-bg;
}
// file browser inside modal screen
......
htdocs/theme/raw/sass/form/_alert.scss
View file @ ebd115dd
......@@ -39,6 +39,6 @@
.alert-default {
background-color: rgba($body-bg, 0.4);
border: 1px solid scale-color(theme-color("secondary"), $lightness: -5.5%);
border: 1px solid scale-color($gray-400, $lightness: 8%);
color: $gray-500;
}
htdocs/theme/raw/sass/layout/card/_card-quarter.scss
View file @ ebd115dd
......@@ -37,11 +37,11 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-family: $font-family-sans-serif;
font-family: $font-family-serif;
}
}
.card-body {
.card-secondary .card-body {
padding: 5px;
}
......
htdocs/theme/raw/sass/typography/_typography.scss
View file @ ebd115dd
......@@ -298,6 +298,10 @@ pre {
margin-top: 21px;
}
.h4, .h5, .h6, h4, h5, h6 {
margin-top: 10.5px;
}
/* headings in html entered by user neutralised */
.myblogs,
.content-text,
......
htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
View file @ ebd115dd
......@@ -9,6 +9,7 @@
@import "../lib/bootstrap4/functions"; // Import the bootstrap functions here since they are required
@import "../lib/bootstrap4/variables"; // Import the bootstrap variables first
@import "theme-variables"; // TODO: Figure out why importing this in style.scss isnt enough
//
// Color system
//
......@@ -134,7 +135,7 @@ $font-size-sm: $font-size-base * 0.85715; // ~12px
$h1-font-size: $font-size-base * 2.15; // ~30px
$h2-font-size: $font-size-base * 1.64285; // ~23px
$h3-font-size: $font-size-base * 1.5; // ~21px
$h4-font-size: $font-size-base * 1.14285; // ~16px
$h4-font-size: $font-size-base * 1.285; // ~18px
$h5-font-size: $font-size-base; // ~14px
$h6-font-size: $font-size-base * 0.85; // ~12px
......@@ -193,8 +194,12 @@ $popover-arrow-width: 1rem;
$popover-arrow-color: $popover-bg;
$popover-arrow-outer-color: fade_in($popover-border-color, 0.05);
// Modals
$modal-md: 600px;
// Alerts
$alert-border-radius: $border-radius;
// Progress bars
$progress-height: 1.3125rem;
......
htdocs/theme/raw/templates/sideblocks/linksandresources.tpl
View file @ ebd115dd
{if $sbdata}
<div class="card card-secondary">
<h3 class="card-heading">
<h3 class="card-header">
{str tag="linksandresources"}
</h3>
<ul class="list-group">
......@@ -11,4 +11,4 @@
{/foreach}
</ul>
</div>
{/if}
\ No newline at end of file
{/if}
htdocs/theme/raw/templates/tags.tpl
View file @ ebd115dd
......@@ -5,7 +5,7 @@
</div>
<ul class="nav nav-tabs">
{foreach from=$tagsortoptions key=tagsortfield item=selectedsort name=tagsortoptions}
<li{if $selectedsort} class="active"{/if}><a href="{$WWWROOT}tags.php?ts={$tagsortfield}"{if $selectedsort} class="current-tab"{/if}>{str tag=sort$tagsortfield}<span class="accessible-hidden sr-only">({str tag=tab}{if $selectedsort} {str tag=selected}{/if})</span></a></li>
<li><a href="{$WWWROOT}tags.php?ts={$tagsortfield}"{if $selectedsort} class="current-tab {if $selectedsort} active{/if}"{/if}>{str tag=sort$tagsortfield}<span class="accessible-hidden sr-only">({str tag=tab}{if $selectedsort} {str tag=selected}{/if})</span></a></li>
{/foreach}
</ul>
<div class="mytags">
......@@ -16,12 +16,12 @@
</ul>
</div>
<div id="results_container" class="card card-secondary tag-results">
<h2 id="results_heading" class="card-heading">{str tag=searchresultsfor}
<h2 id="results_heading" class="card-header">{str tag=searchresultsfor}
<a class="tag secondary-link" href="{$results->baseurl}{if $tag}{$results->queryprefix}tag={$tag|urlencode|safe}{/if}">{if $tag}{$tag|str_shorten_text:50}{else}{str tag=alltags}{/if}</a>
</h2>
{if $not_institution_tag}
<div class="btn-top-right btn-group btn-group-top">
<a class="btn btn-secondary edit-tag{if !$tag} d-none{/if}" href="{$WWWROOT}edittags.php?tag={$tag|urlencode|safe}"><span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>{str tag=editthistag}</a>
<div class="btn-top-right btn-group btn-group-top d-block">
<a class="btn btn-secondary edit-tag float-right{if !$tag} d-none{/if}" href="{$WWWROOT}edittags.php?tag={$tag|urlencode|safe}"><span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>{str tag=editthistag}</a>
</div>
{/if}
<div class="tag-filters">
......
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