From 17ed7ee567051f7a71da0ff292ac5de637f8a206 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Sat, 30 May 2020 22:15:57 +0200
Subject: Improves code and animations for attacks.

---
 src/css/src/battle.scss                           | 1 +
 src/css/src/battle/constants.scss                 | 6 ++++--
 src/css/src/battle/controlled-panel.scss          | 4 +++-
 src/css/src/shared/battle-view/constants.scss     | 2 ++
 src/css/src/shared/battle-view/info-card.scss     | 2 +-
 src/css/src/shared/battle-view/message-board.scss | 2 +-
 src/css/src/shared/parameters.scss                | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/css')

diff --git a/src/css/src/battle.scss b/src/css/src/battle.scss
index 1977011..c730d8d 100644
--- a/src/css/src/battle.scss
+++ b/src/css/src/battle.scss
@@ -1,3 +1,4 @@
+@import 'battle/constants';
 @import 'shared/battle-view';
 @import 'shared/battle-characters';
 @import 'shared/battle-map';
diff --git a/src/css/src/battle/constants.scss b/src/css/src/battle/constants.scss
index 4abe652..7550a7f 100644
--- a/src/css/src/battle/constants.scss
+++ b/src/css/src/battle/constants.scss
@@ -1,7 +1,9 @@
-@import '../shared/battle-view/constants';
-
 $CONTROLLED-MENU-WIDTH: 18em;
 $SUB-MENU-WIDTH: 18em;
 
+$LEFT-MENU-WIDTH: $CONTROLLED-MENU-WIDTH;
+
+@import '../shared/battle-view/constants';
+
 $NEXT-TO-CONTROLLED-MENU: $CONTROLLED-MENU-WIDTH + $MENU-EXTRA;
 $NEXT-TO-SUB-MENU: $SUB-MENU-WIDTH + $MENU-EXTRA;
diff --git a/src/css/src/battle/controlled-panel.scss b/src/css/src/battle/controlled-panel.scss
index 6001d39..589b15f 100644
--- a/src/css/src/battle/controlled-panel.scss
+++ b/src/css/src/battle/controlled-panel.scss
@@ -9,13 +9,15 @@
 
    left: 0;
    top: $BELOW-MAIN-MENU;
-   bottom: $ABOVE-MESSAGE-BOARD;
+   bottom: 0;
 
    width: $CONTROLLED-MENU-WIDTH;
 
    border-top-left-radius: 0;
    border-bottom-left-radius: 0;
+   border-bottom-right-radius: 0;
    border-left: none;
+   border-bottom: none;
 
    display: flex;
    flex-flow: column;
diff --git a/src/css/src/shared/battle-view/constants.scss b/src/css/src/shared/battle-view/constants.scss
index 63d4bbf..f1398bd 100644
--- a/src/css/src/shared/battle-view/constants.scss
+++ b/src/css/src/shared/battle-view/constants.scss
@@ -3,6 +3,8 @@ $MENU-PADDING: 0.5em;
 $MENU-BORDER: 0.2em;
 $MENU-EXTRA: $MENU-MARGIN;// + $MENU-PADDING + $MENU-BORDER;
 
+$LEFT-MENU-WIDTH: 0em !default;
+
 $MAIN-MENU-HEIGHT: 3em;
 $MESSAGE-BOARD-HEIGHT: 10em;
 
diff --git a/src/css/src/shared/battle-view/info-card.scss b/src/css/src/shared/battle-view/info-card.scss
index d7839cd..6d1c608 100644
--- a/src/css/src/shared/battle-view/info-card.scss
+++ b/src/css/src/shared/battle-view/info-card.scss
@@ -76,7 +76,7 @@
 
    border-radius: 5px;
    z-index: 0;
-   transition: width 3s ease-in-out;
+   transition: width 2s ease-in-out;
 }
 
 .character-card-health,
diff --git a/src/css/src/shared/battle-view/message-board.scss b/src/css/src/shared/battle-view/message-board.scss
index 0fc9fa7..06b4edc 100644
--- a/src/css/src/shared/battle-view/message-board.scss
+++ b/src/css/src/shared/battle-view/message-board.scss
@@ -5,7 +5,7 @@
 {
    position: absolute;
    bottom: 0;
-   left: 0;
+   left: $LEFT-MENU-WIDTH;
    right: 0;
 
    height: $MESSAGE-BOARD-HEIGHT;
diff --git a/src/css/src/shared/parameters.scss b/src/css/src/shared/parameters.scss
index 10f8a5b..184e8a6 100644
--- a/src/css/src/shared/parameters.scss
+++ b/src/css/src/shared/parameters.scss
@@ -1,2 +1,2 @@
-$MIN-PAGE-WIDTH: 1024px;
+$MIN-PAGE-WIDTH: 1366px;
 $MIN-PAGE-HEIGHT: 768px;
-- 
cgit v1.2.3-70-g09d2