Add series UI changes

Link back to add series
Existing UI less contrasting
pull/6/head
Mark McDowall 12 years ago
parent a163e511ae
commit e283f54567

@ -19,7 +19,8 @@ define(
},
events: {
'click .x-import': '_importSeries'
'click .x-import': '_importSeries',
'click .x-add-new': '_addSeries'
},
attributes: {
@ -48,6 +49,10 @@ define(
_importSeries: function () {
App.modalRegion.show(this.rootFolderLayout);
},
_addSeries: function () {
this.workspace.show(new AddSeriesView());
}
});
});

@ -1,10 +1,10 @@
<div class="row unmapped-folder-path">
{{#if folder.path}}
<div class="row well unmapped-folder-path">
<div class="span11">
{{#if folder.path}}
{{folder.path}}
{{/if}}
</div>
</div>
</div>
{{/if}}
<div class="row x-search-bar">
<div class="input-prepend nz-input-large add-series-search span11">
<i class="add-on icon-search"/>
@ -14,7 +14,7 @@
<div class="row">
<div id="search-result" class="result-list span12"/>
</div>
<div class="text-center new-series-loadmore x-load-more" style="display: none;">
<div class="btn btn-block text-center new-series-loadmore x-load-more" style="display: none;">
<i class="icon-angle-down"/>
more
</div>{{debug}}
</div>

@ -5,6 +5,6 @@
<span>{{Bytes freeSpace}}</span>
</td>
<td class="span1 nz-row-action">
<div class="btn btn-small btn-danger icon-minus x-remove">
<div class="btn btn-small btn-icon-only btn-danger icon-minus x-remove">
</div>
</td>

@ -9,8 +9,6 @@
.existing-series {
@highLight : rgb(134, 129, 130);
.card();
margin : 20px 0px;
@ -24,16 +22,13 @@
font-weight : 100;
font-size : 25px;
text-align : center;
background : @highLight;
}
.new-series-loadmore {
.clickable;
font-size : 30px;
font-weight : 300;
padding-top : 10px;
padding-bottom : 10px;
background : @highLight;
}
}
@ -92,5 +87,32 @@
margin-left : 20px;
}
}
}
li.add-new {
.clickable;
display: block;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 20px;
color: rgb(51, 51, 51);
white-space: nowrap;
}
li.add-new:hover {
text-decoration: none;
color: rgb(255, 255, 255);
background-color: rgb(0, 129, 194);
}
.btn-group {
.dropdown-menu {
right: 0px;
}
.add-series-import-btn {
width: 93.3%;
}
}

@ -1,7 +1,22 @@
<div class="row operations-row">
<div class="btn-block btn btn-large add-series-import-btn x-import">
<div class="btn-group btn-block">
<div class="btn btn-large add-series-import-btn x-import">
<i class="icon-hdd"/>
Import existing series on disk
</div>
<button class="btn btn-large btn-icon-only dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li class="add-new x-add-new">
Add new series
</li>
</ul>
</div>
<!--<div class="btn btn-block btn-large add-series-import-btn x-import">-->
<!--<i class="icon-hdd"/>-->
<!--Import existing series on disk-->
<!--</div>-->
</div>
<div id="add-series-workspace"/>

@ -43,7 +43,7 @@
<div class="btn-group">
<button class="btn btn-primary x-save">save</button>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">

@ -71,7 +71,7 @@
<div class="btn-group">
<button class="btn btn-primary x-save">save</button>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">

Loading…
Cancel
Save