Skip to content

Redesigning header, sidebar and breadcrums following some material design rules #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2016
Merged

Redesigning header, sidebar and breadcrums following some material design rules #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af57c76
header and sidebar redesign based in material
joni2back Jun 14, 2016
1b48652
fixing ctrl/cmd key for iOS+Mac
joni2back Jun 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/angular-filemanager.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions dist/angular-filemanager.min.js
View file
Open in desktop

Large diffs are not rendered by default.

203 changes: 128 additions & 75 deletions src/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ body {
margin-bottom: 0;
border: 0;
border-radius: 0;
color: #fff;
}

.navbar .navbar-collapse {
overflow: visible;
padding: 0;
}

.navbar .navbar-toggle {
Expand All @@ -25,22 +31,6 @@ body {
line-height: 100%;
}

.navbar .navbar-form {
border-bottom: none;
border-top: none;
box-shadow: none;
padding: 0 10px;
margin-top: 10px;
}

.breadcrumb {
border-radius: 0;
}

.breadcrumb .btn {
margin-top: -5px;
}

.btn.btn-default {
color: #444;
background-color: #FAFAFA;
Expand Down Expand Up @@ -68,6 +58,12 @@ textarea.code {

.sidebar {
display: none;
background: #fafafa;
margin-top: 2px;
padding: 0;
overflow-x: hidden;
overflow-y: auto;
border-right: 1px solid #eee;
}

.btn-go-back {
Expand All @@ -80,18 +76,24 @@ textarea.code {
margin-left: -20px;
}


.nav-sidebar > li > a {
padding-right: 20px;
padding-left: 20px;
color: #7a7a7a;
padding: 7px 0 7px 16px;
}

.nav-sidebar > .active > a,
.nav-sidebar > .active > a:hover,
.nav-sidebar > .active > a:focus {
color: #fff;
background-color: #2196F3;

.nav-sidebar> li > a:hover,
.nav-sidebar> li > a:focus {
background: none;
color: #1378b9;
}

.nav-sidebar > li.active > a {
color: #2196F3;
}


.main {
padding: 0;
}
Expand All @@ -106,15 +108,6 @@ textarea.code {
padding-left: 12px;
}

.file-tree ul.nav.nav-sidebar > li {
border-left: 1px solid #ddd;
padding-left: 4px;
}

.file-tree ul.nav.nav-sidebar > li > a {
padding: 2px 2px 2px 4px;
}

.file-tree ul.nav.nav-sidebar:first-child {
padding-left: 0;
}
Expand Down Expand Up @@ -216,20 +209,22 @@ textarea.code {
background-color: #888;
}

.dropdown-menu.dropdown-right-click {
display: block;
position: static;
margin-bottom: 5px;
font-size: 1em;
.dropdown-menu {
font-size: 14px;
}

.dropdown-menu.dropdown-right-click>li>a {
padding: 5px 12px;
.dropdown-menu > li > a {
padding: 6px 20px;
}

.dropdown-menu.dropdown-right-click>li>a>i {
font-size: .9em;
margin-right: 1px;
.dropdown-menu > li > a > i {
margin-right: 4px;
}

.dropdown-menu.dropdown-right-click {
display: block;
position: static;
margin-bottom: 5px;
}

.dropdown-menu.dropdown-right-click .divider {
Expand Down Expand Up @@ -337,30 +332,13 @@ table th > a:focus {
}

.container-fluid {
height: -webkit-calc(100% - 55px);
height: -moz-calc(100% - 55px);
height: calc(100% - 55px);
height: -webkit-calc(100% - 58px);
height: -moz-calc(100% - 58px);
height: calc(100% - 58px);
}

.sidebar {
display: block;
padding: 0;
overflow-x: hidden;
overflow-y: auto;
background-color: #f5f5f5;
border-right: 1px solid #eee;
}
}

@media (max-width: 768px) {
.navbar-form .btn {
margin-top: 5px;
}
}

@media (max-width: 475px) {
.table.table-files .btn {
display: none;
}
}

Expand All @@ -369,25 +347,100 @@ table th > a:focus {
}

.item-extension::after {
font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;
content: attr(data-ext);
left: 4px;
position: absolute;
color: #fff;
font-size: 9px;
text-transform: uppercase;
top: 21px;
font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;
content: attr(data-ext);
left: 4px;
position: absolute;
color: #fff;
font-size: 9px;
text-transform: uppercase;
top: 21px;
}

.selected .item-extension::after {
color: #2196F3;
color: #2196F3;
}

.form-control.search-input {
max-width: 20em;
display: inline;
max-width: 20em;
display: inline;
}

.like-code {
display: inline;
}
display: inline;
}

.point {
margin-right: 8px;
font-size: 10px;
}

.navbar .btn.btn-flat {
padding: 2px;
width: 32px;
height: 30px;
margin-left: 5px;
}

.navbar-inverse .navbar-toggle .icon-bar {
background: #fff;
}

.navbar-inverse .navbar-form input[type="text"] {
color: #7a7a7a;
box-shadow: none;
margin: 0 10px;
}

.navbar .navbar-form {
border-bottom: none;
border-top: none;
box-shadow: none;
padding: 0;
margin: 12px 0;
}

.breadcrumb {
background: none;
padding: 0;
font-size: 17px;
margin: 12px 0;
overflow: hidden;
max-height: 30px
}

.breadcrumb>.active,
.breadcrumb a {
color: #fff;
}

.breadcrumb>li+li:before {
font-family: 'Glyphicons Halflings';
content: "\e080";
font-size: 12px;
color: #fff;
}

.scrollable-menu {
height: auto;
max-height: 200px;
overflow-x: hidden;
}

.btn.btn-flat {
background: none;
color: #fff;
}

.btn-group.open > .btn-flat,
.btn.btn-flat,
.btn.btn-flat:active {
box-shadow: none;
}

.btn.btn-flat > i {
font-size: 18px;
width: 18px;
height: 18px;
line-height: 100%;
}
2 changes: 1 addition & 1 deletion src/js/controllers/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
return;
}
}
if ($event && $event.ctrlKey && !isRightClick) {
if ($event && !isRightClick && ($event.ctrlKey || $event.metaKey)) {
$scope.isSelected(item) ? $scope.temps.splice(indexInTemp, 1) : $scope.temps.push(item);
return;
}
Expand Down
13 changes: 4 additions & 9 deletions src/templates/current-folder-breadcrumb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<ol class="breadcrumb mb0">
<ol class="breadcrumb">
<li>
<a href="" ng-click="fileNavigator.goTo(-1)">
<i class="glyphicon glyphicon-folder-open mr2"></i>
{{ config.appName }}
</a>
</li>
<li ng-repeat="(key, dir) in fileNavigator.currentPath track by key" ng-class="{'active':$last}" class="animated fast fadeIn">
<a href="" ng-show="!$last" ng-click="fileNavigator.goTo(key)">
<i class="glyphicon glyphicon-folder-open mr2"></i> {{dir}}
{{dir | strLimit : 8}}
</a>
<span ng-show="$last">
<i class="glyphicon glyphicon-folder-open mr2"></i> {{dir}}
{{dir | strLimit : 12}}
</span>
</li>
<li>
<button class="btn btn-primary btn-xs" ng-click="fileNavigator.upDir()">
<i class="glyphicon glyphicon-level-up"></i>
</button>
</li>
</ol>
7 changes: 4 additions & 3 deletions src/templates/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<div class="container-fluid">
<div class="row">

<div class="col-sm-3 col-md-2 sidebar file-tree animated slow fadeIn" ng-include="config.tplPath + '/sidebar.html'" ng-show="config.sidebar &amp;&amp; fileNavigator.history[0]"></div>
<div class="main" ng-class="config.sidebar &amp;&amp; fileNavigator.history[0] &amp;&amp; 'col-sm-9 col-md-10'">
<div ng-include="config.tplPath + '/current-folder-breadcrumb.html'" ng-show="config.breadcrumb"></div>
<div class="col-sm-4 col-md-3 sidebar file-tree animated slow fadeIn" ng-include="config.tplPath + '/sidebar.html'" ng-show="config.sidebar &amp;&amp; fileNavigator.history[0]">
</div>

<div class="main" ng-class="config.sidebar &amp;&amp; fileNavigator.history[0] &amp;&amp; 'col-sm-8 col-md-9'">
<div ng-include="config.tplPath + '/' + viewTemplate" class="main-navigation clearfix"></div>
</div>
</div>
Expand Down
Loading