diff --git a/EXE/remui/hud.rml b/EXE/remui/hud.rml index 6d51faf9..303f90a1 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -29,7 +29,9 @@ .mans .ico { width: 34dp; height: 34dp; margin: 0; } .mans .lb { margin-top: 2dp; font-weight: 600; font-size: 12dp; letter-spacing: 1dp; color: #b9d4ea; white-space: nowrap; text-transform: uppercase; } .mans .ib.on .lb { color: #f2b13c; } - .cruise { left: 50%; margin-left: -300dp; top: 90dp; width: 64dp; height: 56dp; display: flex; justify-content: center; align-items: center; } + /* a tab hanging from the bar (fts: no top edge, its sides start on the bar's bottom edge), clear of its cut */ + .cruise { left: 50%; margin-left: -286dp; top: 84dp; width: 64dp; height: 52dp; display: flex; justify-content: center; align-items: center; } + .fp.cruise { decorator: ninepatch(fts, fts-i); } .cruise .ico { width: 40dp; height: 40dp; } /* --- bottom centre: the ship in its shield ring (the hull the red ring inside); power and thrust as a @@ -75,10 +77,11 @@ .hull .sg.lit { background-color: #e0484e; } /* --- bottom left: target / contacts --------------------------------------------------- */ - .lhead { left: 8dp; bottom: 340dp; width: 310dp; height: 42dp; display: flex; flex-direction: row; align-items: center; padding: 0 8dp 0 22dp; } + /* the head a tab on the body: its sides run on into the body's (fht / fbl, rem.rcss) */ + .lhead { left: 8dp; bottom: 342dp; width: 310dp; height: 42dp; decorator: ninepatch(fht, fht-i); display: flex; flex-direction: row; align-items: center; padding: 0 8dp 0 22dp; } .lhead .ico { width: 30dp; height: 30dp; } /* as high as the weapons panel (symmetric): FL's eight contact rows a little taller */ - .lbody { left: 8dp; bottom: 8dp; width: 367dp; height: 334dp; padding: 12dp 16dp; } + .lbody { left: 8dp; bottom: 8dp; width: 367dp; height: 334dp; decorator: ninepatch(fbl, fbl-i); padding: 12dp 16dp; } .filters { display: flex; flex-direction: row; justify-content: center; margin-bottom: 6dp; padding-bottom: 6dp; border-bottom: 1dp #2b6f9e; } .filters .ico { width: 32dp; height: 32dp; margin: 0 4dp; } .rows { height: 246dp; margin-right: 22dp; } @@ -110,11 +113,11 @@ .tbtns .ico { width: 40dp; height: 40dp; } /* --- bottom right: status ------------------------------------------------------------- */ - .rhead { right: 8dp; bottom: 340dp; width: 310dp; height: 42dp; display: flex; flex-direction: row; align-items: center; padding: 0 12dp 0 22dp; } + .rhead { right: 8dp; bottom: 342dp; width: 310dp; height: 42dp; decorator: ninepatch(fht, fht-i); display: flex; flex-direction: row; align-items: center; padding: 0 12dp 0 22dp; } .rhead .ico { width: 26dp; height: 26dp; margin: 0 4dp 0 10dp; } .rhead .cnt { font-weight: 600; font-size: 18dp; } /* 10 weapons fit (a ship may carry more: the list scrolls; it drew the 9th and on outside the frame) */ - .rbody { right: 8dp; bottom: 8dp; width: 367dp; height: 334dp; padding: 12dp 16dp; } + .rbody { right: 8dp; bottom: 8dp; width: 367dp; height: 334dp; decorator: ninepatch(fbrt, fbrt-i); padding: 12dp 16dp; } .rbody .wl { height: 100%; overflow-y: auto; } .w { display: flex; flex-direction: row; align-items: center; height: 28dp; padding: 0 6dp 0 8dp; border-left: 3dp #00000000; border-bottom: 1dp #24405c66; font-weight: 500; font-size: 16dp; letter-spacing: 1dp; color: #8197ad; text-transform: uppercase; } .w:hover { background-color: #3a8fc822; } diff --git a/EXE/remui/img/hud_frames.png b/EXE/remui/img/hud_frames.png index cee2da7b..3568f5bc 100644 Binary files a/EXE/remui/img/hud_frames.png and b/EXE/remui/img/hud_frames.png differ diff --git a/EXE/remui/navbar.rml b/EXE/remui/navbar.rml index c6ff5ced..3207f422 100644 --- a/EXE/remui/navbar.rml +++ b/EXE/remui/navbar.rml @@ -29,8 +29,9 @@ .nb:hover img, .nb.active img { image-color: #f2b13c; } .nb span { margin-top: 2dp; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 12dp; letter-spacing: 1dp; text-transform: uppercase; white-space: nowrap; color: #b9d4ea; } .nb.active span { color: #f2b13c; } - /* the room's services (repair, launch, the dealer's desk, ...) in a smaller second row under it */ - .navbar.tabs { height: 56dp; margin-top: 4dp; padding: 0 14dp; } + /* the room's services (repair, launch, the dealer's desk, ...) in a smaller second row under it: a tab + hanging from the bar (fts: no top edge, its sides start on the bar's bottom edge) */ + .navbar.tabs { height: 54dp; margin-top: 0; padding: 0 14dp; decorator: ninepatch(fts, fts-i); } .tabs .nb { min-width: 72dp; height: 46dp; } .tabs .nb img { width: 26dp; height: 26dp; } diff --git a/EXE/remui/rem.rcss b/EXE/remui/rem.rcss index 76c550e6..e1df3924 100644 --- a/EXE/remui/rem.rcss +++ b/EXE/remui/rem.rcss @@ -449,7 +449,8 @@ input.range sliderarrowdec, input.range sliderarrowinc { width: 0; height: 0; } fa: top left + bottom right cut, fb: all four, fs: all four (small), fed: the HUD editor's, fw: as fa but nearly opaque, for windows and tips; fsa / fsd: the primary / danger button; fo / fh / fbr: a window with a clear hole (navmap.rml): the edge alone, the head's fill (top left - cut), the side's fill (bottom right cut) */ + cut), the side's fill (bottom right cut); fts: a tab hanging from a bar, open at the top; fht / fbl / fbrt: a + panel's head as a tab on its body (the head open at the bottom, the body uncut under it, head at the left / right) */ @spritesheet hudframes { src: img/hud_frames.png; resolution: 2x; @@ -463,6 +464,10 @@ input.range sliderarrowdec, input.range sliderarrowinc { width: 0; height: 0; } fo: 672px 0px 96px 96px; fo-i: 704px 32px 32px 32px; fh: 768px 0px 96px 96px; fh-i: 800px 32px 32px 32px; fbr: 864px 0px 96px 96px; fbr-i: 896px 32px 32px 32px; + fts: 960px 0px 96px 96px; fts-i: 992px 32px 32px 32px; + fht: 1056px 0px 96px 96px; fht-i: 1088px 32px 32px 32px; + fbl: 1152px 0px 96px 96px; fbl-i: 1184px 32px 32px 32px; + fbrt: 1248px 0px 96px 96px; fbrt-i: 1280px 32px 32px 32px; } /* a dealer's hold and credits, large (the tabs' row of the equipment dealer, the commodity trader's row): the hold a