Commit 2fa91cb9 authored by Liam's avatar Liam Committed by Rebecca Blundell

Bug #1765276: Pages and collections work

-Buttons,
-arrowbar

behatnotneeded

Change-Id: Ic30e0e9ca4d9d37f83130c33436c28cd22d07810
parent a7caac34
Popper.js for bootstrap
=======================
Website: https://popper.js.org/
Version: 1
A library used to position poppers in web applications.
Changes:
- None
This diff is collapsed.
......@@ -75,11 +75,13 @@
line-height: 2em;
margin-top: 9px;
margin-bottom: 9px;
display: block;
&:hover,
&:focus {
@include transition-duration(0.3s);
background: $navbar-default-bg;
color: $link-color;
text-decoration: none;
}
}
&.active > a,
......@@ -91,5 +93,8 @@
color: $link-color;
}
}
+ li {
margin-left: 2px;
}
}
}
......@@ -4,15 +4,24 @@
color: $btn-secondary-color;
background-color: $btn-secondary-bg;
border-color: $btn-secondary-border;
&:hover {
background-color: darken($btn-secondary-bg, 10%);
}
}
.btn-primary:not(:disabled):not(.disabled).active, .btn-primary:not(:disabled):not(.disabled):active, .show>.btn-primary.dropdown-toggle {
color: inherit;
background-color: transparent;
border-color: transparent
border-color: transparent;
box-shadow: none;
}
.btn-secondary:not(:disabled):not(.disabled).active, .btn-secondary:not(:disabled):not(.disabled):active, .show>.btn-secondary.dropdown-toggle {
color: $gray-900;
background-color: darken($btn-secondary-bg, 15%);
box-shadow: inset 0 3px 5px rgba(0,0,0,.125);
}
.btn.text-left {
text-align:left;
}
......@@ -183,7 +192,7 @@ td.action-list-copy {
margin-top: 10px;
@include media-breakpoint-up(md) {
@include clearfix;
margin-top: -12px;
margin-top: -10px;
margin-bottom: 11px;
}
.btn {
......
......@@ -80,7 +80,7 @@ $indicator-total-width: $indicator-size + ($indicator-horizontal-margin * 2);
@include box-sizing(border-box);
@include box-shadow(none);
content: '';
background-color: theme-color("secondary");
background-color: $gray-100;
border: 1px solid $btn-secondary-border;
display: block;
float: left;
......
......@@ -135,3 +135,17 @@
}
}
}
.card-footer {
.dropdown-menu {
.dropdown-item {
padding: 0;
a {
display: block;
&.seperator {
border: 0;
}
}
}
}
}
......@@ -29,6 +29,11 @@ body {
@include media-breakpoint-up(md) {
padding-top: 30px;
}
.card {
.list-group-item {
border: none
}
}
}
// Expose a section of the page
......
......@@ -29,7 +29,7 @@
box-shadow: 0 1px 1px rgba(0,0,0,.05);
}
.card-heading {
.card-header {
background-color: transparent;
border-bottom-color: transparent;
.title-link {
......
......@@ -8,7 +8,7 @@
.dropdown-toggle {
// Generate the caret automatically
@include caret;
// @include caret;
}
// The dropdown menu
......
......@@ -1139,22 +1139,7 @@ $list-group-border-color: rgba($black, .125) !default;
$list-group-border-width: $border-width !default;
$list-group-border-radius: $border-radius !default;
$card-background: (
danger: scale-color($card-danger-heading-bg, $lightness: -3.25%),
info: scale-color($card-info-heading-bg, $lightness: -3.5%),
success: scale-color($card-success-heading-bg, $lightness: -3.75%),
primary: scale-color($card-primary-heading-bg, $lightness: -3.25%),
warning: scale-color($card-warning-heading-bg, $lightness: -3.15%)
);
$card-border: (
danger: scale-color($card-danger-heading-bg, $lightness: -16.5%),
info: scale-color($card-info-heading-bg, $lightness: -16.5%),
success: scale-color($card-success-heading-bg, $lightness: -17.85%),
primary: scale-color($card-primary-heading-bg, $lightness: -15%),
warning: scale-color($card-warning-heading-bg, $lightness: -16%)
);
$list-group-item-padding-y: .75rem !default;
$list-group-item-padding-y: 0.625rem !default;
$list-group-item-padding-x: 0.9375rem !default;
$list-group-hover-bg: $gray-100 !default;
......
......@@ -123,7 +123,7 @@
{if $SUBPAGENAV || $sectiontabs}
{assign $SUBPAGENAV item}
<div class="arrow-bar {$item.subnav.class}">
<span class="arrow d-none">
<span class="arrow d-none d-md-block">
<span class="text">
{if isset($PAGEHEADINGARROW)}
{$PAGEHEADINGARROW}
......
......@@ -43,16 +43,17 @@
{foreach from=$STYLESHEETLIST item=cssurl}
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<script src="{$WWWROOT}/lib/bootstrap/assets/javascripts/bootstrap.js?v={$CACHEVERSION}"></script>
<script src="{$WWWROOT}/js/javascript-templates/js/tmpl.min.js?v={$CACHEVERSION}"></script>
<script src="{$WWWROOT}/js/masonry/masonry.min.js?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/pieform.js'}?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/formtabs.js'}?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/filebrowser.js'}?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/access.js'}?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/notification.js'}?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/dock.js'}?v={$CACHEVERSION}"></script>
<script src="{theme_url filename='js/theme.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/lib/popper/popper.min.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/lib/bootstrap/assets/javascripts/bootstrap.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/js/javascript-templates/js/tmpl.min.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/masonry.min.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/pieform.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/formtabs.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/filebrowser.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/access.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/notification.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/dock.js'}?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/theme.js'}?v={$CACHEVERSION}"></script>
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico?v={$CACHEVERSION}" type="image/vnd.microsoft.icon">
<link rel="image_src" href="{$sitelogo}">
......
......@@ -17,7 +17,7 @@
{if $editurls}
<div class="card card-secondary">
<h2 class="card-heading">
<h2 class="card-header">
{str tag=secreturls section=view}
</h2>
<div class="secreturls list-group">
......
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