From 0ca0317a7f4b31746543811f2cab2f94cc5c6ec7 Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Thu, 27 Aug 2015 22:12:40 -0400 Subject: [PATCH] Namespace the legacy CSS --- app/assets/javascripts/tracks.js.erb | 3 +- app/assets/stylesheets/application.css.scss | 30 +++++++++++++++++-- .../{tracks.css.scss => legacy.css.scss} | 7 ++--- app/views/layouts/application.html.erb | 5 ++-- 4 files changed, 35 insertions(+), 10 deletions(-) rename app/assets/stylesheets/{tracks.css.scss => legacy.css.scss} (99%) diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb index 51113958..3f864e00 100644 --- a/app/assets/javascripts/tracks.js.erb +++ b/app/assets/javascripts/tracks.js.erb @@ -833,7 +833,8 @@ var RecurringTodosPage = { RecurringTodosPage.hide_all_recurring(); RecurringTodosPage.reset_radio(); $('#recurring_daily').show(); - } + }, + appendTo: "#content" }); /* change recurring period radio input on new form */ diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2931b8d0..ae721c39 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -11,11 +11,37 @@ * file per style scope. * *= require_self - *= require_tree ../../../vendor/assets/stylesheets - *= require tracks */ +@import "../../../vendor/assets/stylesheets/jquery-ui-1.10.0.custom.min"; + +.legacy-ui { + @import "../../../vendor/assets/stylesheets/superfish-navbar"; + @import "../../../vendor/assets/stylesheets/superfish-vertical"; + @import "../../../vendor/assets/stylesheets/superfish"; + @import "legacy"; +} + .bootstrap { @import "bootstrap-sprockets"; @import "bootstrap"; + + // resets normally applied to body + // TODO: remove when dropping the .bootstrap namespace + font-size: $font-size-base; + line-height: $line-height-base; +} + +// Hybrid Bootstrap/legacy styles applied to body +// See bootstrap/_normalize and bootstrap/_scaffolding +// TODO: clean these up after the migration to Bootstrap is complete +body { + @import "bootstrap/_variables"; + $font-family-base: "Lucida Grande", Verdana, Geneva, Arial, sans-serif; + $body-bg: #eee; + + margin: 0; + font-family: $font-family-base; + color: $text-color; + background-color: $body-bg; } diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/legacy.css.scss similarity index 99% rename from app/assets/stylesheets/tracks.css.scss rename to app/assets/stylesheets/legacy.css.scss index 420f838c..d0b2fe76 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/legacy.css.scss @@ -63,12 +63,9 @@ abbr,acronym { border:0; } -body { - font-family: "Lucida Grande", Verdana, Geneva, Arial, sans-serif; +& { font-size: 80%; padding: 0px 10px; - margin: 0px; - background: #eee; } p { @@ -498,7 +495,7 @@ a.footer_link { /* preferences */ -body.preferences { +&.preferences { div#display_box { margin-right:510px; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1a859330..f710ed0a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,8 +32,8 @@ <%= @page_title %> - - + +

@@ -99,5 +99,6 @@

<%= render :partial => "shared/footer" %> +