Skip to content

Commit

Permalink
Merge pull request #167 from mikerae/133-assessment-review-ux-improve…
Browse files Browse the repository at this point in the history
…ment-minor-horizontal-scroll-login-screen

133 assessment review ux improvement minor horizontal scroll login screen  - fixes #133
  • Loading branch information
mikerae authored Oct 4, 2023
2 parents e098e9d + 8e9097c commit 9730ad0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
8 changes: 7 additions & 1 deletion static/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ body {
font-family: "Open Sans", sans-serif;
background: #f6f9ff;
color: #444444;
max-width: 100%;
overflow-x: hidden;
}

a {
Expand Down Expand Up @@ -278,6 +280,11 @@ h6 {
font-size: 20px;
}

/* Button Margin */
.btn {
margin-bottom: 1rem;
}

/* Close Button */
.btn-close {
background-size: 25%;
Expand Down Expand Up @@ -987,7 +994,6 @@ h6 {

#login_out {
background-color: #a0c7f6;
width: 100vw;
}

/*--------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion string_rota/templates/string_rota/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h2 class="card-title">Select a Project<span></h2>
{% elif level == 25 %}
<span class="text-success"><strong>{{ message }}</strong></span>
{% else %}
<span class="text-success"><strong>{{ message }}</strong></span>
<span class="text-info"><strong>{{ message }}</strong></span>
{% endif %}
</li>
{% endwith %}
Expand Down
10 changes: 7 additions & 3 deletions string_rota/templates/string_rota/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@
<div class="d-flex justify-content-center py-4">
<a href="https://www.rsno.org.uk/" target="_blank" rel="external"
class=" d-flex align-items-center w-auto" aria-label="Explore the RSNO website">
<img src="{% static 'assets/img/logo.png' %}" alt="RSNO Scotland's National Orchestra">
<img class="w-100" src="{% static 'assets/img/logo.png' %}"
alt="RSNO Scotland's National Orchestra">
</a>
</div>
<div class="d-flex justify-content-center py-4">
<a href="https://www.rsno.org.uk/" class="logo d-flex align-items-center w-auto" target="_blank"
aria-label="Explore the RSNO website">
<span class="d-none d-lg-block">String Rota</span>
<span class="d-lg-block">String Rota</span>
</a>
</div>
<div class="py-1 text-center">
Expand All @@ -65,9 +66,12 @@
</P>
<P>
Unfortunately, because the contents of this site are sensitive, registration to access the site for
members of the public is not possible. Please feel free to click on the RSNO Logo to find out more
members of the public is not possible.
Please feel free to click on the RSNO Logo to find out more
about the RSNO.
</P>
<p> If you are an RSNO String Player but do not have a username and password, please contact your Rota
Manager. They will help you to login.</p>
<p>
Thank you for your understanding.
</p>
Expand Down
2 changes: 1 addition & 1 deletion string_rota/templates/string_rota/rota.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h2 class="card-title">Repertoire<span></h2>
{% elif level == 25 %}
<span class="text-success"><strong>{{ message }}</strong></span>
{% else %}
<span class="text-success"><strong>{{ message }}</strong></span>
<span class="text-info"><strong>{{ message }}</strong></span>
{% endif %}
</li>
{% endwith %}
Expand Down

0 comments on commit 9730ad0

Please sign in to comment.