Skip to content

Commit

Permalink
Merge branch 'static_icons' into show_last_database_update
Browse files Browse the repository at this point in the history
  • Loading branch information
dersmon committed Jun 10, 2024
2 parents 7fd0362 + 1d10d11 commit 9e75211
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 40 deletions.
103 changes: 76 additions & 27 deletions server/assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,33 @@
border: 1px solid transparent;
border-radius: 4px;
}

.alert-info {
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}

.alert-warning {
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}

.alert-danger {
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}

.alert p {
margin-bottom: 0;
}

.alert:empty {
display: none;
}

.invalid-feedback {
color: #a94442;
display: block;
Expand All @@ -46,20 +52,20 @@
transition: opacity 1s ease-out;
}

.phx-loading{
.phx-loading {
cursor: wait;
}

.phx-modal {
opacity: 1!important;
opacity: 1 !important;
position: fixed;
z-index: 1;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: auto;
background-color: rgba(0,0,0,0.4);
background-color: rgba(0, 0, 0, 0.4);
}

.phx-modal-content {
Expand Down Expand Up @@ -95,28 +101,53 @@
.fade-in {
animation: 0.2s ease-out 0s normal forwards 1 fade-in-keys;
}

.fade-out {
animation: 0.2s ease-out 0s normal forwards 1 fade-out-keys;
}

@keyframes fade-in-scale-keys{
0% { scale: 0.95; opacity: 0; }
100% { scale: 1.0; opacity: 1; }
@keyframes fade-in-scale-keys {
0% {
scale: 0.95;
opacity: 0;
}

100% {
scale: 1.0;
opacity: 1;
}
}

@keyframes fade-out-scale-keys{
0% { scale: 1.0; opacity: 1; }
100% { scale: 0.95; opacity: 0; }
@keyframes fade-out-scale-keys {
0% {
scale: 1.0;
opacity: 1;
}

100% {
scale: 0.95;
opacity: 0;
}
}

@keyframes fade-in-keys{
0% { opacity: 0; }
100% { opacity: 1; }
@keyframes fade-in-keys {
0% {
opacity: 0;
}

100% {
opacity: 1;
}
}

@keyframes fade-out-keys{
0% { opacity: 1; }
100% { opacity: 0; }
@keyframes fade-out-keys {
0% {
opacity: 1;
}

100% {
opacity: 0;
}
}

:root {
Expand Down Expand Up @@ -172,6 +203,18 @@ nav {
display: none;
}

.issue-group h3 div img {
position: relative;
width: 1em;
height: 1em;
top: 0.1em;
margin-right: 0.25em;
}

.issue-group h3 div {
cursor: pointer;
}

.monitoring-issue {
text-align: center;
border-radius: 5px;
Expand All @@ -187,7 +230,7 @@ nav {
}

.monitoring-issue.error {
background-color: rgb(253, 53, 53);
background-color: rgb(253, 53, 53);
color: white;
}

Expand All @@ -213,33 +256,39 @@ nav {
border-color: transparent #000000 transparent #000000;
display: block;
}

@keyframes issue-loading-anim {
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(360deg);
}

}
.column-date-time{

.column-date-time {
width: 8em;
}
.column-last-changes-slider{

.column-last-changes-slider {
width: 9em;
}
.slider-container{

.slider-container {
width: 100%;
}

.slider {
width: 100%;
background: #cdcccc;
outline: none;
width: 100%;
background: #cdcccc;
outline: none;
opacity: 0.7;
-webkit-transition: .2s;
-webkit-transition: .2s;
transition: opacity .2s;
accent-color:#0069d9;
accent-color: #0069d9;
}

.slider:hover {
opacity: 1;
}
opacity: 1;
}
26 changes: 13 additions & 13 deletions server/lib/field_hub_web/live/project_show_live.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -144,19 +144,19 @@
<%= "None." %>
<% issue_groups -> %>
<%= for {{type, severity}, issues} <- issue_groups do %>
<section id={"#{type}-issue-group"} class="issue-group hide">
<h3 class={issue_classes(severity)}>
<span class="show-toggle" style="cursor: pointer;" phx-click={JS.remove_class("hide", to: "##{type}-issue-group")}>
🗀 <%= get_issue_type_label(type) %> (<%= Enum.count(issues) %>)
</span>
<span class="hide-toggle" style="cursor: pointer;" phx-click={JS.add_class("hide", to: "##{type}-issue-group")}>
🗁 <%= get_issue_type_label(type) %> (<%= Enum.count(issues) %>)
</span>
</h3>

<.live_component module={ProjectShowLiveIssues} id={type} issues={issues} project={@project} />

</section>
<section id={"#{type}-issue-group"} class="issue-group hide">
<h3 class={issue_classes(severity)}>
<div class="show-toggle" phx-click={JS.remove_class("hide", to: "##{type}-issue-group")}>
<img src="/images/hero-icons/folder.svg"/><%= get_issue_type_label(type) %> (<%= Enum.count(issues) %>)
</div>
<div class="hide-toggle" phx-click={JS.add_class("hide", to: "##{type}-issue-group")}>
<img src="/images/hero-icons/folder-open.svg"/><%= get_issue_type_label(type) %> (<%= Enum.count(issues) %>)
</div>
</h3>

<.live_component module={ProjectShowLiveIssues} id={type} issues={issues} project={@project} />

</section>
<% end %>
<% end %>
</section>
Expand Down
9 changes: 9 additions & 0 deletions server/priv/static/images/hero-icons/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
MIT License

Copyright (c) 2020 Refactoring UI Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3 changes: 3 additions & 0 deletions server/priv/static/images/hero-icons/folder-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions server/priv/static/images/hero-icons/folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9e75211

Please sign in to comment.