Skip to content

Commit

Permalink
redesign vue galaxie
Browse files Browse the repository at this point in the history
redesign
gain de quelques requetes
  • Loading branch information
machine62 committed Oct 25, 2023
1 parent 3117d9f commit 07b63c3
Show file tree
Hide file tree
Showing 6 changed files with 763 additions and 428 deletions.
2 changes: 2 additions & 0 deletions includes/galaxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,7 @@ function galaxy_portee_missiles($galaxy, $system)
function displayMIP($nom_missil_joueur, $missil_dispo, $galaxie_missil, $sysSol_missil, $base_coord, $ok_missil, $total_missil)
{
global $lang;
//todo tooltip non fonctionnel : affichage en tete dans la table galaxy => a maintenir ?
if (!$missil_dispo) {
$missil_dispo = $lang['GALAXY_MIP_UNKNOWN'];
Expand All @@ -1726,6 +1727,7 @@ function displayMIP($nom_missil_joueur, $missil_dispo, $galaxie_missil, $sysSol_
$tooltip .= '<tr><td class=\'c\' width=\'70\'>' . $lang['GALAXY_MIP_AVAILABLE_MISSILES'] . ' : </td><th width=\'30\'>' . $missil_dispo . '</th></tr>';
$tooltip .= '</table>';
$tooltip = htmlentities($tooltip);


$door = '<a id="linkdoor" href="?action=galaxy&galaxy=' . $galaxie_missil . '&system=' . $sysSol_missil . '"';
//$door .= ' onmouseover="this.T_WIDTH=260;this.T_TEMP=15000;return escape(' . $tooltip . ')"';
Expand Down
142 changes: 120 additions & 22 deletions skin/OGSpy_skin/formateredesign.css
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,9 @@ ______________________________________________________________ */
--color-table-background-hover: #191919;
--color-table-background-head: black;

/*table galaxie*/
--color-table-galaxie-hided: black;


/* icon */
/* https://www.iconfinder.com */
Expand All @@ -622,8 +625,9 @@ ______________________________________________________________ */
--icon-addon: url("icon/icon_addon.svg");
--icon-link: url("icon/icon_link.svg");

--icon-moon: url("img/lune.png");

--icon-moon: url("icon/icon-moon.svg");
--icon-phalanx: url("icon/icon-phalanx.svg");
--icon-gate: url("icon/icon-gate.svg");
}

/* grille principale */
Expand Down Expand Up @@ -1046,8 +1050,8 @@ table.og-table tbody .tdcontent {
}

table.og-table tbody td.og-highlight {
color: var(--color-highlight);
background-color:var(--color-table-background-hover);
color: var(--color-highlight);
background-color: var(--color-table-background-hover);

}

Expand All @@ -1071,6 +1075,14 @@ table.og-table tbody td {
text-align: center;
}

table.og-table thead tr th.og-legend,
table.og-table thead tr td.og-legend
{
text-align: center;
}






Expand Down Expand Up @@ -1160,12 +1172,12 @@ table.og-table tbody td {
border: 1px solid var(--color-danger-lighten);
}

.og-button-little{
.og-button-little {
font-size: 12px;
border-radius: 4px;
padding: 2px 4px;
cursor: pointer;
margin: 2px 0px;
margin: 2px 0px;

}

Expand Down Expand Up @@ -1338,34 +1350,114 @@ table.og-table-ranking tr td.active-rank {

/* ranking */
table.og-table-empire tbody tr:hover td {
background-color:var(--color-table-background-hover);
background-color: var(--color-table-background-hover);

}


/* page galaxie */

.page_galaxy select {
margin-top: 3px;
margin-bottom: 3px;
height: 30px;
margin-right: 40%;
}

.page_galaxy input {
margin-top: 3px;
margin-bottom: 3px;
height: 25px;
}

.page_galaxy table tr {
height: 30px;
}

.page_galaxy table tr.empty .tdcontent {
color: rgba(0, 0, 0, 0.0);
}

.page_galaxy table .tdcontent {
height: 25px;
}

/* simu */

table.og-table thead tr td {

text-align: right;
}

.page_galaxy .og-button {
margin: 3px 3px;
;
}

table.og-table-galaxy tbody .tr-isallied {
/* si allie clignotement*/
animation: blink 0.9s cubic-bezier(1, 0, 0, 1) infinite alternate;
}


table.og-table-galaxy tbody .tr-ishided .tdcontent,
table.og-table-galaxy tbody .tr-ishided .tdcontent a {
/* si caché */
color: var(--color-table-galaxie-hided)!important;
}


/* OGAME ELEMENT*/

.ogame-icon-moon{
.ogame-icon {
align-content: center;
display: inline-block;
height: 20px;
width: 20px;
background-image: var(--icon-moon);
background-repeat: no-repeat;
background-position: center;
background-size: cover;
color: rgba(0,0,0,0);
background-size: contain;
padding-top: 4px;
}


.ogame-icon-gate {
background-image: var(--icon-gate);
}

.ogame-icon-moon {
background-image: var(--icon-moon);
}

.ogame-icon-phalanx {
background-image: var(--icon-phalanx);
}



.ogame-status-I,
.ogame-status-i {
/* i et I identique */
color: gray;
}

.ogame-status-v {
color: #0044ff;
}

.ogame-status-a {
color: red;
}

.ogame-status-d {
color: #C7569D;
}

.ogame-status-o {
color: #10e972;
}

.ogame-status-b {
color: #d1d129
}

/* todo ogame-status-x */
/* Different status dans BDD*/
Expand Down Expand Up @@ -1446,25 +1538,31 @@ io
table.og-table-ranking thead {
font-size: 11px;
}

table.og-table-ranking tr th.active-rank {
font-size: 11px;
}

table.og-table-ranking tr th.active-rank img {
padding-left: 1px;
padding-right: 1px;
}

/* ranking */
/* ranking */

table.og-table-empire tbody tr td input{
vertical-align: middle;
display: inline-block;
margin-left: 50%;
margin-right: 50%;
}
table.og-table-empire tbody tr td input {
vertical-align: middle;
display: inline-block;
margin-left: 50%;
margin-right: 50%;
}


/* vue galaxie */
table.og-table-galaxy .og-galaxy-poster{
display: none;
}




Expand Down Expand Up @@ -1513,6 +1611,6 @@ table.og-table-empire tbody tr td input{
padding: 0px;
}



}
19 changes: 19 additions & 0 deletions skin/OGSpy_skin/icon/icon-gate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions skin/OGSpy_skin/icon/icon-moon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 07b63c3

Please sign in to comment.