diff --git a/scss/_variables.scss b/scss/_variables.scss
index 01036bd1a1f0d165aaf32b9bdbc0b928cf1a9324..cecc97b9be64ae147b0b618cfc5c2cc850fce317 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -42,7 +42,7 @@ $black: #000000 !default;
$white: #ffffff !default;
$light: #f5f7fb !default;
-$dark: #495057 !default;
+$dark: #354052 !default;
$body-bg: $light !default;
$body-color: $dark !default;
diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss
index 9a9f4ef3c8672a2660a1222def49278779ed5b4d..e1108abcef5c8648534fb7222e261afd4a3922a9 100644
--- a/scss/layout/_navbar.scss
+++ b/scss/layout/_navbar.scss
@@ -193,7 +193,7 @@ Sidebar
}
.navbar-heading {
- @extend .text-subheader;
+ @extend .subheader;
margin: 0 0 .5rem;
}
diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss
index 2582db5e41e18a084c6a473cd686c8356641dc19..51b806ada35323b8d1ccd655fbb4757a5472824f 100644
--- a/scss/layout/_page.scss
+++ b/scss/layout/_page.scss
@@ -1,19 +1,16 @@
.page-title-box {
- display: flex;
- align-items: center;
min-height: 2.5rem;
- margin: .5rem 0 1.5rem;
+ margin: .75rem 0 2rem;
+}
+
+.page-pretitle {
+ @extend .subheader;
}
.page-title {
margin: 0;
font-size: $h2-font-size;
font-weight: 400;
- line-height: 2.5rem;
color: $body-color;
-}
-
-.page-title-options {
- margin-left: auto;
- color: $text-muted;
+ line-height: 1;
}
diff --git a/scss/tabler.scss b/scss/tabler.scss
index a5708d1bd09c2e823afb038667a5b0cd2d2f37e2..592d6c9b29450a76090e1f14b78721fca18710d5 100644
--- a/scss/tabler.scss
+++ b/scss/tabler.scss
@@ -57,7 +57,6 @@
@import "utils/background";
@import "utils/colors";
@import "utils/scroll";
-@import "utils/text";
@import "utils/sizing";
@import "utils/opacity";
@import "utils/shadow";
diff --git a/scss/ui/_typo.scss b/scss/ui/_typo.scss
index 3b28d4c8b45c2e2020bf1d97722ae8a2427c2ae3..5757f14df16dec1002cb15fbf29d1a677266844d 100644
--- a/scss/ui/_typo.scss
+++ b/scss/ui/_typo.scss
@@ -91,3 +91,46 @@ Selection
color: #fff;
background-color: lighten($primary, 8%);
}
+
+
+/**
+Subheader
+ */
+.subheader {
+ font-size: $h6-font-size;
+ font-weight: 600;
+ color: $text-muted;
+ text-transform: uppercase;
+ letter-spacing: .04em;
+}
+
+/**
+Antialiasing
+ */
+.antialiased {
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.subpixel-antialiased {
+ -webkit-font-smoothing: auto;
+ -moz-osx-font-smoothing: auto;
+}
+
+/**
+Markdown
+ */
+.markdown {
+
+ > :first-child {
+ margin-top: 0;
+ }
+
+ > :last-child {
+ margin-bottom: 0;
+ }
+
+ table {
+ @extend .table, .table-bordered;
+ }
+}
diff --git a/scss/utils/_text.scss b/scss/utils/_text.scss
index ee8475eaf269250427115f58d630d2bbd57cae1d..59eb4f0982156dcceed3c11f2ddb58a301fd5b09 100644
--- a/scss/utils/_text.scss
+++ b/scss/utils/_text.scss
@@ -1,40 +1 @@
// stylelint-disable declaration-no-important
-
-.text-subheader {
- font-size: $h6-font-size;
- font-weight: 600;
- color: $text-muted;
- text-transform: uppercase;
- letter-spacing: .04em;
-}
-
-/**
-Antialiasing
- */
-.antialiased {
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.subpixel-antialiased {
- -webkit-font-smoothing: auto;
- -moz-osx-font-smoothing: auto;
-}
-
-/**
-Markdown
- */
-.markdown {
-
- > :first-child {
- margin-top: 0;
- }
-
- > :last-child {
- margin-bottom: 0;
- }
-
- table {
- @extend .table, .table-bordered;
- }
-}