From 7014fff3fc56bd917164cdbd7df268c3a0e1c625 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Sat, 30 Jun 2018 15:22:56 -0700 Subject: [PATCH] SASSy --- .travis.yml | 2 +- Dockerfile | 2 +- handlers/settings.go | 2 +- source/css/base.css | 175 +++++++++++---- source/css/base.css.map | 4 +- source/scss/base.scss | 225 ++++++++++++-------- source/scss/mobile.scss | 83 ++++++++ source/scss/variables.scss | 35 ++- source/tmpl/dashboard.html | 3 +- source/tmpl/index.html | 16 +- source/tmpl/login.html | 11 - source/tmpl/service.html | 25 +-- source/tmpl/{plugins.html => settings.html} | 57 ++--- source/tmpl/users.html | 16 +- 14 files changed, 435 insertions(+), 221 deletions(-) create mode 100644 source/scss/mobile.scss rename source/tmpl/{plugins.html => settings.html} (77%) diff --git a/.travis.yml b/.travis.yml index 337615ae..add558f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ services: env: global: - - VERSION=0.28.1 + - VERSION=0.28.2 - DB_HOST=localhost - DB_USER=travis - DB_PASS= diff --git a/Dockerfile b/Dockerfile index e17dc0e6..be4fac50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest -ENV VERSION=v0.28.1 +ENV VERSION=v0.28.2 RUN apk --no-cache add libstdc++ ca-certificates RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \ diff --git a/handlers/settings.go b/handlers/settings.go index b7d67813..d47266e1 100644 --- a/handlers/settings.go +++ b/handlers/settings.go @@ -27,7 +27,7 @@ func PluginsHandler(w http.ResponseWriter, r *http.Request) { //CoreApp.PluginFields = pluginFields fmt.Println(core.CoreApp.Communications) - ExecuteResponse(w, r, "plugins.html", core.CoreApp) + ExecuteResponse(w, r, "settings.html", core.CoreApp) } func SaveSettingsHandler(w http.ResponseWriter, r *http.Request) { diff --git a/source/css/base.css b/source/css/base.css index a8578a43..e4f44474 100644 --- a/source/css/base.css +++ b/source/css/base.css @@ -1,3 +1,10 @@ +/* Index Page */ +/* Status Container */ +/* Button Colors */ +/* Footer Settings */ +/* Global Settings */ +/* Mobile Settings */ +/* Mobile Service Container */ HTML, BODY { background-color: #fcfcfc; } @@ -6,12 +13,15 @@ HTML, BODY { padding-bottom: 20px; max-width: 860px; } -H1 { +.header-title { color: #464646; } -H5 { +.header-desc { color: #939393; } +.btn { + border-radius: 0.2rem; } + .online_list .badge { margin-top: 0.2rem; } @@ -51,7 +61,8 @@ H5 { padding: 17px 10px; } .lower_canvas SPAN { - font-size: 1rem; } + font-size: 1rem; + color: #fff; } .footer { text-decoration: none; @@ -64,21 +75,24 @@ H5 { .footer A:HOVER { color: #6d6d6d; } -.online_badge { - color: #fff; - background-color: #35b317; } +.badge { + color: white; + border-radius: 0.2rem; } -.offline_badge { - color: #fff; - background-color: #c51919; } +.btn-group { + height: 25px; } + .btn-group A { + padding: 0.1rem .75rem; + font-size: 0.8rem; } -.progress { - margin-top: -20px; - margin-left: -20px; - margin-bottom: 15px; - width: calc(100% + 40px); - height: 3px; - border-radius: 0; } +.card-body .badge { + color: #fff; } + +.nav-pills .nav-link { + border-radius: 0.2rem; } + +.form-control { + border-radius: 0.2rem; } .card { background-color: #ffffff; @@ -98,14 +112,44 @@ H5 { .btn-primary { background-color: #3e9bff; - border-color: #007bff; - color: #ffffff; } + border-color: #006fe6; + color: white; } + .btn-primary.dyn-dark { + background-color: #32a825 !important; + border-color: #2c9320 !important; } + .btn-primary.dyn-light { + background-color: #75de69 !important; + border-color: #88e37e !important; } .btn-success { background-color: #47d337; } + .btn-success.dyn-dark { + background-color: #32a825 !important; + border-color: #2c9320 !important; } + .btn-success.dyn-light { + background-color: #75de69 !important; + border-color: #88e37e !important; } .btn-danger { background-color: #dd3545; } + .btn-danger.dyn-dark { + background-color: #b61f2d !important; + border-color: #a01b28 !important; } + .btn-danger.dyn-light { + background-color: #e66975 !important; + border-color: #e97f89 !important; } + +.bg-success { + background-color: #47d337 !important; } + +.bg-danger { + background-color: #dd3545 !important; } + +.bg-success .dyn-dark { + background-color: #35b027 !important; } + +.bg-danger .dyn-dark { + background-color: #bf202f !important; } .nav-pills .nav-link.active, .nav-pills .show > .nav-link { background-color: #13a00d; } @@ -145,7 +189,62 @@ H5 { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } +@keyframes pulse_animation { + 0% { + transform: scale(1); } + 30% { + transform: scale(1); } + 40% { + transform: scale(1.02); } + 50% { + transform: scale(1); } + 60% { + transform: scale(1); } + 70% { + transform: scale(1.05); } + 80% { + transform: scale(1); } + 100% { + transform: scale(1); } } +.pulse { + animation-name: pulse_animation; + animation-duration: 1500ms; + transform-origin: 70% 70%; + animation-iteration-count: infinite; + animation-timing-function: linear; } + +@keyframes glow-grow { + 0% { + opacity: 0; + transform: scale(1); } + 80% { + opacity: 1; } + 100% { + transform: scale(2); + opacity: 0; } } +.pulse-glow { + animation-name: glow-grown; + animation-duration: 100ms; + transform-origin: 70% 30%; + animation-iteration-count: infinite; + animation-timing-function: linear; } + +.pulse-glow:before, +.pulse-glow:after { + position: absolute; + content: ''; + height: 0.5rem; + width: 1.75rem; + top: 1.2rem; + right: 2.15rem; + border-radius: 0; + box-shadow: 0 0 7px #47d337; + animation: glow-grow 2s ease-out infinite; } + @media (max-width: 767px) { + HTML, BODY { + background-color: #fcfcfc; } + .sm-container { margin-top: 40px !important; padding: 0 !important; } @@ -162,26 +261,6 @@ H5 { width: 100%; margin-bottom: 0; } - .card-body { - font-size: 6pt; - padding: 5px 5px; } - - .lg_number { - font-size: 1.5rem; } - - .stats_area { - margin-top: 35px !important; - margin-bottom: 35px !important; } - - .stats_area .col-4 { - padding-left: 0; - padding-right: 0; } - - .lower_canvas SPAN { - font-size: 0.9rem; - float: left; - color: #47d337; } - .btn-sm { line-height: 0.9rem; font-size: 0.65rem; } @@ -192,7 +271,25 @@ H5 { .card { border: 0; - border-radius: 0; } + border-radius: 0rem; + padding: 0; + background-color: #ffffff; } + + .card-body { + font-size: 6pt; + padding: 5px 5px; } + + .lg_number { + font-size: 1.5rem; } + + .stats_area { + margin-top: 1.5rem !important; + margin-bottom: 1.5rem !important; } + + .stats_area .col-4 { + padding-left: 0; + padding-right: 0; + font-size: 0.6rem; } .list-group-item { border-top: 1px solid #e4e4e4; diff --git a/source/css/base.css.map b/source/css/base.css.map index 133b7581..ca50c1a5 100644 --- a/source/css/base.css.map +++ b/source/css/base.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": "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", -"sources": ["../scss/base.scss","../scss/variables.scss"], +"mappings": "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", +"sources": ["../scss/variables.scss","../scss/base.scss","../scss/mobile.scss"], "names": [], "file": "base.css" } diff --git a/source/scss/base.scss b/source/scss/base.scss index 9c679ae0..1f86653e 100644 --- a/source/scss/base.scss +++ b/source/scss/base.scss @@ -11,14 +11,19 @@ HTML,BODY { max-width: $max-width; } -H1 { +.header-title { color: $title-color; } -H5 { +.header-desc { color: $description-color; } + +.btn { + border-radius: $global-border-radius; +} + .online_list .badge { margin-top: 0.2rem; } @@ -67,6 +72,7 @@ H5 { .lower_canvas SPAN { font-size: 1rem; + color: $service-description-color } .footer { @@ -83,23 +89,30 @@ H5 { color: #6d6d6d; } -.online_badge { - color: #fff; - background-color: #35b317; +.badge { + color: white; + border-radius: $global-border-radius; } -.offline_badge { - color: #fff; - background-color: #c51919; +.btn-group { + height: 25px; + + & A { + padding: 0.1rem .75rem; + font-size: 0.8rem; + } } -.progress { - margin-top: -20px; - margin-left: -20px; - margin-bottom: 15px; - width: calc(100% + 40px); - height: 3px; - border-radius: 0; +.card-body .badge { + color: #fff; +} + +.nav-pills .nav-link { + border-radius: $global-border-radius; +} + +.form-control { + border-radius: $global-border-radius; } .card { @@ -122,18 +135,68 @@ H5 { width: 100%; } +@mixin dynamic-color-hov($color) { + &.dyn-dark { + background-color: darken($color, 12%) !important; + border-color: darken($color, 17%) !important; + } + &.dyn-dark:HOVER { + background-color: darken($color, 17%) !important; + border-color: darken($color, 20%) !important; + } + &.dyn-light { + background-color: lighten($color, 12%) !important; + border-color: lighten($color, 17%) !important; + } + &.dyn-light:HOVER { + background-color: lighten($color, 17%) !important; + border-color: lighten($color, 20%) !important; + } +} + +@mixin dynamic-color($color) { + &.dyn-dark { + background-color: darken($color, 12%) !important; + border-color: darken($color, 17%) !important; + } + &.dyn-light { + background-color: lighten($color, 12%) !important; + border-color: lighten($color, 17%) !important; + } +} + + .btn-primary { - background-color: $button-background-color; - border-color: $button-border-color; - color: $button-color; + background-color: $primary-color; + border-color: darken($primary-color, 17%); + color: white; + @include dynamic-color($success-color); } .btn-success { background-color: $success-color; + @include dynamic-color($success-color); } .btn-danger { background-color: $danger-color; + @include dynamic-color($danger-color); +} + +.bg-success { + background-color: $success-color !important; +} + +.bg-danger { + background-color: $danger-color !important; +} + +.bg-success .dyn-dark { + background-color: darken($success-color, 10%) !important; +} + +.bg-danger .dyn-dark { + background-color: darken($danger-color, 10%) !important; } .nav-pills .nav-link.active, .nav-pills .show>.nav-link { @@ -179,85 +242,59 @@ H5 { transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } +@keyframes pulse_animation { + 0% { transform: scale(1); } + 30% { transform: scale(1); } + 40% { transform: scale(1.02); } + 50% { transform: scale(1); } + 60% { transform: scale(1); } + 70% { transform: scale(1.05); } + 80% { transform: scale(1); } + 100% { transform: scale(1); } +} -@media (max-width: 767px) { +.pulse { + animation-name: pulse_animation; + animation-duration: 1500ms; + transform-origin:70% 70%; + animation-iteration-count: infinite; + animation-timing-function: linear; +} - .sm-container { - margin-top: 40px !important; - padding: 0 !important; - } - .list-group-item H5 { - font-size: 0.9rem; - } +@keyframes glow-grow { + 0% { + opacity: 0; + transform: scale(1); + } + 80% { + opacity: 1; + } + 100% { + transform: scale(2); + opacity: 0; + } +} +.pulse-glow { + animation-name: glow-grown; + animation-duration: 100ms; + transform-origin: 70% 30%; + animation-iteration-count: infinite; + animation-timing-function: linear; +} - .container { - padding: 0 !important; - } +.pulse-glow:before, +.pulse-glow:after { + position: absolute; + content: ''; + height: 0.5rem; + width: 1.75rem; + top: 1.2rem; + right: 2.15rem; + border-radius: 0; + box-shadow: 0 0 7px #47d337; + animation: glow-grow 2s ease-out infinite; +} - .navbar { - margin-left: 0px; - margin-top: 0px; - width: 100%; - margin-bottom: 0; - } - .card-body { - font-size: 6pt; - padding: 5px 5px; - } - - .lg_number { - font-size: 1.5rem; - } - - .stats_area { - margin-top: 35px !important; - margin-bottom: 35px !important; - } - - .stats_area .col-4 { - padding-left: 0; - padding-right: 0; - } - - .lower_canvas SPAN { - font-size: 0.9rem; - float: left; - color: $service-description-color; - } - - .btn-sm { - line-height: 0.9rem; - font-size: 0.65rem; - } - - .full-col-12 { - padding-left: 0px; - padding-right: 0px; - } - - .card { - border: 0; - border-radius: 0; - } - - .list-group-item { - border-top: 1px solid #e4e4e4; - border: 0px; - } - - .list-group-item:first-child { - border-top-left-radius: 0; - border-top-right-radius: 0; - } - - .list-group-item:last-child { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } - - .list-group-item P { - font-size: 0.7rem; - } -} \ No newline at end of file +@import 'mobile'; \ No newline at end of file diff --git a/source/scss/mobile.scss b/source/scss/mobile.scss new file mode 100644 index 00000000..5ded8a0a --- /dev/null +++ b/source/scss/mobile.scss @@ -0,0 +1,83 @@ + +@media (max-width: 767px) { + + HTML,BODY { + background-color: $sm-background-color; + } + + .sm-container { + margin-top: 40px !important; + padding: 0 !important; + } + + .list-group-item H5 { + font-size: 0.9rem; + } + + .container { + padding: 0 !important; + } + + .navbar { + margin-left: 0px; + margin-top: 0px; + width: 100%; + margin-bottom: 0; + } + + .btn-sm { + line-height: 0.9rem; + font-size: 0.65rem; + } + + .full-col-12 { + padding-left: 0px; + padding-right: 0px; + } + + .card { + border: 0; + border-radius: $sm-border-radius; + padding: $sm-padding; + background-color: $sm-service-background; + } + + .card-body { + font-size: 6pt; + padding: 5px 5px; + } + + .lg_number { + font-size: $sm-service-stats-size; + } + + .stats_area { + margin-top: 1.5rem !important; + margin-bottom: 1.5rem !important; + } + + .stats_area .col-4 { + padding-left: 0; + padding-right: 0; + font-size: 0.6rem; + } + + .list-group-item { + border-top: 1px solid #e4e4e4; + border: 0px; + } + + .list-group-item:first-child { + border-top-left-radius: 0; + border-top-right-radius: 0; + } + + .list-group-item:last-child { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + + .list-group-item P { + font-size: 0.7rem; + } +} \ No newline at end of file diff --git a/source/scss/variables.scss b/source/scss/variables.scss index 0540476e..7fcbd8c8 100644 --- a/source/scss/variables.scss +++ b/source/scss/variables.scss @@ -1,23 +1,36 @@ +/* Index Page */ $background-color: #fcfcfc; $max-width: 860px; - $title-color: #464646; $description-color: #939393; +/* Status Container */ $service-background: #ffffff; $service-border: 1px solid rgba(0,0,0,.125); $service-title: #444444; -$success-color: #47d337; -$danger-color: #dd3545; - -$footer-text-color: #8d8d8d; - $service-stats-color: #47d337; -$service-description-color: #47d337; +$service-description-color: #fff; $service-stats-size: 2.3rem; -$nav-tab-color: #13a00d; +/* Button Colors */ +$success-color: #47d337; +$danger-color: #dd3545; +$primary-color: #3e9bff; -$button-color: #ffffff; -$button-background-color: #3e9bff; -$button-border-color: #007bff; \ No newline at end of file +/* Footer Settings */ +$footer-text-color: #8d8d8d; +$nav-tab-color: #13a00d; +$footer-display: block; + +/* Global Settings */ +$global-border-radius: 0.2rem; + + +/* Mobile Settings */ +$sm-background-color: #fcfcfc; +$sm-border-radius: 0rem; + +/* Mobile Service Container */ +$sm-service-background: #ffffff; +$sm-padding: 0; +$sm-service-stats-size: 1.5rem; diff --git a/source/tmpl/dashboard.html b/source/tmpl/dashboard.html index 6e05d55c..7457edc8 100644 --- a/source/tmpl/dashboard.html +++ b/source/tmpl/dashboard.html @@ -53,7 +53,6 @@ {{ end }} -

Latest Failures

{{ range .Services }} @@ -74,7 +73,7 @@ {{ end }} - +{{ end }} diff --git a/source/tmpl/index.html b/source/tmpl/index.html index 49e6becc..f68fdb5b 100644 --- a/source/tmpl/index.html +++ b/source/tmpl/index.html @@ -18,10 +18,10 @@
-

{{.Core.Name}}

+

{{.Core.Name}}

{{ if .Core.Description }} -
{{ .Core.Description }}
+
{{ .Core.Description }}
{{ end }}
@@ -30,9 +30,9 @@ {{ .Name }} {{if .Online}} - ONLINE + ONLINE {{ else }} - OFFLINE + OFFLINE {{end}} {{ end }} @@ -50,9 +50,9 @@

{{ .Name }} {{if .Online}} - ONLINE + ONLINE {{ else }} - OFFLINE + OFFLINE {{end}}

@@ -82,8 +82,8 @@ {{ end }}
- {{.SmallText}} - View Service + {{.SmallText}} + View Service
diff --git a/source/tmpl/login.html b/source/tmpl/login.html index 22d0d10a..2d3d493e 100644 --- a/source/tmpl/login.html +++ b/source/tmpl/login.html @@ -34,17 +34,6 @@
-
-
-
-
- - -
-
-
diff --git a/source/tmpl/service.html b/source/tmpl/service.html index c242be48..44fa0980 100644 --- a/source/tmpl/service.html +++ b/source/tmpl/service.html @@ -20,16 +20,16 @@
{{if .Online }} - ONLINE + ONLINE {{ else }} - OFFLINE + OFFLINE {{end}}

{{ .Name }} {{if .Online }} - ONLINE + ONLINE {{ else }} - OFFLINE + OFFLINE {{end}}

@@ -159,33 +159,28 @@

Service Checkins

- {{ range .Checkins }} -
Check #{{.Id}} Checked in {{.Ago}}
- - - -
- {{ end }} -
-
+
+
+ +
- +
- +
{{end}} diff --git a/source/tmpl/plugins.html b/source/tmpl/settings.html similarity index 77% rename from source/tmpl/plugins.html rename to source/tmpl/settings.html index c5933c5d..62574805 100644 --- a/source/tmpl/plugins.html +++ b/source/tmpl/settings.html @@ -18,7 +18,9 @@ {{template "nav"}} -
+
+ +
@@ -43,36 +45,35 @@
- - + +
- - + +
- - + +
- - + +
- -
- - +
+ +
- - + +
@@ -112,33 +113,33 @@
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
@@ -179,9 +180,9 @@
+
{{template "footer"}} - diff --git a/source/tmpl/users.html b/source/tmpl/users.html index 649e7388..ce5cb220 100644 --- a/source/tmpl/users.html +++ b/source/tmpl/users.html @@ -43,27 +43,27 @@

Create User

- +
- +
- +
- +
- +
- +
- +
- +