Andrew Lim avatar Andrew Lim committed 288e299 Merge

Merge branch 'master' of ssh://bitbucket.org/djbouche/scribblepie

Comments (0)

Files changed (3)

layout/skeleton.mint

         {{ modal_saveErrorModal }}
         {{ navbar }}
 
-        @div.class(container)
-            @div.class(row).id(main)
-                @div.class(span4)                    
-                    @ul.class(nav nav-pills).id(dirpathpills)
-                        @li.class(active) 
-                            @a.href(#) / 
-                        @li.class(disabled) 
-                            @a.href(#) Loading...
-                @div.class(span8)
-                    @ul.class(nav nav-pills).id(tablist)
-                        @li.class(disabled)
-                            @a.href(#) No Files Open
-        @div.class(container)
-            @div.class(row).id(main)
-                @div.class(span4)                    
-                    @div.class(well)
-                        @div.id(side)
-                            @div.id(sideprogress).class(progress progress-striped active)
-                                @div.class(bar).style(width: 100%)
-                            @br
-                @div.class(span8).id(editorpane)
-                    @div.class(well).id(editwell)
-                        @div.id(editor)
-                        @div.id(editprogress).class(ehidden progress progress-striped active)
-                            @div.class(bar).style(width: 100%)
-                        @div.id(editorfill)
-            @div.class(row)
-                @div.class(span12).id(footer)
-                    {{ footer }}
+        @div.id(top-wrap)
+            @div.id(path-wrap)                    
+                @ul.class(nav nav-pills).id(dirpathpills)
+                    @li.class(active) 
+                        @a.href(#) / 
+                    @li.class(disabled) 
+                        @a.href(#) Loading...
+            @div.id(file-tab-wrap)
+                @ul.class(nav nav-pills).id(tablist)
+                    @li.class(disabled)
+                        @a.href(#) No Files Open
+        @div.id(main-wrap)
+            @div.id(sidebar-wrap)
+                @div.id(side)
+                    @div.id(sideprogress).class(progress progress-striped active)
+                        @div.class(bar).style(width: 100%)
+            @div.id(editor-wrap)
+                @div.id(editor)
+                @div.id(editprogress).class(ehidden progress progress-striped active)
+                    @div.class(bar).style(width: 100%)

static/css/style.css

+html,
+body {
+  height: 100%;
+}
 body {
   background: #333;
   color: #888;
+  margin: 0;
+  padding: 0;
 }
-#editor {
-  width: 608px;
-  height: 400px;
+.navbar {
+  margin-bottom: none;
+}
+#top-wrap {
+  position: absolute;
+  top: 42px;
+  left: 0;
+  right: 0;
+  height: 40px;
+}
+#path-wrap {
+  position: absolute;
+  width: 300px;
+  margin: 0;
+}
+#file-tab-wrap {
+  position: absolute;
+  left: 300px;
+  right: 0;
 }
-#editorfill {
-  height: 400px;
+#main-wrap {
+  position: absolute;
+  top: 82px;
+  bottom: 0;
+  left: 0;
+  right: 0;
 }
-.well {
-  padding: 4px;
-  background: #282828;
+#sidebar-wrap {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 300px;
+}
+#editor-wrap {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  left: 300px;
+}
+#editor {
+  width: 100%;
+  height: 100%;
 }
 .ehidden {
   display: none;
 }
 #side {
-  height: 400px;
+  height: 100%;
   overflow-y: scroll;
 }
 #buff {
   padding-left: 40px;
 }
-#main {
-  position: relative;
-}
-.editwell {
-  height: 440px;
-}
 .slashlink {
   display: inline-block;
   width: 10px;

static/css/style.styl

+html, body
+	height:100%
+
 body 
 	background: #333
 	color: #888
+	margin:0
+	padding:0
+
+.navbar
+	margin-bottom:none
+
+#top-wrap
+	position:absolute
+	top:42px
+	left:0
+	right:0
+	height:40px
+
+#path-wrap
+	position:absolute
+	width:300px
+	margin:0
+
+#file-tab-wrap
+	position:absolute
+	left:300px
+	right:0
+
+#main-wrap
+	position:absolute
+	top:82px
+	bottom:0
+	left:0
+	right:0
+
+#sidebar-wrap
+	position:absolute
+	top:0
+	bottom:0
+	left:0
+	width:300px
+
+#editor-wrap
+	position:absolute
+	top:0
+	bottom:0
+	right:0
+	left:300px
 
 #editor
-	width: 608px
-	height: 400px
-#editorfill
-	height: 400px
-.well
-	padding: 4px
-	background: #282828
+	width:100%
+	height:100%
+
 .ehidden
 	display: none
 
 #side
-	height: 400px
+	height: 100%
 	overflow-y: scroll
 
 #buff
 	padding-left: 40px
 
-#main
-	position: relative
-
-.editwell
-	height: 440px
-
 .slashlink
 	display: inline-block
 	width: 10px
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.