Skip to content

GitLab

Commit 90108a8e authored by Liam's avatar Liam Committed by Rebecca Blundell
Browse files
Options

Bug 1765276: Fixing everthing after rebasing with master 

behatnotneeded

Change-Id: I53c15e1ae120c81e6bcf878397ff764ee4a15bc5
parent 9d9fd8ad
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 571 deletions
htdocs/theme/default/sass/layout/nav/_main-nav.scss
View file @ 90108a8e
......@@ -10,7 +10,7 @@
&:focus {
color: #FFFFFF;
}
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
border-color: $link-hover-color;
}
}
......
htdocs/theme/modern/sass/features/_collection-navigation.scss
View file @ 90108a8e
......@@ -3,7 +3,7 @@
font-size: 32px;
}
.collection-nav-btns {
@media (min-width: $screen-md-min) {
@include media-breakpoint-up(lg) {
bottom: 14px;
}
}
......
htdocs/theme/ocean/sass/features/_collection-navigation.scss
View file @ 90108a8e
......@@ -9,7 +9,7 @@
}
.collection-nav-btns {
@media (min-width: $screen-md-min) {
@include media-breakpoint-up(lg) {
bottom: 22px;
}
}
......
htdocs/theme/ocean/sass/features/_dashboard-widget.scss
View file @ 90108a8e
......@@ -2,7 +2,7 @@
// even out boxes fix
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
.dashboard-widget-container .thumbnail-widget {
width: 32%;
padding: 0;
......@@ -24,17 +24,17 @@
padding-bottom: 0;
background-color: transparent;
height: auto;
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
margin-top: 20px;
}
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
margin-top: 40px;
}
h2 {
font-weight: 500;
display: inline-block;
color: $gray-dark;
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
font-size: 36px;
}
}
......@@ -43,7 +43,7 @@
font-size: 16px;
color: $gray;
display: block;
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
font-size: 20px
}
}
......@@ -57,7 +57,7 @@
height: auto;
.icon {
color: $brand-primary;
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
font-size: 36px
}
}
......@@ -71,11 +71,11 @@
background-color: $brand-primary-faint;
text-align: center;
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
height: 223px;
border-radius: 50% !important;
}
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
height: 271px;
}
}
......@@ -88,7 +88,7 @@
p {
font-size: 16px;
color: $gray;
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
font-size: 20px
}
}
......@@ -100,7 +100,7 @@
background-color: transparent;
border: 0;
height: auto;
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
padding-left: 30px;
padding-right: 30px;
}
......
htdocs/theme/raw/plugintype/artefact/file/templates/form/filebrowser.tpl
View file @ 90108a8e
......@@ -167,7 +167,7 @@
{/if}
<div class="filelist-wrapper card card-block">
<h3 id="{$prefix}_foldernav" class="card-heading">
<h3 id="{$prefix}_foldernav" class="card-header">
{include file="artefact:file:form/folderpath.tpl" path=$path querybase=$querybase owner=$tabs.owner ownerid=$tabs.ownerid}
</h3>
......
htdocs/theme/raw/sass/_custom.scss
View file @ 90108a8e
......@@ -643,7 +643,7 @@ div.toolbarhtml {
margin-right: 20px;
}
div.fieldset-body {
background-color: $gray-lighter !important;
background-color: $gray-100 !important;
}
}
......
htdocs/theme/raw/sass/components/_indicator.scss
View file @ 90108a8e
......@@ -101,7 +101,7 @@ a[data-toggle="collapse"] {
width: 80%;
}
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
.columns3.col-width-15 .collapse-inline {
width: 70%;
}
......@@ -121,7 +121,7 @@ a[data-toggle="collapse"] {
width: 65%;
}
}
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
.columns1 .collapse-inline {
width: 85%;
}
......@@ -132,7 +132,7 @@ a[data-toggle="collapse"] {
}
}
}
@media (min-width: $screen-md-min) {
@include media-breakpoint-up(lg) {
.columns4.col-width-25,
.columns3.col-width-25 {
.collapse-inline {
......@@ -140,7 +140,7 @@ a[data-toggle="collapse"] {
}
}
}
@media (min-width: $screen-lg-min) {
@include media-breakpoint-up(xl) {
.columns3.col-width-25 {
width: 60%;
}
......
htdocs/theme/raw/sass/components/_toggles.scss
View file @ 90108a8e
......@@ -9,7 +9,7 @@
left: 90px;
display: block;
@include media-breakpoint-up(md) {
left: 0;
left: 45px;
}
}
}
......
htdocs/theme/raw/sass/features/_timeline.scss
View file @ 90108a8e
......@@ -197,7 +197,7 @@ ul.cd-timeline-navigation-second {
}
&.inactive::after {
color: $gray-lighter;
color: $gray-100;
}
}
......
htdocs/theme/raw/sass/layout/card/_card-block.scss
View file @ 90108a8e
......@@ -20,6 +20,7 @@
> .card-header, .card-heading-nested {
border-bottom: 2px solid $card-border-color;
padding: 10px 8px;
background: transparent;
// In page builder we can choose to not have a heading,
// but we still need a dragable object.
......
htdocs/theme/raw/sass/layout/card/_card-collapse.scss
View file @ 90108a8e
......@@ -106,6 +106,29 @@
@include clearfix;
}
}
&.collapsible-small {
legend {
width: auto;
border: none;
h4 {
a {
padding: 5px 5px 5px 0 !important;
border: 0;
background-color: $card-bg !important;
color: $link-color !important;
font-size: $font-size-base !important;
font-weight: 400 !important;
&:hover,
&:focus {
text-decoration: underline !important;
}
span {
margin: 5px 0 0 5px;
}
}
}
}
}
}
&.as-link {
......
htdocs/theme/raw/sass/layout/card/_card-colors.scss
View file @ 90108a8e
......@@ -18,10 +18,10 @@
}
.card-footer,
.card-body,
.card-heading a {
.card-header a {
border-color: darken($card-success-heading-bg, 15%);
}
.card-heading a,
.card-header a,
.card-body:not(.no-footer) {
border-bottom-width:0;
}
......@@ -56,10 +56,10 @@
}
.card-footer,
.card-body,
.card-heading a {
.card-header a {
border-color: darken($card-info-heading-bg, 15%);
}
.card-heading a,
.card-header a,
.card-body:not(.no-footer) {
border-bottom-width:0;
}
......@@ -84,10 +84,10 @@
}
.card-footer,
.card-body,
.card-heading a {
.card-header a {
border-color: darken($card-warning-heading-bg, 15%);
}
.card-heading a,
.card-header a,
.card-body:not(.no-footer) {
border-bottom-width:0;
}
......@@ -112,10 +112,10 @@
}
.card-footer,
.card-body,
.card-heading a {
.card-header a {
border-color: darken($card-danger-heading-bg, 15%);
}
.card-heading a,
.card-header a,
.card-body:not(.no-footer) {
border-bottom-width:0;
}
......
htdocs/theme/raw/sass/layout/card/_card-header.scss
View file @ 90108a8e
......@@ -104,6 +104,7 @@ h2.card-header {
}
}
}
}
h3.card-header {
font-size: 16px;
}
htdocs/theme/raw/sass/layout/card/_card-quarter.scss
View file @ 90108a8e
......@@ -124,6 +124,12 @@
}
.page-access {
float: left;
.dropdown-menu {
.view-details {
padding: 5px 10px;
background-color: $state-danger-bg;
}
}
}
.collection-list {
float: right;
......@@ -158,6 +164,11 @@
color: $state-warning-text;
border-color: $state-warning-border;
}
.card-danger {
background-color: $state-danger-bg;
color: $state-danger-text;
border-color: $state-danger-border;
}
}
.card-collection {
......
htdocs/theme/raw/sass/layout/panel/_panel-secondary.scss → htdocs/theme/raw/sass/layout/card/_card-secondary.scss
View file @ 90108a8e
// panel-secondary is the style used for the user-editable panels used across Mahara
// card-secondary is the style used for the user-editable cards used across Mahara
.panel-secondary {
&.panel {
.card-secondary {
&.card {
@include box-shadow(none);
}
.admin & {
border-color: $panel-default-border;
border-color: $card-secondary-border;
}
> .panel-heading {
> .card-heading {
font-family: $font-family-serif;
}
&.blockinstance.panel {
&.blockinstance.card {
background-color: transparent;
.panel-heading {
background-color: $panel-default-heading-bg;
.card-heading {
background-color: $card-secondary-heading-bg;
}
.blockinstance-content {
.editor-description {
color: $gray-light;
color: $gray-300;
font-style: italic;
font-size: $font-size-base - 1;
display: block;
......@@ -26,8 +26,8 @@
}
}
}
> .panel-heading, .panel-heading-nested {
border-bottom: 2px solid $panel-default-border;
> .card-heading, .card-heading-nested {
border-bottom: 2px solid $card-secondary-border;
padding-left: 8px;
padding-right: 8px;
......@@ -35,27 +35,27 @@
// but we still need a dragable object.
// Use a placeholder for visual help
// will appear with the no-heading class in view mode
&.panel-heading-placeholder {
border: 1px solid scale-color($gray-lighter, $lightness: -5.75%);
&.card-heading-placeholder {
border: 1px solid scale-color($gray-100, $lightness: -5.75%);
border-style: dashed;
background-color: $panel-default-heading-bg;
background-color: $card-secondary-heading-bg;
.blockinstance-header {
opacity:0.6;
}
}
}
&.panel-warning {
> .panel-heading, .panel-heading-nested {
border-left: 4px solid $panel-secondary-border;
background-color: $panel-warning-heading-bg;
border-bottom: 1px solid $panel-warning-border;
&.card-warning {
> .card-heading, .card-heading-nested {
border-left: 4px solid $card-secondary-border;
background-color: $card-warning-heading-bg;
border-bottom: 1px solid $card-warning-border;
}
}
& .panel-warning .panel-body {
background-color: $panel-warning-heading-bg;
& .card-warning .card-body {
background-color: $card-warning-heading-bg;
}
.panel-heading-plain {
border: 1px solid scale-color($gray-lighter, $lightness: -5.75%);
.card-heading-plain {
border: 1px solid scale-color($gray-100, $lightness: -5.75%);
}
.list-group .list-group-item {
border-left: 0;
......@@ -64,16 +64,16 @@
border-top:0;
}
}
> .panel-body,
> .block > .panel-body {
> .card-body,
> .block > .card-body {
padding: 15px 8px;
&.flush {
padding: 15px 0 0 0;
}
}
// If there is no heading we don't want padding on the panel-body
// If there is no heading we don't want padding on the card-body
> .no-heading {
> .panel-body {
> .card-body {
padding: 0;
}
.has-attachment {
......
htdocs/theme/raw/sass/layout/nav/_navbar.scss
View file @ 90108a8e
......@@ -29,7 +29,7 @@
padding: 15px;
margin-bottom: 0;
border: 0;
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
position: absolute;
display: block;
max-width: none;
......@@ -46,7 +46,7 @@
input[type=text] {
width: calc(100% - 43px);
float: left;
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
width: auto;
}
}
......@@ -57,7 +57,7 @@
border-bottom-left-radius: 0;
border-left: 1px solid $btn-secondary-border;
margin-left: -1px;
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(md) {
float: right;
}
}
......
htdocs/theme/raw/sass/layout/panel/_panel-collapse.scss deleted 100644 → 0
View file @ 9d9fd8ad
// This file handles/modifies both real collapsible panels,
// and collapsible pieform fieldsets (which are styled to look like panels)
.panel.collapsible {
margin-bottom: 0;
border-radius: 0;
.panel-heading a {
border-radius: 0;
}
&.form-group {
display:block;
}
.panel {
border-radius: 0;
}
}
.pieform-fieldset,
.panel {
&.collapsible {
@include box-shadow(none);
&.last {
legend,
.panel-heading {
@include border-bottom-radius($border-radius-small);
a {
&.collapsed {
@include border-bottom-radius($border-radius-small);
}
}
}
legend {
a {
border-bottom: 1px solid $panel-default-border;
}
}
.fieldset-body {
border-top:0;
@include border-bottom-radius($border-radius-small);
}
}
&.first .panel-heading a {
@include border-top-radius(3px);
}
.section-import & {
&:last-child {
@extend .last;
}
}
legend {
margin-bottom: 0;
border:0;
}
.type-icon {
display:inline-block;
width: 32px;
padding: 0 30px;
}
&.has-attachment .panel-heading,
.collapsible-group & .panel-heading,
legend h4,
legend h3 {
margin: 0;
font-size: 16px;
padding: 0;
.pieform > .collapsible-group:first-child & {
@include border-top-radius(3px);
}
}
.fieldset-body {
border: 1px solid $panel-default-border;
padding: 10px 15px;
background: $panel-bg;
margin-bottom: -1px; //remove double border
.jstabs & {
border: 0;
}
}
.collapsible-group & {
.form-group {
margin: 0;
position: relative;
padding: 20px 0;
border-bottom: 1px solid $list-group-border;
&.alert {
padding: 5px 10px;
}
&:last-child,
&.last {
border-bottom: 0;
}
}
&.with-formgroup {
margin-top: 15px;
}
}
.html {
&:not(.heading) {
@include clearfix;
}
}
&.collapsible-small {
legend {
width: auto;
border: none;
h4 {
a {
padding: 5px 5px 5px 0 !important;
border: 0;
background-color: $panel-bg !important;
color: $link-color !important;
font-size: $font-size-base !important;
font-weight: 400 !important;
&:hover,
&:focus {
text-decoration: underline !important;
}
span {
margin: 5px 0 0 5px;
}
}
}
}
}
}
&.as-link {
@include panel-as-link();
}
}
.link-expand-right.form-group {
position: static;
legend {
position:absolute;
top: 5px;
right: 20px;
width: auto;
@media (max-width: $screen-xs-min) {
position: static;
text-align: right;
}
}
}
// @todo: Rethink this, it's too complex
.panel.collapsible:not(.panel-secondary) {
border-width: 0;
// For attachment collapsible
&.has-attachment {
border-radius: $border-radius-small;