From ce53a91e3755c54e1407b59430d7e27e9f95c4c7 Mon Sep 17 00:00:00 2001
From: Aitur <artur.kunz@ruhr-uni-bochum.de>
Date: Tue, 5 May 2020 17:42:01 +0200
Subject: [PATCH] Import Bootstrap, fixed wrong sized Header (bootstrap caused
it), changed button in main menu
---
static/css/base.css | 3 ++-
views/default/login.html | 2 +-
views/layout.html | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/static/css/base.css b/static/css/base.css
index 80f811a..f0f8c14 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -12,6 +12,7 @@ html {
body {
padding-top: 75px;
+ background-color: #E3E6EB;
}
body, html {
@@ -39,7 +40,7 @@ body, html {
width: 100%;
min-width: inherit;
height: 35px;
-
+ box-sizing: content-box;
padding: 5px;
padding-top: 10px;
}
diff --git a/views/default/login.html b/views/default/login.html
index 35a632d..62cb37c 100644
--- a/views/default/login.html
+++ b/views/default/login.html
@@ -3,7 +3,7 @@
<form id="form_login">
<input type="text" id="room_code" placeholder="{{=T('Enter Room Code')}}" maxlength="4"><br><br>
<input type="text" id="user_name" placeholder="{{=T('Enter your Name')}}" maxlength="15"><br><br>
- <input type="submit" value="{{=T('Play')}}">
+ <input class="btn btn-outline-primary" type="submit" value="{{=T('Play')}}">
</form>
<script type="text/javascript">
diff --git a/views/layout.html b/views/layout.html
index 85a94c1..128aadb 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -2,8 +2,10 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="{{=URL('static','css/bootstrap.min.css')}}"/>
<link rel="stylesheet" type="text/css" href="{{=URL('static/css', 'base.css')}}">
<script src="{{=URL('static','js/jquery.js')}}" type="text/javascript"></script>
+ <script src="{{=URL('static','js/bootstrap.bundle.min.js')}}"></script>
<script src="{{=URL('static','js/ajax.js')}}" type="text/javascript"></script>
<script type="text/javascript">
function HEADER_SET(_left, _middle, _right) {
--
GitLab