Skip to content

Commit 0dd6a25

Browse files
committed
Merge branch 'master' into blog
2 parents 4577d53 + 9ffc8eb commit 0dd6a25

File tree

8 files changed

+9682
-218
lines changed

8 files changed

+9682
-218
lines changed

assets/css/app.scss

+3-89
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,5 @@
1-
/* This file is for your main application css. */
2-
@import "./phoenix.css";
3-
@import "../node_modules/nprogress/nprogress.css";
1+
@tailwind base;
42

5-
/* LiveView specific classes for your customizations */
6-
.invalid-feedback {
7-
color: #a94442;
8-
display: block;
9-
margin: -1rem 0 2rem;
10-
}
3+
@tailwind components;
114

12-
.phx-no-feedback.invalid-feedback, .phx-no-feedback .invalid-feedback {
13-
display: none;
14-
}
15-
16-
.phx-click-loading {
17-
opacity: 0.5;
18-
transition: opacity 1s ease-out;
19-
}
20-
21-
.phx-disconnected{
22-
cursor: wait;
23-
}
24-
.phx-disconnected *{
25-
pointer-events: none;
26-
}
27-
28-
.phx-modal {
29-
opacity: 1!important;
30-
position: fixed;
31-
z-index: 1;
32-
left: 0;
33-
top: 0;
34-
width: 100%;
35-
height: 100%;
36-
overflow: auto;
37-
background-color: rgb(0,0,0);
38-
background-color: rgba(0,0,0,0.4);
39-
}
40-
41-
.phx-modal-content {
42-
background-color: #fefefe;
43-
margin: 15% auto;
44-
padding: 20px;
45-
border: 1px solid #888;
46-
width: 80%;
47-
}
48-
49-
.phx-modal-close {
50-
color: #aaa;
51-
float: right;
52-
font-size: 28px;
53-
font-weight: bold;
54-
}
55-
56-
.phx-modal-close:hover,
57-
.phx-modal-close:focus {
58-
color: black;
59-
text-decoration: none;
60-
cursor: pointer;
61-
}
62-
63-
64-
/* Alerts and form errors */
65-
.alert {
66-
padding: 15px;
67-
margin-bottom: 20px;
68-
border: 1px solid transparent;
69-
border-radius: 4px;
70-
}
71-
.alert-info {
72-
color: #31708f;
73-
background-color: #d9edf7;
74-
border-color: #bce8f1;
75-
}
76-
.alert-warning {
77-
color: #8a6d3b;
78-
background-color: #fcf8e3;
79-
border-color: #faebcc;
80-
}
81-
.alert-danger {
82-
color: #a94442;
83-
background-color: #f2dede;
84-
border-color: #ebccd1;
85-
}
86-
.alert p {
87-
margin-bottom: 0;
88-
}
89-
.alert:empty {
90-
display: none;
91-
}
5+
@tailwind utilities;

assets/css/phoenix.css

-101
This file was deleted.

0 commit comments

Comments
 (0)