Skip to content

created a grid for action items #1

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
gmedrano merged 4 commits into from
Sep 24, 2014
Merged

created a grid for action items #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a19f515
created a grid for action items
gmedrano Sep 24, 2014
51912e1
created a grid for action items
gmedrano Sep 24, 2014
313301a
added markup and styles to Actions grid to match static prototype
gmedrano Sep 24, 2014
def2054
resolved a few conflicts
gmedrano Sep 24, 2014
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
45 changes: 44 additions & 1 deletion apps/st2-actions/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,50 @@
position: relative;

flex: 1;


.panel-default {
border: none;
border-radius: 0;
}

.panel-heading {
background: #666;
border-bottom: 1px solid #999;
h2 {
color: white;
font-size: 15px;
text-transform: uppercase;
font-weight: 200;
font-family: Oswald;
}
}

.panel-body {
padding: 0;
}

.panel, .panel-heading, .panel-body, .table {
border: none;
border-radius: 0;
box-shadow: none;
margin: 0;

th {
border-bottom: none;
}
.odd {
background-color: #E9E9EC;
}
.even {
background-color: transparent;
}
.table-hover > tbody > tr:hover > td,
.table-hover > tbody > tr:hover > th {
background-color: #428bca;
color: white;
}
}

&__list {
margin: 0;
padding: 0;
Expand Down
29 changes: 28 additions & 1 deletion apps/st2-actions/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,40 @@
<div class="st2-panel" ng-class="{'st2-panel--slide': state.includes('*.details')}">

<div class="st2-actions">
<div class="st2-actions panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">Category One</h2>
</div>

<div class="panel-body">
<table class="table table-hover">
<thead>
<tr>
<th>Machine Name</th>
<th>Human-friendly Name</th>
<th>Description</th>
<th>Status</th>
</tr>
</thead>

<tbody>
<tr ng-class-odd="'odd'" ng-class-even="'even'" ng-repeat="action in actions" ng-click="state.go('^.summary', {id: action.id})">
<td>{{ action.name }}</td>
<td>{{ action.runner_type }}</td>
<td>{{ action.description }}</td>
<td><span class="label label-warning">{{ action.enabled }}</span></td>
</tr>
</tbody>
</table>
</div>

<!--
<ul class="st2-actions__list">
<li class="st2-actions__item" ng-repeat="action in actions"
ng-click="state.go('^.summary', {id: action.id})">
{{ action | json }}
</li>
</ul>
-->

<div class="st2-panel__back-button" ng-click="state.go('^.summary', {id: current.id})"></div>
</div>
Expand Down
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<link rel="stylesheet" href='http://fonts.googleapis.com/css?family=Oswald:400,300,700'>

<!-- buils:styles -->
<link rel="stylesheet" href="css/style.css">
Expand Down
5 changes: 5 additions & 0 deletions less/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
@import (inline) "../components/normalize-css/normalize.css";

@import (reference) '/components/bootstrap/less/variables.less';
@import (reference) '/components/bootstrap/less/mixins.less';

@import "fonts";
@import "layout";
@import "colors";
@import "/components/bootstrap/less/tables.less";
@import "/components/bootstrap/less/panels.less";

html, body {
height: 100%;
Expand Down