Skip to content

Commit

Permalink
styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@jo-elimu
jo-elimu committed Oct 9, 2024
1 parent d6405c3 commit 6e2743f
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/admin/layout.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
</div>
</c:if>

<div id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<main id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<div class="section row">
<c:choose>
<c:when test="${!hasAside}">
Expand All @@ -204,6 +204,6 @@
</c:otherwise>
</c:choose>
</div>
</div>
</main>
</body>
</html>
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/analytics/layout.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</div>
</c:if>

<div id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<main id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<div class="section row">
<c:choose>
<c:when test="${!hasAside}">
Expand All @@ -91,6 +91,6 @@
</c:otherwise>
</c:choose>
</div>
</div>
</main>
</body>
</html>
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/content/layout.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
</div>
</c:if>

<div id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<main id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<div class="section row">
<c:choose>
<c:when test="${!hasAside}">
Expand All @@ -310,6 +310,6 @@
</c:otherwise>
</c:choose>
</div>
</div>
</main>
</body>
</html>
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/layout.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
</div>
</c:if>

<div id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<main id="${cssId}" class="container <c:if test="${cssClass != null}">${cssClass}</c:if>">
<div class="section row">
<c:choose>
<c:when test="${!hasAside}">
Expand All @@ -253,7 +253,7 @@
</c:otherwise>
</c:choose>
</div>
</div>
</main>

<c:if test="${!fn:contains(pageContext.request.requestURI, '/jsp/content/')}">
<footer class="page-footer deep-purple lighten-1">
Expand Down
15 changes: 10 additions & 5 deletions src/main/webapp/WEB-INF/jsp/welcome.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
</p>
</div>
<div class="col s12 m5">
<img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://github.blog/wp-content/uploads/2019/05/xprize-no-text.png?w=1200" style="border-radius: 8px;" />
<img src="https://github.blog/wp-content/uploads/2019/05/xprize-no-text.png?w=1200"
style="border: 2px solid darkgoldenrod; border-right-width: 4px; border-bottom-width: 4px;" />
</div>
</div>

Expand All @@ -97,7 +98,8 @@
</p>
</div>
<div class="col s12 m5">
<img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://user-images.githubusercontent.com/15718174/26873794-641bfbfc-4b7b-11e7-95ee-82b19b661ad5.png" style="border-radius: 8px;" />
<img src="https://user-images.githubusercontent.com/15718174/26873794-641bfbfc-4b7b-11e7-95ee-82b19b661ad5.png"
style="border: 2px solid green; border-right-width: 4px; border-bottom-width: 4px;" />
</div>
</div>

Expand All @@ -116,7 +118,8 @@
</p>
</div>
<div class="col s12 m5">
<img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://user-images.githubusercontent.com/15718174/27299402-95bea44c-552c-11e7-84ab-217cdca758e4.gif" style="border-radius: 8px;" />
<img src="https://user-images.githubusercontent.com/15718174/27299402-95bea44c-552c-11e7-84ab-217cdca758e4.gif"
style="border: 2px solid rgba(103,58,183, 0.8); border-right-width: 4px; border-bottom-width: 4px;" />
</div>
</div>

Expand All @@ -131,7 +134,8 @@
</p>
</div>
<div class="col s12 m5">
<img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://user-images.githubusercontent.com/15718174/27515871-41872c60-59ae-11e7-9b2d-3ca886d0d7f2.png" style="border-radius: 8px;" />
<img src="https://user-images.githubusercontent.com/15718174/27515871-41872c60-59ae-11e7-9b2d-3ca886d0d7f2.png"
style="border: 2px solid rgba(103,58,183, 0.9); border-right-width: 4px; border-bottom-width: 4px;" />
</div>
</div>
</div>
Expand Down Expand Up @@ -193,7 +197,8 @@
<h2>🧑🏽‍🚀🧑🏽‍⚕️🧑🏽‍🚒🧑🏽‍🏫</h2>
</div>
<div class="row">
<img style="border-radius: 8px; opacity: 80%; outline: 8px solid #d1c4e9" src="https://i.pinimg.com/736x/e8/7c/56/e87c5635fa622c2da8c6dddd893113b9--open-source-children.jpg" />
<img src="https://i.pinimg.com/736x/e8/7c/56/e87c5635fa622c2da8c6dddd893113b9--open-source-children.jpg"
style="border: 2px solid darkgoldenrod; border-right-width: 4px; border-bottom-width: 4px;" />
</div>
</div>
</div>
Expand Down
16 changes: 3 additions & 13 deletions src/main/webapp/static/css/content/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ nav {
transition: all .5s;
}

#letterSoundsContainer .chip {
main #letterSoundsContainer .chip {
text-align: center;
font-size: 2rem;
padding: 1rem;
height: auto;
background-color: #EEE;
}

#letterCreatePage input#text,
Expand All @@ -34,19 +33,10 @@ nav {
height: 1.2em;
}

.card-panel img {
border-radius: 8px;
background-color: rgba(255,255,255, 0.5);
box-shadow: 4px 4px rgba(103,58,183, 0.2); /* deep-purple */
}
#labeledAudios img,
#labeledImages img,
#labeledVideos img {
width: 47%;
margin-right: 2%;
border-radius: 8px;
background-color: rgba(255,255,255, 0.5);
box-shadow: 4px 4px rgba(103,58,183, 0.2); /* deep-purple */
margin-top: 0.5em;
}
#imageEditPage #image img {
display: block;
Expand Down Expand Up @@ -82,7 +72,7 @@ html[data-content-language="hin"] #storyBookEditPage .storyBookChapter .storyBoo
blockquote,
.comment {
white-space: pre-line;
overflow: scroll;
overflow: auto;
}

.row.peerReviewEvent {
Expand Down
36 changes: 32 additions & 4 deletions src/main/webapp/static/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,38 @@ video {
max-width: 100%;
}

main img {
background-color: rgba(255,255,255, 0.5);
border-radius: 8px;
border: 2px solid rgba(103,58,183, 0.3); /* deep-purple */
box-shadow: 4px 4px rgba(103,58,183, 0.15); /* deep-purple */
}
main .card-panel img {
border-width: 1px;
box-shadow: 2px 2px rgba(103,58,183, 0.15); /* deep-purple */
}
main .card .card-image img {
border-radius: 8px 8px 0 0;
border-width: 0;
}
main .card .card-image {
border-radius: 8px 8px 0 0;
}

main .chip {
background-color: rgba(103,58,183, 0.05); /* deep-purple */
border: 1px solid rgba(103,58,183, 0.15); /* deep-purple */
box-shadow: none;

overflow: visible;
text-overflow: ellipsis;
white-space: nowrap;
}
main .chip img {
border: 0;
box-shadow: none;
}

#welcomePage .card-title {
text-shadow: 1px 1px rgba(0,0,0, .8),
0 -1rem 3rem rgba(0,0,0, .8),
Expand Down Expand Up @@ -98,10 +130,6 @@ footer.page-footer .footer-copyright {
.card-panel {
border-radius: 8px;
}
.card .card-image,
.card .card-image img {
border-radius: 8px 8px 0 0;
}
.card .card-action:last-child {
border-radius: 0 0 8px 8px;
}
Expand Down

0 comments on commit 6e2743f

Please sign in to comment.