diff --git a/static/css/base.css b/static/css/base.css index 379fc1b9..655c9a19 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -83,3 +83,7 @@ pre { .nav-pills > li > a { color: #888; } + +.jumbotron p { + font-weight: 300; +} \ No newline at end of file diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css index 9d8ff47e..0083ca9e 100644 --- a/static/css/bootstrap.css +++ b/static/css/bootstrap.css @@ -268,7 +268,7 @@ html { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } body { - font-family: "Open Sans", Arial, sans-serif; + font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; font-size: 14px; line-height: 1.42857143; color: #333333; @@ -308,14 +308,14 @@ img { height: auto; } .img-rounded { - border-radius: 6px; + border-radius: 3px; } .img-thumbnail { padding: 4px; line-height: 1.42857143; background-color: #ffffff; border: 1px solid #dddddd; - border-radius: 4px; + border-radius: 2px; -webkit-transition: all 0.2s ease-in-out; -o-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -721,14 +721,14 @@ code { font-size: 90%; color: #222222; background-color: transparent; - border-radius: 4px; + border-radius: 2px; } kbd { padding: 2px 4px; font-size: 90%; color: #ffffff; background-color: #333333; - border-radius: 3px; + border-radius: 2px; box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); } kbd kbd { @@ -748,7 +748,7 @@ pre { color: #333333; background-color: #f5f5f5; border: 1px solid #cccccc; - border-radius: 4px; + border-radius: 2px; } pre code { padding: 0; @@ -1739,7 +1739,7 @@ output { background-color: #ffffff; background-image: none; border: 1px solid #cccccc; - border-radius: 4px; + border-radius: 2px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; @@ -1891,7 +1891,7 @@ fieldset[disabled] .checkbox label { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; + border-radius: 2px; } select.input-sm { height: 30px; @@ -1906,7 +1906,7 @@ select[multiple].input-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; + border-radius: 2px; } .form-group-sm select.form-control { height: 30px; @@ -1928,7 +1928,7 @@ select[multiple].input-sm { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; + border-radius: 3px; } select.input-lg { height: 46px; @@ -1943,7 +1943,7 @@ select[multiple].input-lg { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; + border-radius: 3px; } .form-group-lg select.form-control { height: 46px; @@ -2196,7 +2196,7 @@ select[multiple].input-lg { padding: 6px 12px; font-size: 14px; line-height: 1.42857143; - border-radius: 4px; + border-radius: 2px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -2618,21 +2618,21 @@ fieldset[disabled] .btn-link:focus { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; + border-radius: 3px; } .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; + border-radius: 2px; } .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; - border-radius: 3px; + border-radius: 2px; } .btn-block { display: block; @@ -2712,7 +2712,7 @@ tbody.collapse.in { background-color: #ffffff; border: 1px solid #cccccc; border: 1px solid rgba(0, 0, 0, 0.15); - border-radius: 4px; + border-radius: 2px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; @@ -2942,16 +2942,16 @@ tbody.collapse.in { border-radius: 0; } .btn-group-vertical > .btn:first-child:not(:last-child) { - border-top-right-radius: 4px; - border-top-left-radius: 4px; + border-top-right-radius: 2px; + border-top-left-radius: 2px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } .btn-group-vertical > .btn:last-child:not(:first-child) { border-top-right-radius: 0; border-top-left-radius: 0; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; @@ -3018,7 +3018,7 @@ tbody.collapse.in { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; + border-radius: 3px; } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, @@ -3041,7 +3041,7 @@ select[multiple].input-group-lg > .input-group-btn > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; + border-radius: 2px; } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, @@ -3082,17 +3082,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { text-align: center; background-color: #eeeeee; border: 1px solid #cccccc; - border-radius: 4px; + border-radius: 2px; } .input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; - border-radius: 3px; + border-radius: 2px; } .input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; - border-radius: 6px; + border-radius: 3px; } .input-group-addon input[type="radio"], .input-group-addon input[type="checkbox"] { @@ -3204,7 +3204,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-right: 2px; line-height: 1.42857143; border: 1px solid transparent; - border-radius: 4px 4px 0 0; + border-radius: 2px 2px 0 0; } .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #dddddd; @@ -3244,7 +3244,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs.nav-justified > li > a { margin-right: 0; - border-radius: 4px; + border-radius: 2px; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, @@ -3254,7 +3254,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #dddddd; - border-radius: 4px 4px 0 0; + border-radius: 2px 2px 0 0; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, @@ -3266,7 +3266,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: left; } .nav-pills > li > a { - border-radius: 4px; + border-radius: 2px; } .nav-pills > li + li { margin-left: 2px; @@ -3312,7 +3312,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs-justified > li > a { margin-right: 0; - border-radius: 4px; + border-radius: 2px; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, @@ -3322,7 +3322,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #dddddd; - border-radius: 4px 4px 0 0; + border-radius: 2px 2px 0 0; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, @@ -3349,7 +3349,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } @media (min-width: 768px) { .navbar { - border-radius: 4px; + border-radius: 2px; } } @media (min-width: 768px) { @@ -3477,7 +3477,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: transparent; background-image: none; border: 1px solid transparent; - border-radius: 4px; + border-radius: 2px; } .navbar-toggle:focus { outline: 0; @@ -3627,8 +3627,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; - border-top-right-radius: 4px; - border-top-left-radius: 4px; + border-top-right-radius: 2px; + border-top-left-radius: 2px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -3870,7 +3870,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { margin-bottom: 20px; list-style: none; background-color: #f5f5f5; - border-radius: 4px; + border-radius: 2px; } .breadcrumb > li { display: inline-block; @@ -4017,7 +4017,7 @@ a.badge:focus { } .container .jumbotron, .container-fluid .jumbotron { - border-radius: 6px; + border-radius: 3px; padding-left: 15px; padding-right: 15px; } @@ -4043,7 +4043,7 @@ a.badge:focus { padding: 15px; margin-bottom: 20px; border: 1px solid transparent; - border-radius: 4px; + border-radius: 2px; } .alert h4 { margin-top: 0; @@ -4127,13 +4127,13 @@ a.badge:focus { border: 1px solid #dddddd; } .list-group-item:first-child { - border-top-right-radius: 4px; - border-top-left-radius: 4px; + border-top-right-radius: 2px; + border-top-left-radius: 2px; } .list-group-item:last-child { margin-bottom: 0; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; } a.list-group-item, button.list-group-item { @@ -4324,7 +4324,7 @@ button.list-group-item-danger.active:focus { margin-bottom: 20px; background-color: #ffffff; border: 1px solid transparent; - border-radius: 4px; + border-radius: 2px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); } @@ -4334,8 +4334,8 @@ button.list-group-item-danger.active:focus { .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; - border-top-right-radius: 3px; - border-top-left-radius: 3px; + border-top-right-radius: 1px; + border-top-left-radius: 1px; } .panel-heading > .dropdown .dropdown-toggle { color: inherit; @@ -4357,8 +4357,8 @@ button.list-group-item-danger.active:focus { padding: 10px 15px; background-color: #f5f5f5; border-top: 1px solid #dddddd; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; + border-bottom-right-radius: 1px; + border-bottom-left-radius: 1px; } .panel > .list-group, .panel > .panel-collapse > .list-group { @@ -4372,14 +4372,14 @@ button.list-group-item-danger.active:focus { .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; - border-top-right-radius: 3px; - border-top-left-radius: 3px; + border-top-right-radius: 1px; + border-top-left-radius: 1px; } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { border-bottom: 0; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; + border-bottom-right-radius: 1px; + border-bottom-left-radius: 1px; } .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { border-top-right-radius: 0; @@ -4404,15 +4404,15 @@ button.list-group-item-danger.active:focus { } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { - border-top-right-radius: 3px; - border-top-left-radius: 3px; + border-top-right-radius: 1px; + border-top-left-radius: 1px; } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child { - border-top-left-radius: 3px; - border-top-right-radius: 3px; + border-top-left-radius: 1px; + border-top-right-radius: 1px; } .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, @@ -4422,7 +4422,7 @@ button.list-group-item-danger.active:focus { .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { - border-top-left-radius: 3px; + border-top-left-radius: 1px; } .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, @@ -4432,19 +4432,19 @@ button.list-group-item-danger.active:focus { .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { - border-top-right-radius: 3px; + border-top-right-radius: 1px; } .panel > .table:last-child, .panel > .table-responsive:last-child > .table:last-child { - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; + border-bottom-right-radius: 1px; + border-bottom-left-radius: 1px; } .panel > .table:last-child > tbody:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; + border-bottom-left-radius: 1px; + border-bottom-right-radius: 1px; } .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, @@ -4454,7 +4454,7 @@ button.list-group-item-danger.active:focus { .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { - border-bottom-left-radius: 3px; + border-bottom-left-radius: 1px; } .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, @@ -4464,7 +4464,7 @@ button.list-group-item-danger.active:focus { .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { - border-bottom-right-radius: 3px; + border-bottom-right-radius: 1px; } .panel > .panel-body + .table, .panel > .panel-body + .table-responsive, @@ -4537,7 +4537,7 @@ button.list-group-item-danger.active:focus { } .panel-group .panel { margin-bottom: 0; - border-radius: 4px; + border-radius: 2px; } .panel-group .panel + .panel { margin-top: 5px; @@ -4733,7 +4733,7 @@ button.close { background-color: #ffffff; border: 1px solid #999999; border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; + border-radius: 3px; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); background-clip: padding-box; @@ -4815,7 +4815,7 @@ button.close { position: absolute; z-index: 1070; display: block; - font-family: "Open Sans", Arial, sans-serif; + font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; @@ -4860,7 +4860,7 @@ button.close { color: #ffffff; text-align: center; background-color: #000000; - border-radius: 4px; + border-radius: 2px; } .tooltip-arrow { position: absolute; @@ -4933,7 +4933,7 @@ button.close { display: none; max-width: 276px; padding: 1px; - font-family: "Open Sans", Arial, sans-serif; + font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; @@ -4953,7 +4953,7 @@ button.close { background-clip: padding-box; border: 1px solid #cccccc; border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; + border-radius: 3px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); } @@ -4975,7 +4975,7 @@ button.close { font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; - border-radius: 5px 5px 0 0; + border-radius: 2px 2px 0 0; } .popover-content { padding: 9px 14px; diff --git a/static/css/settings.css b/static/css/settings.css index 11b1e4a9..1d900d70 100644 --- a/static/css/settings.css +++ b/static/css/settings.css @@ -23,4 +23,8 @@ margin-left: 24px; border-color: #d43f3a; color: #d43f3a; +} + +#close-account:hover { + background-color: #ffebea; } \ No newline at end of file diff --git a/static/js/channels.js b/static/js/channels.js index 3d9d4e57..aabc1409 100644 --- a/static/js/channels.js +++ b/static/js/channels.js @@ -38,7 +38,7 @@ $(function() { var $this = $(this); $("#remove-channel-form").attr("action", $this.data("url")); - $(".remove-channel-name").text($this.data("name")); + $(".remove-channel-kind").text($this.data("kind")); $('#remove-channel-modal').modal("show"); return false; diff --git a/stuff/bootstrap/variables.less b/stuff/bootstrap/variables.less index b4e6a721..cc0f7cc0 100755 --- a/stuff/bootstrap/variables.less +++ b/stuff/bootstrap/variables.less @@ -42,7 +42,7 @@ // //## Font, line-height, and color for body text, headings, and more. -@font-family-sans-serif: "Open Sans", Arial, sans-serif; +@font-family-sans-serif: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; //** Default monospace fonts for ``, ``, and `
`.
 @font-family-monospace:   "Lucida Console", Monaco, monospace;
@@ -103,9 +103,9 @@
 @line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
 @line-height-small:         1.5;
 
-@border-radius-base:        4px;
-@border-radius-large:       6px;
-@border-radius-small:       3px;
+@border-radius-base:        2px;
+@border-radius-large:       3px;
+@border-radius-small:       2px;
 
 //** Global color for active items (e.g., navs or dropdowns).
 @component-active-color:    #fff;
diff --git a/templates/accounts/login.html b/templates/accounts/login.html
index 03a70c67..c93e4eda 100644
--- a/templates/accounts/login.html
+++ b/templates/accounts/login.html
@@ -12,7 +12,7 @@
                 

Please use the form below to request a fresh login link:

{% else %} -

Health Checks

+

Healthchecks

{% if show_password %} diff --git a/templates/accounts/notifications.html b/templates/accounts/notifications.html index 99a75a9a..67e4300f 100644 --- a/templates/accounts/notifications.html +++ b/templates/accounts/notifications.html @@ -26,7 +26,7 @@

-
+

Monthly Reports

diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html index 89e83cd3..e64e7d6b 100644 --- a/templates/accounts/profile.html +++ b/templates/accounts/profile.html @@ -28,7 +28,7 @@
-
+
@@ -162,7 +162,7 @@