From adb6f849f720d43e761cba14082bc93ccba55d24 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Wed, 16 Jan 2013 20:55:47 -0800 Subject: [PATCH] more bootstrap layout changes. --- .../Content2/Bootstrap/variables.less | 4 ++-- NzbDrone.Web/Content2/Menu.css | 4 ++-- NzbDrone.Web/Content2/base.css | 1 + NzbDrone.Web/NzbDrone.Web.csproj | 3 +++ NzbDrone.Web/Views/AddSeries/bt.cshtml | 20 ++++++++++++++++++- NzbDrone.Web/Views/Settings/System.cshtml | 4 +++- NzbDrone.Web/Views/Shared/_Bootstrap.cshtml | 6 ++++-- 7 files changed, 34 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Web/Content2/Bootstrap/variables.less b/NzbDrone.Web/Content2/Bootstrap/variables.less index 0eede9b18..656b82f74 100644 --- a/NzbDrone.Web/Content2/Bootstrap/variables.less +++ b/NzbDrone.Web/Content2/Bootstrap/variables.less @@ -51,7 +51,7 @@ @baseFontSize: 20px; @baseFontFamily: @sansFontFamily; -@baseLineHeight: 30px; +@baseLineHeight: 20px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @@ -256,7 +256,7 @@ @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); // 1200px min -@gridColumnWidth1200: 70px; +@gridColumnWidth1200: 90px; @gridGutterWidth1200: 30px; @gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)); diff --git a/NzbDrone.Web/Content2/Menu.css b/NzbDrone.Web/Content2/Menu.css index 3ef1ea841..0417dbebd 100644 --- a/NzbDrone.Web/Content2/Menu.css +++ b/NzbDrone.Web/Content2/Menu.css @@ -6,8 +6,8 @@ #menu ul { - margin: 0; - padding: 5px 0px 5px 0px; + margin: 10 0 0 -30; + padding: 5px 0 5px 0; list-style: none; line-height: normal; } diff --git a/NzbDrone.Web/Content2/base.css b/NzbDrone.Web/Content2/base.css index 930757ae2..7d9307bc5 100644 --- a/NzbDrone.Web/Content2/base.css +++ b/NzbDrone.Web/Content2/base.css @@ -4,6 +4,7 @@ background: rgb(75, 75, 75); color: rgb(169, 169, 169); padding: 4px; + font-size: 13px; } body diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index ef455fa0b..54959030f 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -238,6 +238,9 @@ + + mixins.less + diff --git a/NzbDrone.Web/Views/AddSeries/bt.cshtml b/NzbDrone.Web/Views/AddSeries/bt.cshtml index c8a1b1a7c..5fcb2391e 100644 --- a/NzbDrone.Web/Views/AddSeries/bt.cshtml +++ b/NzbDrone.Web/Views/AddSeries/bt.cshtml @@ -5,4 +5,22 @@ Hello World - +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/NzbDrone.Web/Views/Settings/System.cshtml b/NzbDrone.Web/Views/Settings/System.cshtml index 632a03d97..e83432281 100644 --- a/NzbDrone.Web/Views/Settings/System.cshtml +++ b/NzbDrone.Web/Views/Settings/System.cshtml @@ -1,10 +1,12 @@ @using NzbDrone.Web.Helpers @model NzbDrone.Web.Models.SystemSettingsModel + @{ - Layout = "_SettingsLayout.cshtml"; + Layout = "~/Views/Shared/_Bootstrap.cshtml"; } +
You must manually restart NzbDrone for these changes to take effect. (Automatic restart coming soon!)
diff --git a/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml b/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml index bac966d2d..e67079973 100644 --- a/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml +++ b/NzbDrone.Web/Views/Shared/_Bootstrap.cshtml @@ -45,9 +45,11 @@ @MvcHtmlString.Create(Html.CurrentControllerLink("Missing", "Index", "Missing")) @MvcHtmlString.Create(Html.CurrentControllerLink("Settings", "Index", "Settings")) @MvcHtmlString.Create(Html.CurrentControllerLink("System", "Index", "System")) - + - +