From 1c7adcca9974c3b292e7491ed3fc5552571cd194 Mon Sep 17 00:00:00 2001
From: tudtianus <tudtianus@gmail.com>
Date: Sat, 16 Jun 2018 20:54:51 +0200
Subject: [PATCH] fix: updated css grid
---
.../main/webapp/assets/css/create-journal.css | 42 +++++------
.../src/main/webapp/assets/css/eportfolio.css | 74 ++++++-------------
.../src/main/webapp/pages/createJournal.html | 10 +--
.../src/main/webapp/pages/eportfolio.html | 1 +
4 files changed, 47 insertions(+), 80 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css b/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
index c7d58208..1dd6779c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
@@ -1,35 +1,27 @@
-.jounral-form-container {
- height:90vh;
- display: grid;
- grid-template-rows: 5% 90% 5%;
- grid-template-columns: 40% 40% 20%;
+.journal-form-container {
+ display: grid;
+ grid-gap: 10px;
+ grid-template-columns: 1fr 1fr 1fr;
+ grid-template-areas:
+ "visibility category ..."
+ "editor editor editor"
+ "buttons ... ...."
+ ;
}
-.jounral-form-visibility{
- grid-column-start:1;
- grid-column-end:1;
- grid-row-start:1;
- grid-row-end:1;
+.journal-form-visibility{
+ grid-area: visibility;
}
-.jounral-form-category{
- grid-column-start:2;
- grid-column-end:2;
- grid-row-start:1;
- grid-row-end:1;
+.journal-form-category{
+ grid-area: category;
}
-.jounral-form-editor{
- grid-column-start:1;
- grid-column-end:3;
- grid-row-start:2;
- grid-row-end:2;
+.journal-form-editor{
+ grid-area: editor;
}
-.jounral-form-buttons{
- grid-column-start:1;
- grid-column-end:1;
- grid-row-start:3;
- grid-row-end:3;
+.journal-form-buttons{
+ grid-area: buttons;
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css b/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css
index 20c6422f..43c87416 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css
@@ -1,90 +1,64 @@
.journal-description-container{
- height:50vh;
display: grid;
- grid-template-rows: 10% 20% 10% 50%;
- grid-template-columns: 75% 5% 5% 15%;
+ grid-gap: 10px;
+ grid-template-columns: 2fr 1fr 15%;
+ grid-template-areas:
+ "title edit group"
+ "text text group"
+ "text text links"
+;
}
.journal-description-title{
- grid-column-start:1;
- grid-column-end:1;
- grid-row-start:1;
- grid-row-end:1;
+ grid-area:title;
}
.journal-description-edit{
- grid-column-start:2;
- grid-column-end:2;
- grid-row-start:1;
- grid-row-end:1;
+ grid-area:edit;
}
.journal-description-group{
- grid-column-start:4;
- grid-column-end:4;
- grid-row-start:1;
- grid-row-end:2;
+ grid-area:group;
}
.journal-description-text{
- grid-column-start:1;
- grid-column-end:3;
- grid-row-start:2;
- grid-row-end:4;
+ grid-area:text;
}
.journal-description-links{
- grid-column-start:4;
- grid-column-end:4;
- grid-row-start:3;
- grid-row-end:4;
+
}
.journal-container{
- height:50vh;
display: grid;
- grid-template-rows: 10% 90%;
- grid-template-columns: 20% 30% 25% 5% 5% 15%;
+ grid-gap: 10px;
+ grid-template-columns: 1fr 1fr 2fr 2fr 15%;
+ grid-template-areas:
+ "name date category edit ..."
+ "avatar text text text ..."
+ ;
}
.journal-name{
- grid-column-start:1;
- grid-column-end:1;
- grid-row-start:1;
- grid-row-end:1;
+ grid-area:name;
}
.journal-date{
- grid-column-start:2;
- grid-column-end:2;
- grid-row-start:1;
- grid-row-end:1;
+ grid-area:date;
}
.journal-category{
- grid-column-start:3;
- grid-column-end:3;
- grid-row-start:1;
- grid-row-end:1;
+ grid-area:category;
}
.journal-edit{
- grid-column-start:4;
- grid-column-end:4;
- grid-row-start:1;
- grid-row-end:1;
+ grid-area:edit;
}
.journal-avatar{
- grid-column-start:1;
- grid-column-end:1;
- grid-row-start:2;
- grid-row-end:2;
+ grid-area:avatar;
}
.journal-text{
- grid-column-start:2;
- grid-column-end:5;
- grid-row-start:2;
- grid-row-end:2;
+ grid-area:text;
}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.html b/gemeinsamforschen/src/main/webapp/pages/createJournal.html
index 5ce9435a..8ad322dc 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.html
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.html
@@ -17,9 +17,9 @@
<input type="hidden" name="student" value="0">
<input type="hidden" name="project" value="0">
- <div class="jounral-form-container">
+ <div class="journal-form-container">
- <div class = "jounral-form-visibility">
+ <div class = "journal-form-visibility">
Sichtbarkeit:
<select name="visibility" form="journalform">
<option value="ALL"> Alle </option>
@@ -29,7 +29,7 @@
</select>
</div>
- <div class = "jounral-form-category">
+ <div class = "journal-form-category">
Kategorie:
<select name="category" form="journalform">
<option value="A"> A </option>
@@ -38,12 +38,12 @@
</div>
- <div class ="jounral-form-editor">
+ <div class ="journal-form-editor">
<textarea id = "editor" name="text" form="journalform" >
</textarea>
</div>
- <div class="jounral-form-buttons">
+ <div class="journal-form-buttons">
<input type="submit">
<button> Zurü ü k </button>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.html b/gemeinsamforschen/src/main/webapp/pages/eportfolio.html
index 58fb15c8..00cce961 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.html
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.html
@@ -51,6 +51,7 @@
<option>Eigene</option>
</select>
+ <a href="createJournal.html">Neu</a>
<div class="journal-container">
<div class="journal-avatar">
--
GitLab