From e0bb5920f8fafb4e82dd1947a597c83ef1d4333a Mon Sep 17 00:00:00 2001 From: Max Ignatenko Date: Fri, 12 Feb 2021 15:33:50 +0000 Subject: [PATCH 1/9] Add bulma 0.9.2 as a submodule --- .gitmodules | 4 ++++ MaxPowerLevel/Views/bulma | 1 + 2 files changed, 5 insertions(+) create mode 160000 MaxPowerLevel/Views/bulma diff --git a/.gitmodules b/.gitmodules index e69de29..7f98512 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "MaxPowerLevel/Views/bulma"] + path = MaxPowerLevel/Views/bulma + url = git@github.com:jgthms/bulma.git + branch = 0.9.2 diff --git a/MaxPowerLevel/Views/bulma b/MaxPowerLevel/Views/bulma new file mode 160000 index 0000000..c5edaea --- /dev/null +++ b/MaxPowerLevel/Views/bulma @@ -0,0 +1 @@ +Subproject commit c5edaea84f289b1e92f406b6d38de40970262e46 From 0edcc9c37731f66a89285c9901c207e154ef1c14 Mon Sep 17 00:00:00 2001 From: Max Ignatenko Date: Fri, 12 Feb 2021 18:41:14 +0000 Subject: [PATCH 2/9] Build Bulma from .sass sources --- MaxPowerLevel/MaxPowerLevel.csproj | 48 ++++++++++++++++---- MaxPowerLevel/Views/Shared/_Layout.cshtml | 2 +- MaxPowerLevel/wwwroot/css/bulma-default.scss | 1 + 3 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 MaxPowerLevel/wwwroot/css/bulma-default.scss diff --git a/MaxPowerLevel/MaxPowerLevel.csproj b/MaxPowerLevel/MaxPowerLevel.csproj index d110809..d8569ea 100644 --- a/MaxPowerLevel/MaxPowerLevel.csproj +++ b/MaxPowerLevel/MaxPowerLevel.csproj @@ -1,11 +1,39 @@ + - - netcoreapp3.1 - ed64c0be-3d6b-4283-b887-4dcb9de6293a - - - - - - - \ No newline at end of file + + netcoreapp3.1 + ed64c0be-3d6b-4283-b887-4dcb9de6293a + + + + + + + + + + + + true + + + + + + + + PreserveNewest + + + + + + + + + + + + + + diff --git a/MaxPowerLevel/Views/Shared/_Layout.cshtml b/MaxPowerLevel/Views/Shared/_Layout.cshtml index b2dd3f3..6e7f501 100644 --- a/MaxPowerLevel/Views/Shared/_Layout.cshtml +++ b/MaxPowerLevel/Views/Shared/_Layout.cshtml @@ -11,7 +11,7 @@ - + diff --git a/MaxPowerLevel/wwwroot/css/bulma-default.scss b/MaxPowerLevel/wwwroot/css/bulma-default.scss new file mode 100644 index 0000000..bdeb942 --- /dev/null +++ b/MaxPowerLevel/wwwroot/css/bulma-default.scss @@ -0,0 +1 @@ +@import '../../Views/bulma/bulma'; From 4ce1a0bc3623d0b8bf76bbda47d0de7c3803384f Mon Sep 17 00:00:00 2001 From: Max Ignatenko Date: Fri, 12 Feb 2021 20:34:27 +0000 Subject: [PATCH 3/9] Move navbar text color override to .scss file --- MaxPowerLevel/wwwroot/css/bulma-default.scss | 4 +++- MaxPowerLevel/wwwroot/css/site.css | 7 +------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/MaxPowerLevel/wwwroot/css/bulma-default.scss b/MaxPowerLevel/wwwroot/css/bulma-default.scss index bdeb942..659965e 100644 --- a/MaxPowerLevel/wwwroot/css/bulma-default.scss +++ b/MaxPowerLevel/wwwroot/css/bulma-default.scss @@ -1 +1,3 @@ -@import '../../Views/bulma/bulma'; +$navbar-item-color: #fff; + +@import '../../Views/bulma/bulma'; diff --git a/MaxPowerLevel/wwwroot/css/site.css b/MaxPowerLevel/wwwroot/css/site.css index 88ab4cb..0389d76 100644 --- a/MaxPowerLevel/wwwroot/css/site.css +++ b/MaxPowerLevel/wwwroot/css/site.css @@ -54,11 +54,6 @@ img.char-icon { margin-right: 1rem; } -/* Override bulma responsive navbar */ -.navbar-item { - color: #fff !important; -} - .navbar-end { justify-content: flex-end !important; margin-left: auto !important; @@ -303,4 +298,4 @@ table.dash-board-table th:first-child { border-left: none; } .all-chars-link { text-align: center; -} \ No newline at end of file +} From 314e9eb8fc4bfc0633430f9d381656d7643c1d72 Mon Sep 17 00:00:00 2001 From: Max Ignatenko Date: Fri, 12 Feb 2021 23:03:01 +0000 Subject: [PATCH 4/9] Add dark CSS file .has-background-light was removed from footer, and replaced with "$footer-background-color: $light;" in default CSS. --- .gitmodules | 3 +++ MaxPowerLevel/MaxPowerLevel.csproj | 5 +++-- MaxPowerLevel/Views/Shared/_Layout.cshtml | 2 +- MaxPowerLevel/Views/bulmaswatch | 1 + MaxPowerLevel/wwwroot/css/bulma-dark.scss | 21 ++++++++++++++++++++ MaxPowerLevel/wwwroot/css/bulma-default.scss | 11 +++++++++- MaxPowerLevel/wwwroot/css/site.css | 4 ++-- 7 files changed, 41 insertions(+), 6 deletions(-) create mode 160000 MaxPowerLevel/Views/bulmaswatch create mode 100644 MaxPowerLevel/wwwroot/css/bulma-dark.scss diff --git a/.gitmodules b/.gitmodules index 7f98512..a0aef7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = MaxPowerLevel/Views/bulma url = git@github.com:jgthms/bulma.git branch = 0.9.2 +[submodule "MaxPowerLevel/Views/bulmaswatch"] + path = MaxPowerLevel/Views/bulmaswatch + url = https://github.com/jenil/bulmaswatch.git diff --git a/MaxPowerLevel/MaxPowerLevel.csproj b/MaxPowerLevel/MaxPowerLevel.csproj index d8569ea..c83fb88 100644 --- a/MaxPowerLevel/MaxPowerLevel.csproj +++ b/MaxPowerLevel/MaxPowerLevel.csproj @@ -11,6 +11,7 @@ + @@ -18,7 +19,7 @@ - + @@ -36,4 +37,4 @@ - + \ No newline at end of file diff --git a/MaxPowerLevel/Views/Shared/_Layout.cshtml b/MaxPowerLevel/Views/Shared/_Layout.cshtml index 6e7f501..7569de0 100644 --- a/MaxPowerLevel/Views/Shared/_Layout.cshtml +++ b/MaxPowerLevel/Views/Shared/_Layout.cshtml @@ -45,7 +45,7 @@ -