Skip to content

Commit

Permalink
New fonts, cleaned up file structure, query form tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
13protons committed Nov 10, 2014
1 parent 6a85a08 commit 8abbc6a
Show file tree
Hide file tree
Showing 24 changed files with 964 additions and 3,723 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ gulp.task('css', function() {
'./src/styles/pure.css'
,'./src/styles/grids-responsive.css'
,'./src/styles/prism.css'
,'./src/styles/animate.css'
,'./src/styles/styles.css'
,'./src/styles/macgyver.css'
,'./src/scripts/vendor/macgyver/*.css'
])
/*.pipe(sourcemaps.init())*/
Expand Down
2 changes: 2 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<meta name="fragment" content="!" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
<link rel="shortcut icon" href="/favicon.ico" type="image/ico" />
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,700' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:300,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="styles/zetta.css" />
<script src="scripts/zetta.js"></script>

Expand Down
15 changes: 11 additions & 4 deletions src/partials/advanced-query.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<strong>Device Query Form</strong>
</div>
<div class="pure-u-1-24 dismiss">
<button type="button" class="icon" ng-click="dismiss()" mac-tooltip="Hide Query Form" mac-tooltip-direction="bottom">delete</button>
<button type="button" class="icon" ng-click="dismiss()" mac-tooltip="Hide Query Form" mac-tooltip-direction="bottom">minus</button>
</div>

</div>
Expand All @@ -22,7 +22,9 @@

<div class="pure-u-1-12 icon_column"><button type="button" class="icon" ng-click="removeFilter($index)" ng-disabled="filters.length < 2" mac-tooltip="Remove Group" mac-tooltip-direction="bottom">delete</button></div>
<div class="pure-u-11-12 pure-g">
<label class="pure-u-1-4" mac-tooltip="'string' name of device property" mac-tooltip-direction="bottom">property</label>
<label class="pure-u-1-4" >
<span mac-tooltip="'string' name of device property" mac-tooltip-direction="bottom">property</span>
</label>
<!--<input class="pure-u-5-12" type="text" name="property" ng-model="filter.field" placeholder="type, name, id..."/>-->
<mac-autocomplete
class="pure-u-5-12"
Expand All @@ -31,7 +33,10 @@
placeholder="type, name, id..."
ng-model="filter.field">
</mac-autocomplete>
<br/><label class="pure-u-1-4">comparison</label>
<br/><label class="pure-u-1-4">
<span mac-tooltip="Method used to compare 'property' with 'value'" mac-tooltip-direction="bottom">comparison</span>

</label>
<select class="pure-u-5-12" name="comparison" ng-model="filter.operator">
<option value="eq">=</option>
<option value="gt">&gt;</option>
Expand All @@ -40,7 +45,9 @@
<option value="lte">&lt;=</option>
<option value="like">like</option>
</select>
<br/><label class="pure-u-1-4" mac-tooltip="String or number value of property.<br/>Strings can contain the '%' wildcard<br/>when used with 'like'" mac-tooltip-direction="bottom">value</label><input class="pure-u-5-12" type="text" name="value" ng-model="filter.value" placeholder="% wildcard matches 0 or more characters"/>
<br/><label class="pure-u-1-4">
<span mac-tooltip="String or number value of property.<br/>Strings can contain the '%' wildcard<br/>when used with 'like'" mac-tooltip-direction="bottom">value</span>
</label><input class="pure-u-5-12" type="text" name="value" ng-model="filter.value" placeholder="% wildcard matches 0 or more characters"/>


</div>
Expand Down
10 changes: 9 additions & 1 deletion src/partials/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,15 @@ <h2 class="name pure-u-2-3">
<div class="pure-u-1-6 pure-u-md-1-12"></div>
<div class="pure-u-5-6 pure-u-md-11-12 pure-g">
<div class="name pure-u-1-2 pure-u-md-1-4">:{{property}}</div>
<div class="value before-md pure-u-md-1-3">{{ value }}</div>
<div class="val before-md pure-u-md-5-12">
<input
type="text"
value="{{ value }}"
class="pure-u-1"
readonly
select-on-click
/>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/partials/start.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<section class="page_content front-door pure-g" ng-init="init()">
<header class="pure-u-1">
<section class="content">
<h1 class="">Zetta Browser</h1>
<h1 class="front_door">Zetta Browser</h1>
<div class="serverError" ng-show="errMsg">
{{errMsg}}
</div>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 0 additions & 7 deletions src/scripts/vendor/macgyver/macgyver.css

This file was deleted.

Loading

0 comments on commit 8abbc6a

Please sign in to comment.