Deal with admin2 stylesheet

o19s · Nov 30, 2024 · 46987f5 · 46987f5
1 parent 4d81661
commit 46987f5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 40 deletions.
diff --git a/app/assets/stylesheets/_admin2.scss b/app/assets/stylesheets/_admin2.scss
diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss
@@ -16,5 +16,7 @@
 // Styling for Bootstrap 5 for Quepid
 @import "bootstrap-add-bs5";
 
+@import "cal-heatmap";
+
 // This is the css for the admin pages only.
 @import "admin2";
diff --git a/app/assets/stylesheets/admin2.css b/app/assets/stylesheets/admin2.css
@@ -0,0 +1,15 @@
+.scale-with-label-element {
+  display: block;
+}
+
+.scale-label {
+  display: inline-block;
+  float: right;
+  margin-left: 10px;
+  width: calc(100% - 50px);
+}
+
+/* give some space to the top of the admin page */
+main > .container {
+	 padding: 20px 15px 0;
+}
diff --git a/app/assets/stylesheets/admin_users.css.scss b/app/assets/stylesheets/admin_users.css.scss
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -31,9 +31,6 @@
  @import "fonts";
  @import "signup";
 
- //This guy pushes down the top of the page a bit
- @import "admin2";
-
 
 .public-share {
   .clipboard-icon {

diff --git a/app/assets/stylesheets/core.css.scss b/app/assets/stylesheets/core.css.scss
@@ -33,8 +33,6 @@
 @import "bootstrap-add";
 @import "base";
 
-// only in admin?  Not in core?  @import "admin2";
-
 // Tour/Guides
 @import "tether-shepherd/dist/css/shepherd-theme-arrows";
 @import "tour";

diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
@@ -1,5 +1,3 @@
-<%= stylesheet_link_tag 'admin_users', media: 'all' %>
-
 <div class="clearfix">
 
   <h1><%= @user.display_name %></h1>