Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kus-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Кубота
kus-admin
Commits
4dfde94a
Commit
4dfde94a
authored
Jan 30, 2020
by
Иван Кубота
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'm3' of gitlab.quokka.pub:Zibx/kus-admin into m3
parents
d14aa7d1
fda1c817
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
card.scss
src/view/cmp/card/card.scss
+7
-4
progress.scss
src/view/cmp/progress/progress.scss
+5
-0
No files found.
src/view/cmp/card/card.scss
View file @
4dfde94a
...
...
@@ -67,8 +67,6 @@ $cardTypes: (
flex-wrap
:
wrap
;
}
.card__image
{
width
:
140px
;
height
:
90px
;
...
...
@@ -91,9 +89,13 @@ $cardTypes: (
flex-direction
:
column
;
justify-content
:
center
;
margin
:
10px
0
;
max-width
:
100%
;
max-height
:
4em
;
font-weight
:
500
;
font-size
:
15px
;
line-height
:
20px
;
line-height
:
1
.333333
;
word-break
:
break-word
;
overflow
:
hidden
;
}
button
.card__button
{
...
...
@@ -138,7 +140,7 @@ button.card__button {
box-sizing
:
border-box
;
padding
:
10px
;
width
:
160px
;
min-height
:
2
10
px
;
min-height
:
2
22
px
;
color
:
#605D5D
;
background-color
:
$bg-main
;
border
:
1px
solid
$bg-main
;
...
...
@@ -159,6 +161,7 @@ button.card__button {
}
.card--disabled
.card__title
{
max-height
:
90px
;
font-size
:
13px
;
line-height
:
17px
;
}
...
...
src/view/cmp/progress/progress.scss
View file @
4dfde94a
...
...
@@ -17,3 +17,8 @@
background-image
:
radial-gradient
(
50%
50%
at
50%
50%
,
#34BE5B
0%
,
#009A2C
100%
);
box-shadow
:
none
;
}
.progress-bar
.incomplete
{
background-image
:
radial-gradient
(
50%
50%
at
50%
50%
,
#DA0000
40
.62%
,
#C80303
100%
);
box-shadow
:
none
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment