diff --git a/src/app/pages/tables/components/smartTables/smartTables.html b/src/app/pages/tables/components/smartTables/smartTables.html index bd69e31e..69ac05d4 100644 --- a/src/app/pages/tables/components/smartTables/smartTables.html +++ b/src/app/pages/tables/components/smartTables/smartTables.html @@ -1,7 +1,7 @@
- +
diff --git a/src/app/pages/tables/components/smartTables/smartTables.scss b/src/app/pages/tables/components/smartTables/smartTables.scss index 0d966c81..0ccb087b 100644 --- a/src/app/pages/tables/components/smartTables/smartTables.scss +++ b/src/app/pages/tables/components/smartTables/smartTables.scss @@ -3,16 +3,21 @@ .ng2-smart-table-container table.ng2-smart-table { th, td { border: 1px solid $border; + line-height: 35px; } color: $default-text; + input { + line-height: 1.5!important; + } + a.ng2-smart-sort-link { font-size: 14px !important; color: $default-text; - font-weight: $font-bold; + font-weight: $font-bolder; &.sort { - font-weight: $font-bold !important; + font-weight: $font-bolder !important; } } @@ -31,6 +36,7 @@ a.ng2-smart-action { font-size: 14px !important; color: $default-text; + padding: 0 5px; &.ng2-smart-action-add-add { font-size: 25px !important; @@ -42,14 +48,3 @@ nav.ng2-smart-pagination-nav { display: flex; 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; - } - } -} diff --git a/src/app/theme/sass/_table.scss b/src/app/theme/sass/_table.scss index 20081c8d..c282fca0 100644 --- a/src/app/theme/sass/_table.scss +++ b/src/app/theme/sass/_table.scss @@ -316,8 +316,8 @@ th { .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { - background-color: $primary; - border-color: $border; + background-color: rgba(0,0,0,.3)!important; + border-color: $border!important; } .pagination > li > a:hover, @@ -328,6 +328,11 @@ th { 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 { margin-right: 0; } diff --git a/src/app/theme/sass/conf/_variables.scss b/src/app/theme/sass/conf/_variables.scss index bf041af0..275f21d0 100644 --- a/src/app/theme/sass/conf/_variables.scss +++ b/src/app/theme/sass/conf/_variables.scss @@ -27,6 +27,7 @@ $font-thin: 100; $font-light: 300; $font-normal: 400; $font-bold: 700; +$font-bolder: 500; $font-ultraBold: 900; $facebook-color: #3b5998;