Commit 48f88566 authored by Tom Käsler's avatar Tom Käsler Committed by Daniel Gerhardt

center carousel indicators

fix width/position for carousel indicators

fix comment width declaration in comments to 830px
parent 183649ad
Pipeline #22641 passed with stages
in 1 minute and 9 seconds
......@@ -67,7 +67,7 @@ Ext.define('ARSnova.view.CustomCarouselIndicator', {
var calcWidth = me.indicators.length * me.elementWidth;
/*
* The 1024 comes from a css @media rule,
* which sets the width to a fix 920px when having a screen with >= 1024px.
* which sets the width to a fix 830px when having a screen with >= 1024px.
* It can be found at the bottom of _general.scss
*/
if (window.innerWidth > 1024) {
......@@ -75,7 +75,6 @@ Ext.define('ARSnova.view.CustomCarouselIndicator', {
} else {
me.setWidth(calcWidth < me.screenWidth ? me.screenWidth : calcWidth);
}
me.screenWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width;
}
};
......@@ -158,7 +157,7 @@ Ext.define('ARSnova.view.CustomCarouselIndicator', {
if (element && activeItem && index !== currentActiveIndex && currentActiveIndex !== -1) {
/*
* The 1024 comes from a css @media rule,
* which sets the width to a fix 920px when having a screen with >= 1024px.
* which sets the width to a fix 830px when having a screen with >= 1024px.
* It can be found at the bottom of _general.scss
*/
var lastElement = indicators[indicators.length - 1],
......
......@@ -738,19 +738,51 @@ code {
}
}
.forwardListButton, .standardListButton {
border: 1px solid $button-border-color !important;
}
.x-form .x-field {
border: 1px solid $button-border-color !important;
&.x-field-text, &.x-field-textarea {
overflow: hidden;
}
&:first-child {
border-top-left-radius: 10px !important;
border-top-right-radius: 10px !important;
}
&:last-child {
border-bottom-left-radius: 10px !important;
border-bottom-right-radius: 10px !important;
}
}
.x-list {
border-bottom: 1px solid $button-border-color !important;
&.x-list-item:last-child {
border-bottom: 1px solid $button-border-color !important;
border-bottom-left-radius: 3px !important;
border-bottom-right-radius: 3px !important;
}
}
/*
* If either min-width or max-width are changed,
* it also needs to be changed for the carousel indicator (CustomCarouselIndicator.js)
*/
#ext-element-4 {
box-shadow: 0 0 8px 8px #aaa5a0;
}
@media only screen and (min-width: 1024px) {
#ext-viewport {
width: auto !important;
max-width: 830px !important;
margin-left: auto !important;
margin-right: auto !important;
width: auto !important;
max-width: 920px !important;
margin-left: auto !important;
margin-right: auto !important;
}
#ext-element-4 {
box-shadow: 0 0 8px 8px #aaa5a0;
}
}
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