From a977ef314aaa69fc0b5fe1ba77583ff84db03c31 Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Fri, 16 Apr 2021 16:05:54 +0200
Subject: [PATCH] Necessary changes to merge different versions

---
 .gitignore          |  7 +++++
 new_css/r11form.css | 65 ++++++++++++++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dcbaf2a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
\ No newline at end of file
diff --git a/new_css/r11form.css b/new_css/r11form.css
index d7e87f5..fd4f3b9 100644
--- a/new_css/r11form.css
+++ b/new_css/r11form.css
@@ -27,12 +27,6 @@
 .tooltip-window.lite {
     width: 30%;
 }
-/* .hyperlink.collapseTrigger::before{
-    content: "▼";
-} */
-
-.tooltip-window .tip {
-}
 
 .bordered-field {
     border: 2px solid rgba(93, 99, 96, 0.705);
@@ -55,8 +49,11 @@
     resize: vertical;
 }
 
-.container {
+body {
     font-family: 'Nunito', sans-serif;
+}
+
+.container {
     display: flex;
     justify-content: left;
     width: 100%;
@@ -152,8 +149,17 @@
     color: #00000020
 }
 
+.modification-button.btn-addtile {
+    font-size: 38px;
+    color: #00000030;
+}
+
+.modification-button.btn-addtile:hover {
+    color: #58ac43;
+}
+
 .tile {
-    width: 90%;
+    width: 100%;
     padding-top: 40%;
     border: 1px solid gray;
     border-radius: 3px;
@@ -173,6 +179,10 @@
     filter: none;
 }
 
+.tile.active .btn-tile {
+    opacity: 0;
+}
+
 .tile .content {
     position: absolute;
     left: 0;
@@ -198,6 +208,11 @@
     justify-content: space-between;
 }
 
+.display-space-evenly {
+    display: flex;
+    justify-content: space-evenly;
+}
+
 .content p {
     margin: 0;
     padding: 0;
@@ -281,6 +296,10 @@
     width: 50%;
 }
 
+.tree-fourth-width {
+    width: 75%;
+}
+
 .half-width.with-padding {
     width: 45%;
 }
@@ -397,7 +416,6 @@
 }
 
 .section-button:hover {
-    /* border-bottom: #3bc4f1 2px solid; */
     backdrop-filter: brightness(110%); 
 }
 
@@ -406,11 +424,7 @@
 }
 
 .List .collapsibleContent {
-    /* display: none; */
     border-left: #bdc5c9 2px solid;
-    
-    /* max-height: 0px; */
-    /* border-left: #ededed solid 1px; */
     overflow: hidden;
     background: #ffffff50;
 }
@@ -419,7 +433,9 @@
     padding: 10px 0px 20px 0px ;
 }
 
-.content {
+/* TODO: content subclass already in use. Creating content class overrides the subclass.
+Make .content a subclass of .content */
+/* .content {
     padding: 0px 15px 0px 15px ;
     text-align: justify;
     overflow: hidden;
@@ -427,7 +443,7 @@
     max-height: 0px;
     border-left: #c0c2c3 2px solid;
     
-}
+} */
 
 .collapsibleMini::before{
     content: "►";
@@ -437,10 +453,6 @@
     content: "▼";
 }
 
-.content.active{
-    
-}
-
 .hiddable {
     display: none;
 }
@@ -454,9 +466,10 @@
     display: none;
 }
 
-button:hover{
+/* TODO: Add proper class */
+/* button:hover{
     filter: brightness(110%);
-}
+} */
 
 .table-doc td, .table-doc th{
     border-spacing: 0px;
@@ -473,12 +486,14 @@ button:hover{
     color: white;
 }
 
-textarea {
+/* TODO: Add proper class */
+/* textarea {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-}
+} */
 
-code{
+/* TODO: Add proper class */
+/* code{
     line-height: 150%;
-}
\ No newline at end of file
+} */
\ No newline at end of file