From 3f51128e24e1ca3247169066aa6a03090df98dd6 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 17 Jun 2013 01:26:35 -0700
Subject: start of new ui - css changes, layout changes, navigation changes.

---
 app/assets/stylesheets/application.scss | 15 +++-----
 app/assets/stylesheets/leap.scss        | 65 +++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 app/assets/stylesheets/leap.scss

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 25e854e..5a5e900 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,7 +1,7 @@
 //
 // import custom scss, content to be set in deployment.
 //
-@import "tail";
+@import "head";
 
 // First import journal variables
 @import "bootswatch/cerulean/variables";
@@ -10,17 +10,12 @@
 // import bootstrap.
 //
 @import "bootstrap";
-body { padding-top: 60px; }
-
 @import "bootstrap-responsive";
 
-table.table-hover .btn {
-  opacity: 0;
-}
-table.table-hover tr:hover .btn {
-  opacity: 1;
-}
-@import "bootstrap-editable";
+//
+// LEAP web app specific overrides
+//
+@import "leap";
 
 // And finally bootswatch style itself
 @import "bootswatch/cerulean/bootswatch";
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
new file mode 100644
index 0000000..42638eb
--- /dev/null
+++ b/app/assets/stylesheets/leap.scss
@@ -0,0 +1,65 @@
+
+table.table-hover .btn {
+  opacity: 0;
+}
+table.table-hover tr:hover .btn {
+  opacity: 1;
+}
+
+.debug {
+  outline: 1px solid red;
+}
+
+//
+// Icons
+//
+
+
+// force a black icon, even if bootstrap thinks differently
+.icon-black {
+  background-image: url(/assets/glyphicons-halflings.png) !important;
+}
+
+//
+// Typography
+//
+
+.first {
+  margin-top: 0;
+  padding-top: 0;
+}
+
+//
+// Boring default masthead
+//
+
+#masthead {
+  background: #eee;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #e6e6e6;
+  .title {
+    padding: 20px;
+    font-size: 1.25em;
+  }
+  .sitename {
+    font-weight: bold;
+  }
+}
+
+//
+// Side Navigation
+//
+
+.sidenav {
+  @extend .nav-tabs;
+  @extend .nav-stacked;
+  box-shadow: 0 2px 4px rgba(0,0,0,.1);
+  li.active {
+    a, a:hover {
+      background-color: $blueDark;
+      color: $white;
+      border-color: darken($blueDark, 10%);
+      cursor: pointer;
+    }
+  }
+}
-- 
cgit v1.2.3