Commit cb35e7d2 authored by Liam's avatar Liam Committed by Rebecca Blundell

Bug 1765276: Minor fixes to match master as much as possible

behatnotneeded

Change-Id: I0ab5f8f581074428c8acc8b930d539d54926c09f
parent 7c6f7a2c
......@@ -367,8 +367,8 @@
}
}
.card-block > .card-heading {
font-size: 1.125rem;
.card-secondary > .card-header {
font-size: $font-size-base * 1.14285;
}
.table thead {
......
......@@ -4,11 +4,18 @@
color: $btn-secondary-color;
background-color: $btn-secondary-bg;
border-color: $btn-secondary-border;
box-shadow: none;
&:hover {
background-color: darken($btn-secondary-bg, 10%);
}
}
.btn-primary {
border-color: $btn-primary-border;
box-shadow: none;
}
.btn-primary:not(:disabled):not(.disabled).active, .btn-primary:not(:disabled):not(.disabled):active, .show>.btn-primary.dropdown-toggle {
color: inherit;
background-color: $btn-dark-bg;
......@@ -453,3 +460,7 @@ td.action-list-copy {
}
}
}
.btn-sm {
padding: 0.14375rem 0.625rem;
}
......@@ -13,3 +13,11 @@ a.label.label-default,
background-color:$theme-primary-color;
}
}
.badge {
margin-right: 5px;
padding: 0.2em 0.6em 0.3em;
&.badge-warning {
@extend .text-white;
}
}
......@@ -238,6 +238,7 @@ h4.list-group-item-heading {
.list-group-item-text {
margin-top: 5px;
background-color: $white;
line-height: $list-group-line-height;
}
// Modifiy for list-groups in cards
......@@ -271,7 +272,8 @@ h4.list-group-item-heading {
}
}
.card-heading + .block > .list-group .list-group-item:first-child {
.card-header + .block > .list-group .list-group-item:first-child,
.list-group + .card-footer {
border-top-width: 0;
}
......
......@@ -7,7 +7,7 @@ $logged-in-height-mobile: 100px;
margin-top: $grid-gutter-width;
.remove-widgets {
font-size: $font-size-sm - 2;
font-size: $font-size-sm * 0.8335;
}
.hide-info{
clear: both;
......@@ -89,7 +89,7 @@ $logged-in-height-mobile: 100px;
height: $logged-in-height;
overflow:hidden;
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
height: auto;
}
......@@ -132,7 +132,7 @@ $logged-in-height-mobile: 100px;
margin-top: -$logged-in-height-mobile * 2;
height: $logged-in-height-mobile;
}
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
border-radius: 0 0 $border-radius $border-radius;
margin-top: 0;
border: 1px solid $gray-100;
......@@ -143,7 +143,7 @@ $logged-in-height-mobile: 100px;
p {
color: #fff;
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
color:$theme-text-color;
}
}
......@@ -163,7 +163,7 @@ $logged-in-height-mobile: 100px;
@include media-breakpoint-between(md, lg) {
margin-top: -$logged-in-height-mobile;
}
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
margin-top: 0;
p {
color: $link-color;
......
......@@ -136,6 +136,10 @@
}
}
.dropdown-item {
padding: 0;
}
.card-footer {
.dropdown-menu {
.dropdown-item {
......
......@@ -530,7 +530,7 @@
.description:not(.html) {
color: $gray-300;
font-style: italic;
font-size: $font-size-base - 1;
font-size: $font-size-base * 0.9285;
max-width: 90%;
display: block;
padding-top: 10px;
......@@ -545,7 +545,7 @@
color: scale-color($brand-danger, $lightness: -8.5%);
border: 0;
font-style: italic;
font-size: $font-size-base - 1;
font-size: $font-size-base * 0.9285;
padding-bottom: 0;
}
&.has-oneof {
......
......@@ -109,10 +109,6 @@ label,
.textarea label {
vertical-align: top;
}
.radio label,
.checkbox label {
margin: 2px 10px 0 15px;
}
// BS3 code - begin
.radio,
......@@ -120,7 +116,7 @@ label,
position: relative;
display: block;
margin-top: 10px;
// margin-bottom: 10px;
margin-bottom: 10px;
label {
min-height: $line-height-computed; // Ensure the input doesn't jump when there is no text
......
......@@ -8,7 +8,7 @@
border-radius: 0;
padding: 5px 15px;
}
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
display: none;
}
......@@ -26,7 +26,7 @@
.header.message-count-#{$i} {
top: 33px * $i;
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
top: 0;
}
......
......@@ -61,7 +61,7 @@ $columns: 8; //up to 8
@include media-breakpoint-up(md) {
margin-left: 2%;
}
@include media-breakpoint-down(md) {
@include media-breakpoint-down(sm) {
max-width: 100%;
width: 100% !important; // override inline style
}
......
......@@ -29,11 +29,6 @@ body {
@include media-breakpoint-up(md) {
padding-top: 30px;
}
.card {
.list-group-item {
border: none
}
}
}
// Expose a section of the page
......
......@@ -11,6 +11,8 @@
> .card-header {
font-family: $font-family-serif;
border-bottom: 2px solid $card-border-color;
font-size: $font-size-base * 1.285;
margin-top: 0;
}
&.blockinstance.card {
background-color: transparent;
......
......@@ -21,7 +21,7 @@
&.collapsible {
@include box-shadow(none);
&.last {
.card-heading {
.card-header {
@include border-bottom-radius($border-radius-sm);
a {
&.collapsed {
......@@ -29,7 +29,7 @@
}
}
}
a {
legend h4 {
border-bottom: 1px solid $card-border-color;
}
......@@ -38,7 +38,7 @@
@include border-bottom-radius($border-radius-sm);
}
}
&.first .card-heading a {
&.first .card-header a {
@include border-top-radius(3px);
}
......@@ -57,8 +57,8 @@
padding: 0 30px;
}
&.has-attachment .card-heading,
.collapsible-group & .card-heading,
&.has-attachment .card-header,
.collapsible-group & .card-header,
h4,
h3 {
margin: 0;
......
......@@ -25,6 +25,7 @@ a.card-footer {
}
.card-footer {
background-color: $card-footer-bg;
p {
margin:0;
}
......
.card-form {
background-color: lighten($card-bg, 1%);
border-bottom: 1px solid $card-border-color;
background-color: darken($card-bg, 1%);
border-bottom: 1px solid $card-border;
padding: 15px 15px 0 15px;
margin-bottom:20px;
margin-bottom: 20px;
}
......@@ -2,6 +2,7 @@
.collapsible legend h4,
.collapsible legend h3,
.card-header {
background-color: $card-heading-bg;
position: relative;
display: block;
font-family: $font-family-sans-serif;
......@@ -76,8 +77,11 @@
}
}
h2.card-header {
font-size: $font-size-base * 1.14285;
h2,
h3 {
.card-header {
font-size: $font-size-base * 1.14285;
}
}
.card {
......@@ -105,6 +109,3 @@ h2.card-header {
}
}
}
h3.card-header {
font-size: 16px;
}
......@@ -2,13 +2,14 @@
.card-secondary {
&.card {
@include box-shadow(none);
// @include box-shadow(none);
}
.admin & {
border-color: $card-secondary-border;
}
> .card-heading {
font-family: $font-family-serif;
> .card-header {
font-family: $font-family-sans-serif;
margin-top: 0;
}
&.blockinstance.card {
background-color: transparent;
......
.card {
margin-bottom: $line-height-computed;
border: 1px solid $card-border;
border-radius: $card-border-radius;
@include box-shadow(rgba(0, 0, 0, 0.05) 0 1px 1px);
form {
margin:0;
}
......@@ -16,7 +18,7 @@
.list-group-item small {
@extend .text-midtone;
font-size: $font-size-base - 2;
font-size: $font-size-base * 0.85715;
}
dl {
......@@ -39,4 +41,9 @@
.nav-pills {
margin: 0;
}
> .list-group:last-child {
.list-group-item:last-child {
border-bottom: 0;
}
}
}
......@@ -46,6 +46,12 @@
box-shadow: 0 6px 10px rgba(0, 0, 0, 0.1);
}
@include media-breakpoint-down(sm) {
margin-left: 0;
margin-right: 0;
border-width: 1px 0 0 0;
}
&.collapsing {
overflow-y: hidden;
}
......@@ -95,6 +101,11 @@
width: 1em;
}
}
> .active > a {
background-color: $dropdown-link-active-bg;
color: $dropdown-link-active-color;
}
}
// Child navigation items use colour variables from "navbar-inverse"
......
......@@ -28,6 +28,9 @@
}
}
}
> li {
margin-bottom: -$nav-tabs-border-width;
}
}
// hide unwanted elements
......
......@@ -26,9 +26,10 @@
// Header search form
.navbar-form.navbar-collapse {
padding: 15px;
padding: 15px 0;
margin-bottom: 0;
border: 0;
height: 65px;
@include media-breakpoint-up(md) {
position: absolute;
display: block;
......
......@@ -39,3 +39,7 @@
.text-block.text-block { // specificity
display: block;
}
.text-danger {
color: $state-danger-text !important; // Needs to be important to override default
}
......@@ -29,7 +29,7 @@ h1 {
}
.page-header {
padding-bottom: $line-height-computed / 2;
padding-bottom: $line-height-computed * 0.4525;
margin-bottom: 20px;
border-bottom: 1px solid $gray-200;
~ .with-heading {
......@@ -167,7 +167,7 @@ a {
padding: 5px 20px;
}
}
font-size: $font-size-base - 1;
font-size: $font-size-base * 0.9285;
float: left;
margin: 10px 0;
padding: 5px 7px;
......@@ -294,6 +294,10 @@ pre {
}
}
.h2, .h3, h2, h3 {
margin-top: 21px;
}
/* headings in html entered by user neutralised */
.myblogs,
.content-text,
......
......@@ -102,6 +102,8 @@ $link-hover-color: scale-color(theme-color("primary"),
//** Link hover decoration.
$link-hover-decoration: underline;
$paragraph-margin-bottom: 0.65625rem;
// Grid containers
//
// Define the maximum width of `.container` for different screen sizes.
......@@ -111,8 +113,11 @@ $container-max-widths: (
xl: 1170px
);
// Options
$enable-shadows: true;
// Components
$border-radius: .1875rem;
$border-radius: 0.125rem;
$border-radius-lg: .25rem;
// Fonts
......@@ -124,15 +129,16 @@ $font-family-base: $font-family-sans-serif;
// stylelint-enable value-keyword-case
$font-size-base: 0.875rem; // ~14px
$font-size-sm: $font-size-base * 0.85;
$font-size-sm: $font-size-base * 0.85715; // ~12px
$h1-font-size: $font-size-base * 2.15;
$h2-font-size: $font-size-base * 1.7;
$h3-font-size: $font-size-base * 1.285;
$h4-font-size: $font-size-base * 1.25;
$h5-font-size: $font-size-base;
$h6-font-size: $font-size-base * 0.85;
$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
$h5-font-size: $font-size-base; // ~14px
$h6-font-size: $font-size-base * 0.85; // ~12px
$headings-margin-bottom: 0.65625rem;
$headings-font-family: $font-family-serif;
$headings-font-weight: 300;
$headings-line-height: 1.3;
......@@ -148,11 +154,22 @@ $table-border-color: #ddd;
$dropdown-link-color: $gray-900;
$dropdown-link-hover-color: scale-color($gray-900, $lightness: -25%);
$dropdown-link-hover-bg: #f5f5f5;
$dropdown-link-active-color: $gray-700;
$dropdown-link-active-bg: $gray-100;
// Buttons and Forms
$input-disabled-bg: $gray-100;
$input-color: $gray-500;
$input-border-color: $gray-200;
$input-focus-border-color: #666;
$input-btn-focus-color: rgba(#666, .6);
$input-btn-focus-box-shadow: 0 0 8px $input-btn-focus-color;
$input-focus-box-shadow: $input-btn-focus-box-shadow;
$input-border-radius: $border-radius;
$btn-border-radius: $border-radius;
// Navs
$nav-tabs-border-color: $gray-100;
......@@ -165,6 +182,7 @@ $navbar-padding-x: 0;
// Cards
$card-spacer-y: 0.625rem;
$card-spacer-x: 0.9375rem;
$card-border-radius: $border-radius;
// Popovers
$popover-bg: #fff;
......@@ -178,6 +196,8 @@ $popover-arrow-outer-color: fade_in($popover-border-color, 0.05)
$modal-md: 600px;
// Progress bars
$progress-height: 1.3125rem;
$progress-bg: #f5f5f5;
$progress-bar-color: #fff;
$progress-border-radius: $border-radius;
......@@ -195,6 +215,9 @@ $list-group-active-border: $list-group-active-bg;
$list-group-disabled-color: $gray-300;
$list-group-disabled-bg: $gray-100;
$list-group-border-color: #ddd;
// Image thumbnails
$thumbnail-bg: #efefef;
$thumbnail-border-color: #ddd;
......@@ -103,6 +103,7 @@ $btn-link-disabled-color: $gray-300;
$card-text: $gray-700;
$card-border: #ddd;
$card-heading-bg: #f9f9f9;
$card-footer-bg: #f5f5f5;
$card-block-text: $gray-700;
$card-block-border: theme-color("primary");
......@@ -148,6 +149,8 @@ $list-group-border: #ddd;
$list-group-item-padding-y: 0.625rem;
$list-group-item-padding-x: 0.9375rem;
$list-group-line-height: 1.3;
// Artefacts
$artefact-bg: $gray-100;
......
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