...
 
Commits (10)
......@@ -731,7 +731,7 @@
MANUAL: "Anleitung",
ABOUT: "Über",
IMPRINT: "Impressum",
PRIVACY: "Datenschutz",
PRIVACY: "DSGVO",
OPINION: "Deine Meinung ist gefragt",
WIDGET_IS_LOADING: 'Widget wird geladen...',
......
......@@ -65,9 +65,17 @@ Ext.define('ARSnova.view.CustomCarouselIndicator', {
var resizeTask = function () {
if (me.indicators.length && me.hasItems) {
var calcWidth = me.indicators.length * me.elementWidth;
/*
* The 1024 comes from a css @media rule,
* 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) {
me.setWidth(calcWidth < 830 ? 830 : calcWidth);
} else {
me.setWidth(calcWidth < me.screenWidth ? me.screenWidth : calcWidth);
}
me.screenWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width;
me.setWidth(calcWidth < me.screenWidth ? me.screenWidth : calcWidth);
}
};
......@@ -147,10 +155,15 @@ Ext.define('ARSnova.view.CustomCarouselIndicator', {
if (this.allowIndicatorMovement) {
if (element && activeItem && index !== currentActiveIndex && currentActiveIndex !== -1) {
/*
* The 1024 comes from a css @media rule,
* 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],
lastElementRightPos = lastElement.dom.getBoundingClientRect().right,
itemRect = activeItem.dom.getBoundingClientRect(),
maxRight = this.screenWidth,
maxRight = this.screenWidth > 1024 ? 830 : this.screenWidth,
leftPos = this.getLeft();
if (lastElementRightPos + Math.abs(leftPos) > maxRight) {
......
......@@ -168,12 +168,13 @@ Ext.define('ARSnova.view.diagnosis.DiagnosisPanel', {
}]
}, {
style: 'margin-top: 30px',
html: "<div class='gravure'>Made by <a href='http://www.thm.de/' class='thmlink' target='_blank'><span class='thm-lettering'>THM</span></a></div>",
html: "<div class='gravure'>Made by <a href='http://www.thm.de/' class='thmlink' target='_blank'><span class=''>THM</span> | Technische Hochschule Mittelhessen</a></div>",
cls: null
}, {
width: 125,
width: 250,
style: 'margin: 30px auto',
html: "<a href='http://www.gnu.org/licenses/gpl-3.0.de.html' target='_blank'><img src='resources/images/gpl-v3-logo.svg' width='120' height='60'></a>"
html: "<img src='resources/images/eu_flag.jpg' width='250' height='167'>"
//html: "<a href='http://www.gnu.org/licenses/gpl-3.0.de.html' target='_blank'><img src='resources/images/gpl-v3-logo.svg' width='120' height='60'></a>"
}]
});
......
......@@ -28,12 +28,15 @@ $default-lightblue-color: #00b5e2;
$default-darkblue-color: #012169;
$default-orange-color: #ff9600;
$eu-blue: #003399;
$eu-yellow: #ffcc00;
/** brand configuration **/
$brand-primary: $default-grey-color;
$brand-secondary: $default-green-color;
$brand-success: $default-green-color;
$brand-info: $default-green-color;
$brand-secondary: $eu-blue;
$brand-success: $eu-blue;
$brand-info: $eu-blue;
$brand-warning: $default-orange-color;
$brand-danger: $default-red-color;
$brand-text: $default-grey-color;
......@@ -43,9 +46,9 @@ $background-color: #dfe5e6;
/** logo configuration **/
$logo-icon-color: #3d9c19;
$logo-ars-color: #394a59;
$logo-nova-color: #3d9c19;
$logo-icon-color: $eu-blue;
$logo-ars-color: $eu-blue;
$logo-nova-color: $eu-blue;
/** login icon configuration **/
......@@ -66,11 +69,11 @@ $label-text-shadow: none;
/** splashscreen default colors **/
$splashscreen-background-color: $background-color;
$splashscreen-loading-dots-color: $brand-primary;
$splashscreen-slogan-text-color: $brand-text;
$loading-indicator-primary-color: $brand-primary;
$loading-indicator-secondary-color: $brand-secondary;
$splashscreen-background-color: $eu-blue;
$splashscreen-loading-dots-color: $eu-yellow;
$splashscreen-slogan-text-color: $eu-yellow;
$loading-indicator-primary-color: $eu-blue;
$loading-indicator-secondary-color: $eu-yellow;
/** default button configuration **/
......@@ -182,7 +185,7 @@ $tabbar-notification-badge-border-color: $default-white-color;
/** live feedback configuration **/
$feedback-ok-background-color: $brand-success; /* can follow */
$feedback-ok-background-color: $default-green-color; /* can follow */
$feedback-good-background-color: $brand-warning; /* faster, please! */
$feedback-bad-background-color: $brand-danger; /* too fast! */
$feedback-gone-background-color: $brand-primary; /* you have lost me */
......@@ -202,7 +205,7 @@ $vote-abcd-chart-bar-color: $brand-primary;
/** correct/incorrect/abstention bar color configuration **/
$statistics-correct-color: $brand-success;
$statistics-correct-color: $default-green-color;
$statistics-incorrect-color: $brand-danger;
$statistics-abstention-color: $default-grey-color;
......@@ -232,7 +235,7 @@ $mask-opacity: 0.3;
/** countdown timer configuration **/
$timer-minutes-color: $default-grey-color;
$timer-minutes-color: $eu-blue;
$timer-seconds-color: $default-orange-color;
$timer-warning-color: $brand-danger;
$timer-label-color: $label-font-color;
......@@ -252,8 +255,8 @@ $projectormode-text-color: black;
/** hyperlink color configuration **/
$hyperlink-unvisited-color: $default-orange-color !important;
$hyperlink-visited-color: $default-orange-color !important;
$hyperlink-hover-color: $default-green-color !important;
$hyperlink-active-color: $default-green-color !important;
$hyperlink-hover-color: $eu-blue !important;
$hyperlink-active-color: $eu-blue !important;
/** additional color configurations **/
......
......@@ -737,3 +737,52 @@ code {
max-width: $carousel-inner-max-width;
}
}
.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)
*/
@media only screen and (min-width: 1024px) {
#ext-viewport {
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;
}
}