From 564531bbd31cd684796121d1a031b39980e45e6e Mon Sep 17 00:00:00 2001
From: quark <zeisse@uni-potsdam.de>
Date: Sun, 1 Jul 2018 11:51:07 +0200
Subject: [PATCH] Merge branch 'researchreport' of
C:\Users\quark\IdeaProjects\fltrail with conflicts.
---
.../main/webapp/assets/css/researchReport.css | 117 +++++++++---------
1 file changed, 59 insertions(+), 58 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
index 4c468fbc..080ec3a4 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -1,70 +1,71 @@
-html, body
- width: 100%
- height: 100%
- margin: 0
- padding: 0
- font-size: 10px
- font-family: 'Roboto', sans-serif
- background-color: gray
+html, body {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-size: 10px;
+ font-family: 'Roboto', sans-serif;
+ background-color: gray;
+}
+.researchReportForm {
+ width: 100%;
+ display: grid;
+ grid-template-rows: 5rem 90vh 5rem;
+ grid-template-columns: 15% 75% 10%;
+ grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar buttons .";
+}
-.researchReportForm
- width: 100%
- display: grid
- grid-template-rows: 5rem 90vh 5rem
- grid-template-columns: 15% 75% 10%
- grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar buttons ."
-
-
-.researchReportMenu
- background: black
- color: white
- grid-area: sidebar
- nav
- font-size: 1.5rem
+.researchReportMenu {
+ background: black;
+ color: white;
+ grid-area: sidebar nav;
+ font-size: 1.5rem
menu
menuitem
- a
- color: White
- text-decoration: none
- margin: 0 0 0 1rem
-
-
-.researchReportTitlebar
- background: #003f60
- color: White
- grid-area: header
- display: flex
- justify-content: center
- align-items: center
-
+ a
+ color: White;
+ text-decoration: none;
+ margin: 0 0 0 1rem;
+}
-.researchReportEditor
- grid-area: editor
- background: gray
- color: black
- display: flex
- justify-content: Left
- align-items: Center
- .editor-inhalt
- margin: 6rem
- padding: 6rem
- font-size: 2rem
- color: #fff
- text-align: Left
- width: 10%
+.researchReportTitleba {
+ background: #003f60;
+ color: White;
+ grid-area: header;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.researchReportEditor {
+ grid-area: editor;
+ background: gray;
+ color: black;
+ display: flex;
+ justify-content: Left;
+ align-items: Center;
+ .editor-inhalt {
+ margin: 6rem;
+ padding: 6rem;
+ font-size: 2rem;
+ color: #fff;
+ text-align: Left;
+ width: 10%;
+ }
+}
-.researchReportButtons
- background-color: #4CAF50
- border: 1.8px solid black
- color: black
- padding: 15px 25px
- text-align: center
- font-size: 16px
- cursor: pointer
+.researchReportButtons {
+ background-color: #4CAF50;
+ border: 1.8px solid black;
+ color: black;
+ padding: 15px 25px;
+ text-align: center;
+ font-size: 16px;
+ cursor: pointer;
+}
--
GitLab