Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-18 08:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1924 from dnrce/namespace-legacy-css

Browse source 
Namespace the legacy CSS
This commit is contained in:
Matt Rogers 2015-09-01 14:11:44 -05:00
commit e71d81e129
4 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/tracks.js.erb
View file

@ -833,7 +833,8 @@ var RecurringTodosPage = {
RecurringTodosPage.hide_all_recurring(); RecurringTodosPage.hide_all_recurring();
RecurringTodosPage.reset_radio(); RecurringTodosPage.reset_radio();
$('#recurring_daily').show(); $('#recurring_daily').show();
} },
appendTo: "#content"
}); });
/* change recurring period radio input on new form */ /* change recurring period radio input on new form */

30
app/assets/stylesheets/application.css.scss
View file

@ -11,11 +11,37 @@
* file per style scope. * file per style scope.
* *
*= require_self *= 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 { .bootstrap {
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap"; @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;
} }

7
app/assets/stylesheets/tracks.css.scss → app/assets/stylesheets/legacy.css.scss
View file

@ -63,12 +63,9 @@ abbr,acronym {
border:0; border:0;
} }
body { & {
font-family: "Lucida Grande", Verdana, Geneva, Arial, sans-serif;
font-size: 80%; font-size: 80%;
padding: 0px 10px; padding: 0px 10px;
margin: 0px;
background: #eee;
} }
p { p {
@ -498,7 +495,7 @@ a.footer_link {
/* preferences */ /* preferences */
body.preferences { &.preferences {
div#display_box { div#display_box {
margin-right:510px; margin-right:510px;
} }

5
app/views/layouts/application.html.erb
View file

@ -32,8 +32,8 @@
<title><%= @page_title %></title> <title><%= @page_title %></title>
</head> </head>
<body class="<%= controller.controller_name %>"> <body>
<div class="legacy-ui <%= controller.controller_name %>">
<div id="topbar"> <div id="topbar">
<div id="date"> <div id="date">
<h1> <h1>
@ -99,5 +99,6 @@
</div> </div>
<%= render :partial => "shared/footer" %> <%= render :partial => "shared/footer" %>
</div><!-- .legacy-ui -->
</body> </body>
</html> </html>