unified js for dtext previews

2011-10-20 18:50:16 -04:00
parent f630365c3b
commit e8808987d5
21 changed files with 101 additions and 190 deletions
--- a/app/assets/stylesheets/common/dtext.css.scss
+++ b/app/assets/stylesheets/common/dtext.css.scss
@@ -31,17 +31,10 @@ div.prose {
  }
 }

-div.dtext {
+div.dtext-preview {
  width: 30em;
  
  ul {
    margin-left: 1em;
  }
 }
-
-div.dtext-preview {
-  border: 2px dashed #AAA;
-  padding: 1em;
-  margin: 1em 0;
-  width: 30em;
-}
--- a/app/assets/stylesheets/common/inline.css.scss
+++ b/app/assets/stylesheets/common/inline.css.scss
@@ -18,4 +18,7 @@ span.wait {
 span.count {
  color: #CCC;
  margin-left: 0.5em;
+}
+
+span.edit-options {
 }
--- a/app/assets/stylesheets/common/main_layout.css.scss
+++ b/app/assets/stylesheets/common/main_layout.css.scss
@@ -5,10 +5,12 @@ div#search {
 }

 div#page {
+  overflow: hidden;
+  width: 85em;
  margin: 0 30px;
  
  aside#sidebar {
-    width: 20%;
+    width: 15em;
    float: left;
    
    h1 {
@@ -29,9 +31,9 @@ div#page {
  }

  section#content {
-    width: 75%;
+    width: 65em;
    float: left;
-    margin-left: 2em;
+    padding-left: 2em;
    overflow: visible;
  }
 }