Necessary changes to merge different versions

This commit is contained in:
2021-04-16 16:05:54 +02:00
parent cc6bc25078
commit a977ef314a
2 changed files with 47 additions and 25 deletions

7
.gitignore vendored Normal file
View File

@@ -0,0 +1,7 @@
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

View File

@@ -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%;
}
} */