Commit b924a740 authored by RajabNatshah's avatar RajabNatshah
Browse files

Issue #3039513: Fix bootstrap variables not been overridden in Vartheme BS4...

Issue #3039513: Fix bootstrap variables not been overridden in Vartheme BS4 and VARTHEME_BS4_SUBTHEME
parent 0bb55e4d
......@@ -10,13 +10,13 @@ framework:
- VARTHEME_BS4_SUBTHEME/global-scripts
# VARTHEME_BS4_SUBTHEME framework RTL
# framework-rtl:
# css: {}
# js: {}
# dependencies:
# - core/jquery
# - VARTHEME_BS4_SUBTHEME/bootstrap-styles-rtl
# - VARTHEME_BS4_SUBTHEME/global-styles-rtl
framework-rtl:
css: {}
js: {}
dependencies:
- core/jquery
- VARTHEME_BS4_SUBTHEME/bootstrap-styles-rtl
- VARTHEME_BS4_SUBTHEME/global-styles-rtl
......@@ -147,17 +147,17 @@ global-styles:
- core/jquery
# VARTHEME_BS4_SUBTHEME global (RTL) styles library.
#global-styles-rtl:
# css:
# base:
# css/rtl/base/vartheme_bs4-rtl.base.css: {}
# css/rtl/base/VARTHEME_BS4_SUBTHEME.base.css: {}
# theme:
# css/rtl/theme/header-rtl.theme.css: {}
# css/rtl/theme/content-rtl.theme.css: {}
# css/rtl/theme/footer-rtl.theme.css: {}
# dependencies:
# - core/jquery
global-styles-rtl:
css:
base:
css/rtl/base/vartheme_bs4-rtl.base.css: {}
css/rtl/base/VARTHEME_BS4_SUBTHEME-rtl.base.css: {}
theme:
css/rtl/theme/header-rtl.theme.css: {}
css/rtl/theme/content-rtl.theme.css: {}
css/rtl/theme/footer-rtl.theme.css: {}
dependencies:
- core/jquery
# VARTHEME_BS4_SUBTHEME global scripts library.
global-scripts:
......
......@@ -262,6 +262,9 @@ legend {
line-height: inherit;
color: inherit;
white-space: normal; }
@media (max-width: 1200px) {
legend {
font-size: calc(1.275rem + 0.3vw) ; } }
progress {
vertical-align: baseline; }
......@@ -302,15 +305,27 @@ h1, h2, h3, h4, h5, h6,
h1, .h1 {
font-size: 2.5rem; }
@media (max-width: 1200px) {
h1, .h1 {
font-size: calc(1.375rem + 1.5vw) ; } }
h2, .h2 {
font-size: 2rem; }
@media (max-width: 1200px) {
h2, .h2 {
font-size: calc(1.325rem + 0.9vw) ; } }
h3, .h3 {
font-size: 1.75rem; }
@media (max-width: 1200px) {
h3, .h3 {
font-size: calc(1.3rem + 0.6vw) ; } }
h4, .h4 {
font-size: 1.5rem; }
@media (max-width: 1200px) {
h4, .h4 {
font-size: calc(1.275rem + 0.3vw) ; } }
h5, .h5 {
font-size: 1.25rem; }
......@@ -326,21 +341,33 @@ h6, .h6 {
font-size: 6rem;
font-weight: 300;
line-height: 1.2; }
@media (max-width: 1200px) {
.display-1 {
font-size: calc(1.725rem + 5.7vw) ; } }
.display-2 {
font-size: 5.5rem;
font-weight: 300;
line-height: 1.2; }
@media (max-width: 1200px) {
.display-2 {
font-size: calc(1.675rem + 5.1vw) ; } }
.display-3 {
font-size: 4.5rem;
font-weight: 300;
line-height: 1.2; }
@media (max-width: 1200px) {
.display-3 {
font-size: calc(1.575rem + 3.9vw) ; } }
.display-4 {
font-size: 3.5rem;
font-weight: 300;
line-height: 1.2; }
@media (max-width: 1200px) {
.display-4 {
font-size: calc(1.475rem + 2.7vw) ; } }
hr {
margin-top: 1rem;
......@@ -4915,6 +4942,9 @@ input[type="button"].btn-block {
color: #000;
text-shadow: 0 1px 0 #fff;
opacity: .5; }
@media (max-width: 1200px) {
.close {
font-size: calc(1.275rem + 0.3vw) ; } }
.close:hover {
color: #000;
text-decoration: none; }
......@@ -6038,18 +6068,6 @@ button.bg-dark:focus {
.embed-responsive-1by1::before {
padding-top: 100%; }
.embed-responsive-21by9::before {
padding-top: 42.85714%; }
.embed-responsive-16by9::before {
padding-top: 56.25%; }
.embed-responsive-4by3::before {
padding-top: 75%; }
.embed-responsive-1by1::before {
padding-top: 100%; }
.flex-row {
-webkit-box-orient: horizontal !important;
-webkit-box-direction: normal !important;
......
......@@ -4,7 +4,6 @@
// Bootstrap 4 aliases for Bootstrap 3
// -----------------------------------------------------------------------------
@import "../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// VARTHEME_BS4_SUBTHEME base, which Bootstrap overrides.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Bootstrap base from bootstrap library
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Varbase BS4 base from bootstrap library
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Styles for Bootstrap Barrio affix effect.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// AJAX (throbber) styling.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Visual styles for comments in Barrio.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// jQuery UI autocomplete widget style overrides.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Styling for the Book module.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Bootstrap Barrio specific styling for the Book module.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Styles for Bootstrap Barrio's breadcrumbs.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
......@@ -3,7 +3,6 @@
// Have the Bootstrap styling for callouts component.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Visual styles for comments in Bartik.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Contextual links styles for Bootstrap Barrio.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
......@@ -3,7 +3,6 @@
// @see http://nicolasgallagher.com/css-background-image-hacks/
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Visual styles for Bartik's dropbutton component.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Feed icon styles for Bootstrap Barrio.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
// Visual styles for Bootstrap Barrio's field components.
// -----------------------------------------------------------------------------
@import "../../node_modules/bootstrap/scss/functions"; // Bootstrap functions.
@import "../../node_modules/bootstrap/scss/variables"; // Bootstrap variables.
@import "../../node_modules/bootstrap/scss/mixins"; // Bootstrap mixins.
@import "../variables"; // VARTHEME_BS4_SUBTHEME variables.
@import "../mixins"; // VARTHEME_BS4_SUBTHEME mixins.
......
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