pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into 31-admin-user-management

Browse source 
# Conflicts:
#	app/forms/UserSettings.php
This commit is contained in:
Henrik Hautakoski 2022-08-08 23:35:37 +02:00
commit 4b750f0f37
70 changed files with 7831 additions and 5620 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/sass/components/_badge.scss
View file

@ -21,7 +21,7 @@
&-primary {
color: white;
background-color: $brand-color;
background-color: $primary;
}
&-info {

2
app/assets/sass/components/_button.scss
View file

@ -64,7 +64,7 @@
// Sizes
// ----------------------------------
.button-large { font-size: $text-size-large; }
.button-large { font-size: $font-size-large; }
.button-small { font-size: 0.6em; }
// Block button

125
app/assets/sass/components/_callback-list.scss
View file

@ -1,78 +1,81 @@
.callback-list {
margin-top: 1em;
.callback-list-item {
@extend .clearfix;
position: relative;
padding: .6em 1em;
&-item {
@include clearfix();
position: relative;
padding: .6em 1em;
&:hover {
background: $gray-lightest;
}
&:hover {
background: $gray-lightest;
}
// Borders.
// --------
// Borders.
// --------
border: solid $callback-list-border-color $callback-list-border-size;
border: solid $callback-list-border-color $callback-list-border-size;
// Remove top border for all except first child.
&:not(:first-child) {
border-top: 0;
}
// Remove top border for all except first child.
&:not(:first-child) {
border-top: 0;
}
// top border radius for first child.
&:first-child {
border-top-left-radius: $callback-list-border-radius;
border-top-right-radius: $callback-list-border-radius;
}
// top border radius for first child.
&:first-child {
border-top-left-radius: $callback-list-border-radius;
border-top-right-radius: $callback-list-border-radius;
}
// bottom border radius for first child.
&:last-child {
border-bottom-left-radius: $callback-list-border-radius;
border-bottom-right-radius: $callback-list-border-radius;
}
// bottom border radius for first child.
&:last-child {
border-bottom-left-radius: $callback-list-border-radius;
border-bottom-right-radius: $callback-list-border-radius;
}
// Sections.
// ---------
// Sections.
// ---------
&-header {
margin-bottom: .4em;
}
&-header {
margin-bottom: .4em;
}
&-info {
font-size: $font-size-small;
color: $callback-list-info-color;
&-info {
font-size: $font-size-small;
color: $callback-list-info-color;
> span {
display: inline-block;
margin-right: 1.6em;
}
> span {
display: inline-block;
margin-right: 1.6em;
}
.icon {
@include icon-vcenter();
font-size: 20px;
padding: .2em;
}
}
.icon {
@include icon-vcenter();
font-size: 20px;
padding: .2em;
}
}
&-name {
margin-right: 1em;
font-size: $callback-list-name-text-size;
color: $callback-list-name-color;
&-name {
margin-right: 1em;
font-size: $callback-list-name-text-size;
color: $callback-list-name-color;
&:hover {
color: $callback-list-name-hover-color;
text-decoration: none;
}
}
&:hover {
color: $callback-list-name-hover-color;
text-decoration: none;
}
}
&-arrow {
color: $callback-list-arrow-color;
position: absolute;
right: .8em;
top: 50%;
> .icon {
font-size: 35px;
transform: translateY(-50%);
}
}
&-arrow {
color: $callback-list-arrow-color;
position: absolute;
right: .8em;
top: 50%;
> .icon {
font-size: 35px;
transform: translateY(-50%);
}
}
}
}

2
app/assets/sass/components/_pagination.scss
View file

@ -1,6 +1,6 @@
.pagination {
@extend .nav;
@extend .center-block;
margin-top: 1em;
margin-bottom: 1em;