Browse Source

the usual post-merge layout cleanups

remotes/philippdormann/main
Philipp Dormann 4 years ago
parent
commit
6e02beb350
No known key found for this signature in database GPG Key ID: 3BB9ADD52DCA4314
  1. 2
      src/assets/app.scss
  2. 2
      src/assets/vars.scss
  3. 2
      src/components/HeartbeatBar.vue
  4. 2
      src/components/MonitorList.vue
  5. 6
      src/layouts/Layout.vue
  6. 5
      src/pages/EditMonitor.vue
  7. 4
      src/pages/Settings.vue

2
src/assets/app.scss

@ -43,7 +43,7 @@ h2 {
.shadow-box { .shadow-box {
//overflow: hidden; // Forget why add this, but multiple select hide by this //overflow: hidden; // Forget why add this, but multiple select hide by this
box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1); // box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1);
padding: 10px; padding: 10px;
border-radius: 10px; border-radius: 10px;

2
src/assets/vars.scss

@ -2,7 +2,7 @@ $primary: #5cdd8b;
$danger: #dc3545; $danger: #dc3545;
$warning: #f8a306; $warning: #f8a306;
$link-color: #111; $link-color: #111;
$border-radius: 50rem; $border-radius: .25rem;
$highlight: #7ce8a4; $highlight: #7ce8a4;
$highlight-white: #e7faec; $highlight-white: #e7faec;

2
src/components/HeartbeatBar.vue

@ -177,7 +177,7 @@ export default {
border-radius: 50rem; border-radius: 50rem;
&.empty { &.empty {
background-color: aliceblue; background-color: #969696;
} }
&.down { &.down {

2
src/components/MonitorList.vue

@ -124,7 +124,7 @@ export default {
} }
&.active { &.active {
background-color: #cdf8f4; background-color: #5cdd8b40;
} }
} }
} }

6
src/layouts/Layout.vue

@ -13,9 +13,9 @@
<span class="fs-4 title">Uptime Kuma</span> <span class="fs-4 title">Uptime Kuma</span>
</router-link> </router-link>
<a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/uptime-kuma/releases" class="btn btn-info me-3"> <!-- <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/uptime-kuma/releases" class="btn btn-info me-3">
<font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("New Update") }} <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("New Update") }}
</a> </a> -->
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class="nav-item"> <li class="nav-item">
@ -148,7 +148,7 @@ export default {
height: 100%; height: 100%;
padding: 8px 10px 0; padding: 8px 10px 0;
font-size: 13px; font-size: 13px;
color: #c1c1c1; color: #616161;
overflow: hidden; overflow: hidden;
text-decoration: none; text-decoration: none;

5
src/pages/EditMonitor.vue

@ -3,7 +3,7 @@
<div> <div>
<h1 class="mb-3">{{ pageName }}</h1> <h1 class="mb-3">{{ pageName }}</h1>
<form @submit.prevent="submit"> <form @submit.prevent="submit">
<div class="shadow-box"> <div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h2 class="mb-2">{{ $t("General") }}</h2> <h2 class="mb-2">{{ $t("General") }}</h2>
@ -364,7 +364,7 @@ export default {
@import "../assets/vars.scss"; @import "../assets/vars.scss";
.multiselect__tags { .multiselect__tags {
border-radius: 1.5rem; // border-radius: 1.5rem;
border: 1px solid #ced4da; border: 1px solid #ced4da;
min-height: 38px; min-height: 38px;
padding: 6px 40px 0 8px; padding: 6px 40px 0 8px;
@ -383,7 +383,6 @@ export default {
} }
.multiselect__tag { .multiselect__tag {
border-radius: 50rem;
margin-bottom: 0; margin-bottom: 0;
padding: 6px 26px 6px 10px; padding: 6px 26px 6px 10px;
background: $primary !important; background: $primary !important;

4
src/pages/Settings.vue

@ -166,9 +166,7 @@
<footer> <footer>
<div class="container-fluid"> <div class="container-fluid">
Uptime Kuma - Uptime Kuma v{{ $root.info.version }}
{{ $t("Version") }}: {{ $root.info.version }} -
<a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a>
</div> </div>
</footer> </footer>

Loading…
Cancel
Save