dev
fengyuexingzi 8 years ago
parent 66f69cb264
commit a5c4d523a2

@ -34,6 +34,7 @@ class Company extends Model
public function projects() public function projects()
{ {
return $this->hasMany('App\Model\Project'); return $this->hasMany('App\Model\Project');
// ->addSelect('id','name');
} }
public function comments() public function comments()

2329
public/css/admin.css vendored

File diff suppressed because it is too large Load Diff

@ -2,16 +2,11 @@
@import "variables"; @import "variables";
// Bootstrap // Bootstrap
//$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
//@import "~bootstrap-sass/assets/stylesheets/bootstrap-sprockets";
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap"; @import "~bootstrap-sass/assets/stylesheets/bootstrap";
//// Font-Awesome // Font-Awesome
//$fa-font-path: "~font-awesome/fonts"; $fa-font-path: "~font-awesome/fonts";
//@import "~font-awesome/scss/font-awesome"; @import "~font-awesome/scss/font-awesome";
//
// Admin // Admin
@import "mixins"; @import "mixins";

@ -270,7 +270,7 @@
<!-- /input-group --> <!-- /input-group -->
</li> </li>
<li> <li>
<a href="index.html"><i class="glyphicon glyphicon-dashboard fa fa-dashboard fa-fw"></i> Dashboard</a> <a href="index.html"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
</li> </li>
<li> <li>
<a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Charts<span class="fa arrow"></span></a> <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Charts<span class="fa arrow"></span></a>

Loading…
Cancel
Save