Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Письменов Дмитрий Иванович
/
yourroomads
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 3a910bc6
authored
May 15, 2019
by
Jonathan Reinink
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix css naming conflict
Resolves #18
1 parent
279a3879
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
34 deletions
resources/css/app.css
resources/css/buttons.css
resources/css/spinner.css
resources/js/Shared/LoadingButton.vue
resources/css/app.css
View file @
3a910bc
...
...
@@ -6,7 +6,6 @@
@import
"buttons"
;
@import
"form"
;
@import
"nprogress"
;
@import
"spinner"
;
/* Utilities */
@import
"tailwindcss/utilities"
;
resources/css/buttons.css
View file @
3a910bc
...
...
@@ -3,3 +3,27 @@
&:hover,
&:focus
{
@apply
bg-orange
}
}
.btn-spinner
,
.btn-spinner
:after
{
border-radius
:
50%
;
width
:
1.5em
;
height
:
1.5em
;
}
.btn-spinner
{
font-size
:
10px
;
position
:
relative
;
text-indent
:
-9999em
;
border-top
:
.2em
solid
white
;
border-right
:
.2em
solid
white
;
border-bottom
:
.2em
solid
white
;
border-left
:
.2em
solid
transparent
;
transform
:
translateZ
(
0
);
animation
:
spinning
1s
infinite
linear
;
}
@keyframes
spinning
{
0
%
{
transform
:
rotate
(
0deg
)
}
100
%
{
transform
:
rotate
(
360deg
)
}
}
resources/css/spinner.css
deleted
100644 → 0
View file @
279a387
.spinner
,
.spinner
:after
{
border-radius
:
50%
;
width
:
1.5em
;
height
:
1.5em
;
}
.spinner
{
font-size
:
10px
;
position
:
relative
;
text-indent
:
-9999em
;
border-top
:
.2em
solid
white
;
border-right
:
.2em
solid
white
;
border-bottom
:
.2em
solid
white
;
border-left
:
.2em
solid
transparent
;
-webkit-transform
:
translateZ
(
0
);
-ms-transform
:
translateZ
(
0
);
transform
:
translateZ
(
0
);
-webkit-animation
:
loading
1s
infinite
linear
;
animation
:
loading
1s
infinite
linear
;
}
@keyframes
loading
{
0
%
{
-webkit-transform
:
rotate
(
0deg
);
transform
:
rotate
(
0deg
);
}
100
%
{
-webkit-transform
:
rotate
(
360deg
);
transform
:
rotate
(
360deg
);
}
}
resources/js/Shared/LoadingButton.vue
View file @
3a910bc
<
template
>
<button
:disabled=
"loading"
class=
"flex items-center"
>
<div
v-if=
"loading"
class=
"spinner mr-2"
/>
<div
v-if=
"loading"
class=
"
btn-
spinner mr-2"
/>
<slot
/>
</button>
</
template
>
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment