Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Ensure consistent logo display across Bani Overlay layouts #1914

Merged
merged 5 commits into from
Jul 31, 2024
Merged

Fix: Ensure consistent logo display across Bani Overlay layouts #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab85426
Fix: Ensure consistent logo display across Bani Overlay layouts
yadvirkaur Mar 27, 2024
06eac91
Remove redundant styles from Bani Overlay top and bottom layouts
yadvirkaur Mar 27, 2024
448f9e9
minor design changes for logo display across Bani Overlay layouts
yadvirkaur Apr 18, 2024
c48f9dc
use white transparent logo across all Bani Overlay layouts
yadvirkaur Jul 17, 2024
424573d
Merge branch 'dev' of github.com:yadvirkaur/sttm-desktop into overlay…
yadvirkaur Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions www/obs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
}
}

document.querySelectorAll('.content-top, .content-bottom').forEach(el => {
document.querySelectorAll('.content-top, .content-bars-bottom').forEach(el => {
// Clear styles added by other overrides
document.querySelectorAll('span.o-gurbani, span.o-translation').forEach(spanEl => {
spanEl.style.backgroundColor = 'transparent';
Expand Down Expand Up @@ -305,6 +305,9 @@
<div><span class="gurmukhi o-gurbani"> </span></div>
<div><span class="o-translation"> </span></div>
</div>
<div class="logo-wrapper" >
<img alt="SikhiToTheMax" src="./sikhi-max-logo-white.png" class="sttm-logo-white" />
</div>
</div>
<div class="other-layouts">
<div class="content-top">
Expand All @@ -321,7 +324,6 @@
</div>
</div>
<div class="logo-wrapper">
<img alt="SikhiToTheMax" src="./sikhi-max-logo.png" class="sttm-logo" />
<img alt="SikhiToTheMax" src="./sikhi-max-logo-white.png" class="sttm-logo-white" />
</div>
</div>
Expand Down
38 changes: 9 additions & 29 deletions www/src/scss/obs/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ body {
}

.layout-top {
.content-top {
padding-top: 3vh;
}

.o-gurbani,
.o-translation {
padding: 0.5% 3vw;
Expand All @@ -109,16 +105,6 @@ body {
position: absolute;
}

.content-top {
.content-bar {
padding-top: 8px;
}
}

.content-bottom {
padding-bottom: 3vh;
}

.o-gurbani,
.o-translation {
padding: 0.5% 3vw;
Expand All @@ -143,7 +129,6 @@ body {
width: auto;
}
.logo-wrapper {
border-radius: 2px;
top: 2vh;
}

Expand Down Expand Up @@ -185,14 +170,12 @@ body {
}

.logo-wrapper {
background: transparent;
display: block;
height: 100px;
position: relative;
right: 0;
width: 100%;
.sttm-logo {
display: none;
}

.sttm-logo-white {
display: block;
margin: auto;
Expand Down Expand Up @@ -244,11 +227,15 @@ body {
}

.logo-wrapper {
border-radius: 0;
bottom: 0;
height: 100%;
position: absolute;
right: 0;

.sttm-logo-white {
display: block;
margin: auto;
}
}
}

Expand Down Expand Up @@ -354,23 +341,16 @@ body {
}

.logo-wrapper {
align-items: center;
background: #fff;
border-radius: 5px;
display: inline-flex;
justify-content: center;
filter: drop-shadow(1px 1px rgba(0, 0, 0, 1));
padding: 2vh 2vw;
position: fixed;
right: 2vh;

.sttm-logo,
.sttm-logo-white {
display: block;
width: 12vw;
}

.sttm-logo-white {
display: none;
}
}

.logo-off {
Expand Down