Skip to content

Commit

Permalink
Merge pull request #22 from GaiaOrtona/main
Browse files Browse the repository at this point in the history
cambiamenti gaia
  • Loading branch information
GaiaOrtona authored Jan 16, 2024
2 parents 26ee566 + 966bdc8 commit fd07614
Show file tree
Hide file tree
Showing 16 changed files with 87 additions and 19 deletions.
83 changes: 68 additions & 15 deletions 2030gaia.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@


body {
background-size: cover;
position: relative;
background-image: linear-gradient(#7893e6, #314da3);
border-bottom-left-radius: 70% 20%;
border-bottom-right-radius: 60% 20%;
height: 300px;
}
background-color:#C28842;

}



Expand Down Expand Up @@ -54,12 +51,21 @@ body {
margin-top: -0.5cm;
}

#subtitle {
z-index: 1;
}







.dropdown-menu {
background-color: rgb(124, 99, 58) ;
background-color: rgb(105, 90, 67) ;
border: 2px solid #ffffff;
color: #F1FAEE;
z-index: 2;
}

/* insertion */
Expand All @@ -76,22 +82,23 @@ body {
}

.dropdown-submenu:hover .dropdown-menu {
display: block; /* Display the submenu on hover */
display: block;/* Display the submenu on hover */
}

/* insertion */



#main {
background-size: cover; /* Adjust as needed */
background-repeat: no-repeat; /* Prevent image from repeating */
background:
linear-gradient(to bottom, rgb(12, 12, 12), rgb(238, 122, 5));
linear-gradient(to bottom, rgb(56, 48, 38), rgb(124, 99, 58));
border-radius: 5px;
margin-left: 1cm;
margin-right: 1cm;
height: 40vw;
position: relative;
z-index: 3;
z-index: 100;
border: 2px solid #ffffff;
}

Expand All @@ -103,38 +110,53 @@ body {
}

.highlight {
background-color: yellow; /* o qualsiasi altra formattazione visiva desiderata */
color: #C28842; /* o qualsiasi altra formattazione visiva desiderata */
}

#myTab {
overflow-y: auto;
max-height: 300px; /* Imposta l'altezza massima desiderata per la visualizzazione dei tab */
max-height: 300px;/* Imposta l'altezza massima desiderata per la visualizzazione dei tab */
}

#map-tab {
border: 3px solid black;
font-family: 'Dune';
color:beige;
}
#metadata-tab{
border: 3px solid black;
font-family: 'Dune';
color:beige;
}
#people-tab {
border: 3px solid black;
font-family: 'Dune';
color:beige;
}
#places-tab{
border: 3px solid black;
font-family: 'Dune';
color:beige;
}
#keywords-tab{
border: 3px solid black;
font-family: 'Dune';
color:beige;
}
#references-tab{
border: 3px solid black;
font-family: 'Dune';
color:beige;
}

.tab-content {
display: flex;
flex-direction: column;
overflow-y: auto;
max-height: 250px; /* Imposta l'altezza massima desiderata per la visualizzazione del contenuto dei tab */
max-height: 33vw; /* Imposta l'altezza massima desiderata per la visualizzazione del contenuto dei tab */
max-width: 22vw;
font-family: 'Dune';
color:beige;/* Imposta l'altezza massima desiderata per la visualizzazione del contenuto dei tab */
}

.tab-pane {
Expand All @@ -145,6 +167,33 @@ body {
display: none;
}

#image-gaia-3 {
background-image: url(img/2030img/mostroridimensionato.png);
position: absolute;
background-repeat: no-repeat;
z-index: 0;
width: 75%;
height: 75%;
left: 10px;
top: 100px; /* Assicurati che sia sopra tutti gli altri elementi */

}

#image-gaia-4 {
background-image: url(img/2030img/figuradefinitiva.png);
position: absolute;
background-repeat: no-repeat;
z-index: 99;
width: 20%;
height: 20%;
left: 1100px;;
bottom: 950px;
}

.background-svg {
display: none;
}




Expand Down Expand Up @@ -263,13 +312,17 @@ body {
}



#Vinyl {
position: static;
text-align: center;
width: 100%; /* Set the initial width to 100% */
height: auto; /* Set the initial height to 100% */
object-fit: cover; /* Maintain aspect ratio while covering container */
z-index: -1;



}


Expand All @@ -278,7 +331,7 @@ body {
width: 100%; /* Set the initial width to 100% */
height: auto;
object-fit: cover; /* Maintain aspect ratio while covering container */
z-index: 1;
z-index: 0;
transform-origin: 0;
transform: rotate(0deg);
margin-left: -23vw;
Expand Down
20 changes: 16 additions & 4 deletions anni30gaia.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ body {
image-rendering: optimizeQuality;
}

#image-gaia-3 {
display: none;
}

#image-gaia-4 {
display: none;
}

.background-svg {
display: none;
}




Expand Down Expand Up @@ -121,12 +133,11 @@ body {
}

.highlight {
background-color: yellow; /* o qualsiasi altra formattazione visiva desiderata */
color: black; /* o qualsiasi altra formattazione visiva desiderata */
}

#myTab {
overflow-y: auto;
max-height: 300px; /* Imposta l'altezza massima desiderata per la visualizzazione dei tab */
overflow-y: none; /* Imposta l'altezza massima desiderata per la visualizzazione dei tab */
}

#map-tab {
Expand All @@ -152,7 +163,8 @@ body {
display: flex;
flex-direction: column;
overflow-y: auto;
max-height: 250px; /* Imposta l'altezza massima desiderata per la visualizzazione del contenuto dei tab */
max-height: 33vw; /* Imposta l'altezza massima desiderata per la visualizzazione del contenuto dei tab */
max-width: 22vw; /* Imposta l'altezza massima desiderata per la visualizzazione del contenuto dei tab */
}

.tab-pane {
Expand Down
Binary file added img/2030img/Chapterhouse Dune Turkish Cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/DUNE 2020 tie-in cover.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/Dune Classic Round Sticker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/NAMIBIA.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/Sunny Arrakis vPRINT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/figura.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/figura2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/figura3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/figuradefinitiva.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/mostroridimensionato.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/mostrorosso.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/2030img/mostrorossodefinitivo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions issues.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ <h6 class="stitle" id="title">Music Box</h6>
<path class="line" d="M 100 160 C 10 160, 10 260, 100 260 L 190 260 C 280 260, 280 360, 190 360 L 100 360 C 10 360, 10 460, 100 460 L 190 460 C 280 460, 280 560, 190 560 C 100 560, 100 660, 190 660 L 280 660" fill="none" stroke="#ab2e20" stroke-miterlimit="10" stroke-width="20" stroke-opacity="0.9" />
</svg>
</div>
<div id="image-gaia-3"></div>
<div id="image-gaia-4"></div>



<div class="container-fluid">
Expand Down

0 comments on commit fd07614

Please sign in to comment.