Skip to content

update material theme #6

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

Closed
wants to merge 1 commit into from
Closed

update material theme #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
update material theme
  • Loading branch information
IvanBisultanov authored and IvanBisultanov committed Dec 29, 2015
commit d75853d5aa549d130ef397b4d578b6d2c928481b
17 changes: 16 additions & 1 deletion demo/demo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ h1 {
padding-left: 15px; }

.b-change-theme {
padding: 20px; }
padding: 20px;
margin-bottom: 20px; }
.b-change-theme__link {
font-size: 16px;
line-height: 20px;
Expand Down Expand Up @@ -107,3 +108,17 @@ th.sortable {
top: 0;
bottom: 6px;
margin: auto 0; }

.col-wrap {
font-size: 0;
padding: 25px 0; }
.col-wrap .col2 {
vertical-align: top;
display: inline-block;
width: 50%;
padding: 0 15px; }
.col-wrap .col3 {
vertical-align: top;
display: inline-block;
width: 33.33%;
padding: 0 15px; }
229 changes: 111 additions & 118 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,140 +11,130 @@
<div class="container">
<h1>Angular Data Grid</h1>
<div class="b-change-theme">
<span class="b-change-theme__link _active">Material Design</span>
<a href="../index.html" class="b-change-theme__link">Bootstrap</a>
<span class="b-change-theme__link _active">Material Design</span>
</div>
<div class="row">
<div class="col-xs-12">
<div class="col-md-3">
<div>
<div class="col-wrap">
<div class="col3">
<div class="form-group">
<input type="text" class="form-control order-search-box"
placeholder="Search By Order #"
<input type="text"
id="sort"
class="form-control order-search-box"
ng-change="gridActions.filter()"
ng-model="code"
filter-by="code"
filter-type="text">
<label for="sort" class="input-label">Search By Order #</label>
</div>
</div>
<div class="col-md-9 buttons-right">
<div class="form-inline margin-bottom-small">
<div class="form-group">
<label class="control-label">From: </label>

<div class="input-group datepicker">
<input type="text"
id="dateFrom"
class="form-control"
is-open="dateFromOpened"
ng-click="dateFromOpened = true"
datepicker-popup="shortDate"
filter-by="placed"
filter-type="dateFrom"
ng-model="dateFrom"
ng-blur="gridActions.filter()"
ng-focus="gridActions.filter()"
max-date="dateTo"
show-weeks="false"
close-text="Close"
placeholder="MM/DD/YY"/>
<span class="input-group-btn">
<label for="dateFrom" class="btn btn-default form-control">
<i class="fa fa-calendar"></i></label>
</span>
</div>
</div>
<div class="form-group">
<label class="control-label">To: </label>

<div class="input-group datepicker">
<input type="text"
id="dateTo"
class="form-control"
is-open="dateToOpened"
ng-click="dateToOpened = true"
min-date="dateFrom"
datepicker-popup="shortDate"
filter-by="placed"
filter-type="dateTo"
ng-model="dateTo"
ng-blur="gridActions.filter()"
ng-focus="gridActions.filter()"
show-weeks="false"
close-text="Close"
placeholder="MM/DD/YY"/>
<span class="input-group-btn">
<label for="dateTo" class="btn btn-default form-control">
<i class="fa fa-calendar"></i></label>
</span>
</div>
<div class="col3">
<div class="form-group">
<div class="input-group datepicker">
<input type="text"
id="dateFrom"
class="form-control"
is-open="dateFromOpened"
ng-click="dateFromOpened = true"
datepicker-popup="shortDate"
filter-by="placed"
filter-type="dateFrom"
ng-model="dateFrom"
ng-blur="gridActions.filter()"
ng-focus="gridActions.filter()"
max-date="dateTo"
show-weeks="false"
close-text="Close"/>
<label for="dateFrom" class="input-label">From</label>
</div>
</div>
<div ng-show="dateTo || dateFrom" class="buttons-right">
<a href="" ng-click="dateTo = ''; dateFrom = ''; reloadGrid();">Clear Dates</a>
</div>
</div>
<div grid-data id='test' grid-options="gridOptions" grid-actions="gridActions">
<div class="row margin-bottom-big">
<strong class="col-md-12">
found : {{filtered.length}} items
</strong>

<div class="col3">
<div class="form-group">
<div class="input-group datepicker">
<input type="text"
id="dateTo"
class="form-control"
is-open="dateToOpened"
ng-click="dateToOpened = true"
min-date="dateFrom"
datepicker-popup="shortDate"
filter-by="placed"
filter-type="dateTo"
ng-model="dateTo"
ng-blur="gridActions.filter()"
ng-focus="gridActions.filter()"
show-weeks="false"
close-text="Close"/>
<label for="dateTo" class="input-label">To</label>
</div>
</div>
<pagination max-size="5"
boundary-links="true"
class="pagination-sm"
ng-if="paginationOptions.totalItems > paginationOptions.itemsPerPage"
total-items="paginationOptions.totalItems"
ng-model="paginationOptions.currentPage"
ng-change="reloadGrid()"
items-per-page="paginationOptions.itemsPerPage"></pagination>
<table class="table table-hover table-leo table-condensed table-bordered table-striped">
<thead>
<tr>
<th sortable="code" class="sortable">
Order #
</th>
<th sortable="placed" class="sortable">
Date Placed
</th>
<th sortable="purchaseOrderNumber" class="sortable">
Purchase Order #
</th>
<th class="st-sort-disable th-dropdown">
<select class="form-control width-15"
filter-by="statusDisplay"
filter-type="select"
ng-model="status"
ng-change="filter()">
<option value="">All Statuses</option>
</select>
</th>
<th sortable='total.value' class="sortable">
Total
</th>
<th class="st-sort-disable">
</th>
</tr>
</thead>
<tbody>
<tr grid-item>
<td>
<a href="{{globalData.contextPath + '/my-account/order/' + item.code}}"
ng-bind="item.id"></a>
</td>
<td ng-bind="item.placed | date:'MM/dd/yyyy'"></td>
<td ng-bind="item.purchaseOrderNumber"></td>
<td ng-bind="item.statusDisplay"></td>
<td ng-bind="item.total.formattedValue"></td>
<td>
<a class="btn btn-secondary btn-sm"
href="{{globalData.contextPath + '/my-account/order/' + item.code}}">View
Order</a>
</td>
</tr>
</tbody>
</table>
<div class="row">
</div>
</div>
<div grid-data id='test' grid-options="gridOptions" grid-actions="gridActions">
<div>
<strong>
found : {{filtered.length}} items
</strong>
</div>
<pagination max-size="5"
boundary-links="true"
class="pagination-sm"
ng-if="paginationOptions.totalItems > paginationOptions.itemsPerPage"
total-items="paginationOptions.totalItems"
ng-model="paginationOptions.currentPage"
ng-change="reloadGrid()"
items-per-page="paginationOptions.itemsPerPage"></pagination>
<table class="table table-hover table-leo table-condensed table-bordered table-striped">
<thead>
<tr>
<th sortable="code" class="sortable">
Order #
</th>
<th sortable="placed" class="sortable">
Date Placed
</th>
<th sortable="purchaseOrderNumber" class="sortable">
Purchase Order #
</th>
<th class="st-sort-disable th-dropdown">
<select class="form-control width-15"
filter-by="statusDisplay"
filter-type="select"
ng-model="status"
ng-change="filter()">
<option value="">All Statuses</option>
</select>
</th>
<th sortable='total.value' class="sortable">
Total
</th>
<th class="st-sort-disable">
</th>
</tr>
</thead>
<tbody>
<tr grid-item>
<td>
<a ng-bind="item.code"></a>
</td>
<td ng-bind="item.placed | date:'MM/dd/yyyy'"></td>
<td ng-bind="item.purchaseOrderNumber"></td>
<td ng-bind="item.statusDisplay"></td>
<td ng-bind="item.total.formattedValue"></td>
<td>
<a class="btn btn-secondary btn-sm"
href="{{globalData.contextPath + '/my-account/order/' + item.code}}">View
Order</a>
</td>
</tr>
</tbody>
</table>
<div class="col-wrap">
<div class="col2">
<pagination max-size="5"
boundary-links="true"
class="pagination-sm"
Expand All @@ -153,13 +143,16 @@ <h1>Angular Data Grid</h1>
ng-model="paginationOptions.currentPage"
ng-change="reloadGrid()"
items-per-page="paginationOptions.itemsPerPage"></pagination>
</div>
<div class="col2">
<div grid-item-per-page="10, 25, 50, 75" class="pagination-sm"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>

<!--<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>-->
Expand Down
Loading