Commit f8d9ec0a authored by Evonne's avatar Evonne Committed by Lisa Seeto

Bug 1827811: UI Task theming

Fixing alignments and hover/active states for assessment buttons.

behatnotneeded

Change-Id: I8774ecc53d5d3744f1e4e0b6debf2e6476e71ce8
parent fb47b831
......@@ -123,6 +123,7 @@
}
.file-icon {
width: 20px;
vertical-align: top;
}
a {
word-break: break-all;
......
......@@ -5,9 +5,18 @@
text-align: right;
text-decoration: none;
background-color: $theme-block-header-bg-color;
padding: 8px 10px;
padding: 7px 10px;
border: 0;
&:hover,
&:focus {
background-color: $theme-block-header-hover-bg-color;
color: $theme-block-header-hover-color;
}
&.active-block {
background-color: $theme-primary-color;
background-color: $theme-block-header-active-bg-color;
color: $theme-block-header-active-color;
}
}
}
......@@ -20,23 +29,32 @@
height: 0;
.btn-secondary {
background-color: $theme-block-header-bg-color;
display: inline-block;
padding: 7px 10px;
border: 0;
background-color: $theme-block-header-bg-color;
color: $theme-block-header-color;
display: inline-block;
padding: 8px 10px;
&:hover,
&:focus {
background-color: $theme-block-header-hover-bg-color;
color: $theme-block-header-hover-color;
border: 0;
}
&.active-block {
background-color: $theme-primary-color;
background-color: $theme-block-header-active-bg-color;
color: $theme-block-header-active-color;
}
}
}
~ .list-group-item .post-heading .title {
~ .list-group-item h4.title {
margin-right: 100px;
}
&.d-none {
~ .list-group-item .post-heading .title {
~ .list-group-item h4.title {
margin-right: 0;
}
}
......@@ -46,3 +64,69 @@
.bh-margin-left {
margin-left: 10px;
}
.card.card-secondary .card-body {
.block-header {
margin-top: -15px;
}
// exception of pdf block
// exception of attachments lists in resume
.has-attachment .list-unstyled {
.block-header {
margin-top: 0;
~ .list-group-item {
.title {
margin-right: 100px;
display: inline-block;
max-width: 80%;
}
img.file-icon {
vertical-align: top;
}
}
&.d-none {
~ .list-group-item .title {
margin-right: 0;
}
}
}
}
}
// exception of pdf block
.card.card-secondary {
&.bt-pdf {
.block-header {
margin-top: 0;
}
}
}
.block-header {
&.btn-group-top {
.btn-secondary {
background-color: $theme-block-header-bg-color;
color: $theme-block-header-color;
border: 0;
padding: 7px 10px;
&:hover,
&:focus {
background-color: $theme-block-header-hover-bg-color;
color: $theme-block-header-hover-color;
border: 0;
}
&:not(:disabled):not(.disabled):active,
&.active-block {
background-color: $theme-block-header-active-bg-color;
color: $theme-block-header-active-color;
}
}
}
}
......@@ -155,17 +155,6 @@
// @todo: Rethink this, it's too complex
.card.collapsible:not(.card-secondary) {
border-width: 0;
// For attachment collapsible
&.has-attachment {
border-radius: $border-radius-sm;
border-width: 0 0 1px 0;
.card-header a {
border-width: 0;
&:not(.collapsed) {
border-bottom-width: 1px;
}
}
}
// Remove border from heading - add to link tag.
// In this case we have a nested a tag that takes up the whole of the heading space
......@@ -209,6 +198,12 @@
&.last .card-header a.collapsed {
border-bottom-width: 1px;
}
// For attachment collapsible
&.has-attachment {
border-radius: $border-radius-sm;
border-width: 1px;
}
}
.collapse > .collapse {
......
......@@ -87,4 +87,20 @@
border-color: $card-border-color;
}
}
// pdf blocks need padding taken away
&.bt-pdf .block > .card-body {
padding: 0;
}
&.bt-resumefield {
.resume-content {
border: 1px solid $card-border-color;
padding: 10px 15px;
.list-group-item-heading {
font-size: .75001rem;
}
}
}
}
......@@ -147,3 +147,7 @@ $navbar-messages-count-bg: #fc9f1a !default;
// Block headers for comments and details links
$theme-block-header-bg-color: #333333 !default;
$theme-block-header-color: $white !default;
$theme-block-header-hover-bg-color: scale-color($theme-block-header-bg-color, $lightness: -30%) !default;
$theme-block-header-hover-color: $white !default;
$theme-block-header-active-bg-color: $theme-primary-color !default;
$theme-block-header-active-color: $white !default;
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