Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-17 07:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/ng2-smart-table-int' into development

Browse source
This commit is contained in:
nixa 2016-08-23 11:38:57 +03:00
commit 463100ad7b
4 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/pages/tables/components/smartTables/smartTables.html
View file

@ -1,7 +1,7 @@
<div class="widgets"> <div class="widgets">
<div class="row"> <div class="row">
<ba-card title="Basic Example"> <ba-card title="Basic Example" baCardClass="with-scroll">
<div class="row"> <div class="row">
<div class="form-group col-sm-3 col-xs-6"> <div class="form-group col-sm-3 col-xs-6">
<input type="text" class="form-control" placeholder="Search" [(ngModel)]="query" (keydown.enter)="onSearch()"> <input type="text" class="form-control" placeholder="Search" [(ngModel)]="query" (keydown.enter)="onSearch()">

21
src/app/pages/tables/components/smartTables/smartTables.scss
View file

@ -3,16 +3,21 @@
.ng2-smart-table-container table.ng2-smart-table { .ng2-smart-table-container table.ng2-smart-table {
th, td { th, td {
border: 1px solid $border; border: 1px solid $border;
line-height: 35px;
} }
color: $default-text; color: $default-text;
input {
line-height: 1.5!important;
}
a.ng2-smart-sort-link { a.ng2-smart-sort-link {
font-size: 14px !important; font-size: 14px !important;
color: $default-text; color: $default-text;
font-weight: $font-bold; font-weight: $font-bolder;
&.sort { &.sort {
font-weight: $font-bold !important; font-weight: $font-bolder !important;
} }
} }
@ -31,6 +36,7 @@
a.ng2-smart-action { a.ng2-smart-action {
font-size: 14px !important; font-size: 14px !important;
color: $default-text; color: $default-text;
padding: 0 5px;
&.ng2-smart-action-add-add { &.ng2-smart-action-add-add {
font-size: 25px !important; font-size: 25px !important;
@ -42,14 +48,3 @@ nav.ng2-smart-pagination-nav {
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.ng2-smart-pagination {
.ng2-smart-page-item.active .ng2-smart-page-link {
background-color: $primary;
border-color: $default-text;
&:active, &:hover {
background-color: $primary;
border-color: $default-text;
}
}
}

9
src/app/theme/sass/_table.scss
View file

@ -316,8 +316,8 @@ th {
.pagination > .active > span:hover, .pagination > .active > span:hover,
.pagination > .active > a:focus, .pagination > .active > a:focus,
.pagination > .active > span:focus { .pagination > .active > span:focus {
background-color: $primary; background-color: rgba(0,0,0,.3)!important;
border-color: $border; border-color: $border!important;
} }
.pagination > li > a:hover, .pagination > li > a:hover,
@ -328,6 +328,11 @@ th {
color: $default-text; color: $default-text;
} }
.page-item.disabled .page-link, .page-item.disabled .page-link:focus, .page-item.disabled .page-link:hover {
background-color: rgba(255,255,255,.1);
color: $default-text;
}
.editable-buttons .btn-with-icon i { .editable-buttons .btn-with-icon i {
margin-right: 0; margin-right: 0;
} }

1
src/app/theme/sass/conf/_variables.scss
View file

@ -27,6 +27,7 @@ $font-thin: 100;
$font-light: 300; $font-light: 300;
$font-normal: 400; $font-normal: 400;
$font-bold: 700; $font-bold: 700;
$font-bolder: 500;
$font-ultraBold: 900; $font-ultraBold: 900;
$facebook-color: #3b5998; $facebook-color: #3b5998;