diff --git a/.stylelintrc b/.stylelintrc index 00ddcaaef..0bcdb7c27 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -10,6 +10,7 @@ "color-function-notation": "legacy", "shorthand-property-no-redundant-values": null, "color-hex-length": null, - "declaration-block-no-redundant-longhand-properties": null + "declaration-block-no-redundant-longhand-properties": null, + "at-rule-no-unknown": null } } diff --git a/src/assets/app.scss b/src/assets/app.scss index 0eff9a069..0d3f0454e 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -111,6 +111,10 @@ optgroup { padding-right: 20px; } +.btn-sm { + border-radius: 25px; +} + .btn-primary { color: white; @@ -158,6 +162,26 @@ optgroup { background-color: #161B22; } +.btn-outline-normal { + padding: 4px 10px; + border: 1px solid #ced4da; + border-radius: 25px; + background-color: transparent; + + .dark & { + color: $dark-font-color; + border: 1px solid $dark-font-color2; + } + + &.active { + background-color: $highlight-white; + + .dark & { + background-color: $dark-font-color2; + } + } +} + @media (max-width: 550px) { .table-shadow-box { padding: 10px !important; @@ -436,7 +460,6 @@ optgroup { .monitor-list { &.scrollbar { overflow-y: auto; - height: calc(100% - 107px); } @media (max-width: 770px) { diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue index 9ee46e243..887341ba8 100644 --- a/src/components/MonitorList.vue +++ b/src/components/MonitorList.vue @@ -2,6 +2,10 @@