Skip to content

Commit d43823b

Browse files
committed
improve layout
1 parent 6359fd8 commit d43823b

File tree

5 files changed

+47
-9
lines changed

5 files changed

+47
-9
lines changed

public/index.html

+3-7
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,13 @@
3434

3535
<!-- build:css css/sample.min.css -->
3636
<!-- Bootstrap core CSS -->
37-
<link href="components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
37+
<!--link href="components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"-->
3838

3939
<!-- dashboard style -->
4040
<link href="components/angular-dashboard-framework/dist/angular-dashboard-framework.min.css" rel="stylesheet">
4141
<link href="components/adf-widget-clock/dist/adf-widget-clock.min.css" rel="stylesheet">
4242
<link href="components/adf-widget-iframe/dist/adf-widget-iframe.min.css" rel="stylesheet">
43-
<style>
44-
body {
45-
padding-top: 60px;
46-
}
47-
</style>
43+
<link href="styles/app.css" rel="stylesheet">
4844
<!-- endbuild -->
4945

5046
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -75,7 +71,7 @@
7571
</button>
7672
<a class="navbar-brand" href="#">ADF Dynamic Sample</a>
7773
</div>
78-
<div collapse="nav.navCollapsed" class="collapse navbar-collapse">
74+
<div uib-collapse="nav.navCollapsed" class="collapse navbar-collapse">
7975
<ul class="nav navbar-nav">
8076
<li ng-class="nav.navClass('boards/' + item.id)" ng-repeat="item in nav.items | orderBy: title">
8177
<a ng-href="#/boards/{{item.id}}">{{item.title}}</a>

public/partials/dashboard.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<div>
22
<adf-dashboard name="{{dashboard.name}}" structure="4-8" adf-model="dashboard.model" />
33
</div>
4-
5-
<button class="btn btn-warning" ng-click="dashboard.delete(dashboard.name)">Delete</button>
4+
<div class="footer">
5+
<button class="btn btn-warning" ng-click="dashboard.delete(dashboard.name)">
6+
<span class="glyphicon glyphicon-remove"></span> Delete
7+
</button>
8+
</div>

public/styles/app.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/styles/app.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/styles/app.less

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// out: app.css, sourcemap: true, compress: true
2+
3+
@import "../components/bootstrap/less/bootstrap.less";
4+
5+
@body-bg: lighten(@gray-base, 95.0%);;
6+
@icon-font-path: "../components/bootstrap/fonts/";
7+
@grid-gutter-width: 10px;
8+
9+
@panel-footer-padding: 0;
10+
@panel-border-radius: 0;
11+
@panel-inner-border: inherit;
12+
@panel-footer-bg: inherit;
13+
14+
@panel-default-text: @gray-dark;
15+
@panel-default-border: #ddd;
16+
@panel-default-heading-bg: inherit;
17+
18+
body {
19+
padding-top: 60px;
20+
}
21+
22+
.panel {
23+
margin-bottom: @grid-gutter-width;
24+
.box-shadow(2px 2px 1px rgba(0,0,0,.08));
25+
}
26+
27+
.panel-heading {
28+
border-bottom: none;
29+
}
30+
31+
.edit .column {
32+
padding: @grid-gutter-width / 2;
33+
}

0 commit comments

Comments
 (0)