1
0
mirror of https://github.com/adobe/brackets.git synced 2024-11-20 18:02:54 +01:00

Merge remote-tracking branch 'origin/ui-workspace' into initial-file-tree

This commit is contained in:
Peter Flynn 2011-12-08 18:23:25 -08:00
commit a757ced99c
2 changed files with 53 additions and 55 deletions

View File

@ -50,9 +50,9 @@
<select class="picker"></select>
</div>
<ul id="project-files" class="file-list">
<li><a href="#">my-file-1.html</a></li>
<li><a href="#">my-file-2.html</a></li>
<li><a href="#">my-file-3.html</a></li>
<li><a href="#">my-app.css</a></li>
<li><a href="#">my-app.js</a></li>
<li><a href="#" class="selected">awesome.js</a></li>
</ul>
</div>
</div>
@ -67,7 +67,7 @@
<input class="settings" type="button" value="Settings"/>
-->
</div>
<div class="title">Untitled</div>
<div class="title">awesome.js</div>
</div>
<div id="editor"></div>
</div>

View File

@ -44,50 +44,6 @@
/* All paddings, gutters, etc. should be multiples of this */
@base-padding: 10px;
/* Overrides for Bootstrap default behavior */
.topbar-inner {
/* We don't want to use the default .container in here, so we need to .clearfix the children. */
.clearfix;
.brand {
.sane-box-model;
margin-left: 0;
width: 200px;
padding-left: @base-padding;
padding-right: @base-padding;
}
}
/* Overall layout */
html, body {
height: 100%;
overflow: auto;
}
body {
.vbox;
.topbar {
position: static;
}
}
.main-view {
.hbox;
.box-flex(1);
.sidebar {
.vbox;
width: 200px;
}
.content {
.vbox;
.box-flex(1);
}
}
/* General styles for Brackets elements */
.panel {
@ -111,6 +67,49 @@ body {
.box-shadow(0 1px 3px 0 rgba(0, 0, 0, 0.3));
}
/* Overall layout */
html, body {
height: 100%;
overflow: auto;
}
body {
.vbox;
.topbar {
position: static;
}
}
.topbar-inner {
/* We don't want to use the default .container in here, so we need to .clearfix the children. */
.clearfix;
.brand {
.sane-box-model;
margin-left: 0;
width: 200px;
padding-left: @base-padding;
padding-right: @base-padding;
}
}
.main-view {
.hbox;
.box-flex(1);
.sidebar {
.vbox;
width: 200px;
}
.content {
.vbox;
.box-flex(1);
}
}
#main-toolbar {
/* make sure the shadow goes above other items */
z-index: 1;
@ -143,7 +142,7 @@ body {
/* Project panel */
.panel .toolbar {
#projects .toolbar {
.picker {
.box;
.box-flex(1);
@ -153,8 +152,7 @@ body {
.file-list {
.box-flex(1);
margin: 0;
padding-top: @base-padding;
padding-bottom: @base-padding;
padding: 0;
list-style: none;
a {
@ -162,9 +160,9 @@ body {
padding: @base-padding/2 @base-padding @base-padding/2 @base-padding;
color: #000;
text-decoration: none;
}
&.selected {
#gradient > .vertical(#5fa3e0, #0065be);
&.selected {
color: #fff;
#gradient > .vertical(#5fa3e0, #0065be);
}
}
}