Skip to content

Commit c60ca4c

Browse files
grudgrud
committed
gh-pages v3.0.0-rc.11-f9801a9
1 parent b8a38ca commit c60ca4c

File tree

7 files changed

+117
-97
lines changed

7 files changed

+117
-97
lines changed

‎css/site.css

+21-1
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,24 @@ body {
197197
.hidden-phone {
198198
display: none !important;
199199
}
200-
}
200+
}
201+
202+
.modal {
203+
display: block;
204+
}
205+
.modal-body:before,
206+
.modal-body:after {
207+
display: table;
208+
content: " ";
209+
}
210+
.modal-header:before,
211+
.modal-header:after {
212+
display: table;
213+
content: " ";
214+
}
215+
p.modal-message {
216+
margin: 10px 0;
217+
}
218+
.compiled-css {
219+
margin-bottom: 10px;
220+
}

‎customizer/index.html

+89-88
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<head>
77
<meta charset="utf-8">
88
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
9-
<link rel="stylesheet" href="/docs/css/bootstrap.min.css" />
10-
<link rel="stylesheet" href="/docs/css/bootstrap-flatly.css" />
9+
<!-- <link rel="stylesheet" href="/docs/css/bootstrap.min.css" /> -->
10+
<link rel="stylesheet" href="/docs/css/bootstrap-flatly.min.css" />
1111
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" />
1212
<link rel="stylesheet" href="/css/site.css" />
1313
<!--<link rel="stylesheet" href="/release/ui-grid-unstable.css" />-->
@@ -41,47 +41,45 @@
4141
</script>
4242
</head>
4343
<body>
44-
<header class="header">
45-
<div class="navbar navbar-fixed-top">
46-
<div class="navbar-inner">
47-
<div class="container">
48-
<a href="/" class="brand">UI Grid</a>
49-
<ul class="nav">
50-
<li class="dropdown">
51-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
52-
Learn
53-
<b class="caret"></b>
54-
</a>
55-
<ul class="dropdown-menu">
56-
<li>
57-
<a href="/docs/#/api">Docs</a>
58-
</li>
59-
<li>
60-
<a href="/docs/#/tutorial">Tutorial</a>
61-
</li>
62-
</ul>
44+
<div class="navbar navbar-default navbar-fixed-top">
45+
<div class="nav navbar-header">
46+
<a href="/" class="navbar-brand">UI Grid</a>
47+
<ul class="nav navbar-nav">
48+
<li class="dropdown">
49+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
50+
Learn
51+
<b class="caret"></b>
52+
</a>
53+
<ul class="dropdown-menu" role="menu">
54+
<li>
55+
<a href="/docs/#/api">Docs</a>
56+
</li>
57+
<li>
58+
<a href="/docs/#/tutorial">Tutorial</a>
6359
</li>
6460
</ul>
65-
<p class="navbar-text pull-right">
66-
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=watch&count=true"
67-
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
68-
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=fork&count=true"
69-
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
70-
</p>
71-
</div>
72-
</div>
61+
</li>
62+
</ul>
63+
</div>
64+
<div class="navbar-header navbar-right">
65+
<p class="navbar-text hidden-phone">
66+
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=watch&count=true"
67+
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
68+
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=fork&count=true"
69+
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
70+
</p>
7371
</div>
74-
</header>
72+
</div>
7573

76-
<div ng-cloak class="container" id="customizerApp" ng-controller='Main'>
74+
<div ng-cloak class="container-fluid" id="customizerApp" ng-controller='Main'>
7775
<br>
7876

7977
<h2 class="text-center">Grid Customizer</h2>
8078

8179
<br>
8280

8381
<div class="row">
84-
<div class="span12">
82+
<div class="col-md-12">
8583
<button type="button" class="btn btn-success" ng-click="resetVariables()">Reset Variables</button>
8684
&nbsp;
8785
&nbsp;
@@ -112,66 +110,69 @@ <h2 class="text-center">Grid Customizer</h2>
112110

113111
<br>
114112

115-
<div class="row">
116-
<div class="span8">
117-
<form class="container">
118-
<div class="span4" ng-repeat="v in variables track by $index">
119-
<label for="{{ v.name }}" class="muted">{{ v.name }}</label> <input id="{{ v.name }}" type="text" ng-model="v.value" ng-change="updateCSS()">
113+
<div class="container-fluid">
114+
<div class="row">
115+
<div class="col-xs-6 col-md-8">
116+
<form>
117+
<div class="col-sm-12 col-md-6 col-lg-4" ng-repeat="v in variables track by $index">
118+
<label for="{{ v.name }}" class="muted">{{ v.name }}</label> <input id="{{ v.name }}" type="text" class="form-control" ng-model="v.value" ng-change="updateCSS()">
119+
</div>
120+
</form>
121+
</div>
122+
<div class="col-xs-6 col-md-4">
123+
<div data-spy="affix" data-offset-top="0">
124+
<style>
125+
.grid {
126+
width: 400px;
127+
height: 300px;
128+
}
129+
</style>
130+
131+
<style ui-grid-style>
132+
{{ css }}
133+
</style>
134+
135+
<div class="grid" ui-grid="gridOptions"></div>
120136
</div>
121-
</form>
122-
</div>
123-
<div class="span4">
124-
<div data-spy="affix" data-offset-top="0">
125-
<style>
126-
.grid {
127-
width: 400px;
128-
height: 300px;
129-
}
130-
</style>
131-
132-
<style ui-grid-style>
133-
{{ css }}
134-
</style>
135-
136-
<div class="grid" ui-grid="gridOptions"></div>
137137
</div>
138138
</div>
139-
</div>
140-
141-
<div class="text-error">{{ cssErr }}</div>
142-
143-
<br>
144-
145-
<label for="customLess">Custom Less</label>
146-
<textarea class="span8" id="customLess" rows="4" ng-model="customLess" ng-change="updateCSS()" ng-init="customLess = ''"></textarea>
147-
148-
<br>
149-
<br>
139+
140+
<div class="text-error">{{ cssErr }}</div>
141+
142+
<br>
143+
144+
<label for="customLess">Custom Less</label>
145+
<textarea class="col-xs-12" class="form-control" id="customLess" rows="4" ng-model="customLess" ng-change="updateCSS()" ng-init="customLess = ''"></textarea>
146+
147+
<br>
148+
<br>
149+
</div>
150150

151151
<div ng-cloak ng-show="showDownload" class="modal">
152-
<div class="modal-header">
153-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="showDownload = false">&times;</button>
154-
<h3>Download</h3>
155-
</div>
156-
<div class="modal-body">
157-
<div class="btn-group" data-toggle="buttons-radio">
158-
<button type="button" class="btn btn-success" ng-class="{ 'active' : !compressed }" ng-click="updateCSS(false)">Full</button>
159-
<button type="button" class="btn btn-success" ng-class="{ 'active' : compressed }" ng-click="updateCSS(true)">Minified</button>
152+
<div class="modal-dialog">
153+
<div class="modal-content">
154+
<div class="modal-header">
155+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="showDownload = false">&times;</button>
156+
<h3>Download CSS</h3>
157+
</div>
158+
<div class="modal-body">
159+
<button class="btn btn-success" ng-click="updateCSS(!compress)">{{ compress ? "Display Full" : "Display Minified" }}</button>
160+
&nbsp;
161+
&nbsp;
162+
<p class="modal-message">
163+
<strong>Size:</strong> {{ cssSize() }}
164+
</p>
165+
166+
<textarea hover-select row="20" class="compiled-css col-xs-12" readonly>{{ css }}</textarea>
167+
<p class="modal-message">
168+
Hover then copy and paste the CSS.
169+
</p>
170+
<!-- <button class="btn btn-success" data-clipboard-text="{{ css }}">Copy to Clipboard</button> -->
171+
</div>
172+
<div class="modal-footer">
173+
<a href="#" class="btn" ng-click="showDownload = false">Close</a>
174+
</div>
160175
</div>
161-
&nbsp;
162-
&nbsp;
163-
<strong>Size:</strong> {{ cssSize() }}
164-
165-
<br>
166-
<br>
167-
168-
<textarea hover-select row="20" class="compiled-css span5" readonly>{{ css }}</textarea>
169-
<br>
170-
Hover then copy and paste the CSS.
171-
<!-- <button class="btn btn-success" data-clipboard-text="{{ css }}">Copy to Clipboard</button> -->
172-
</div>
173-
<div class="modal-footer">
174-
<a href="#" class="btn" ng-click="showDownload = false">Close</a>
175176
</div>
176177
</div>
177178

@@ -194,11 +195,11 @@ <h3>Download</h3>
194195
</script>
195196
-->
196197

197-
<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
198+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
199+
<!-- <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> -->
198200
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.9/angular.js"></script>
199201

200202
<script>
201-
debugger;
202203
var s = document.createElement('script');
203204
if (window.location.href.match('ui-grid.info')) {
204205
s.src = '/release/ui-grid-unstable.js';

‎index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ <h1 class="text-center">Angular UI Grid</h1>
6161
Code on Github
6262
</a>
6363

64-
<a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages/release" title="Download 3.0.0-rc.11-174f252">
64+
<a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages/release" title="Download 3.0.0-rc.11-f9801a9">
6565
<i class="fa fa-download fa-fw"></i>
66-
<!-- Download <small>( 2.0.13 / 3.0.0-rc.11-174f252 )</small> --> <!-- TODO(c0bra): note: not showing stable version till 3.0.0 is released -->
66+
<!-- Download <small>( 2.0.13 / 3.0.0-rc.11-f9801a9 )</small> --> <!-- TODO(c0bra): note: not showing stable version till 3.0.0 is released -->
6767

68-
Download <small>( 3.0.0-rc.11-174f252 )</small>
68+
Download <small>( 3.0.0-rc.11-f9801a9 )</small>
6969
</a>
7070

7171
<a class="btn btn-success btn-large" href="http://ui-grid.info/docs/#/tutorial" title="Tutorial">

‎js/customizer.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@ app.controller('Main', function($log, $http, $scope, less, Theme) {
4444

4545
$scope.variables = angular.copy($scope.defaultVariables);
4646
$scope.updateCSS();
47-
}
47+
};
4848

4949
$scope.updateCSS = function(compress) {
5050
$scope.compress = compress;
51-
5251
var fullSrc = $scope.source + ' ' + $scope.customLess;
5352
var src = less.replaceVariables(fullSrc, $scope.variables);
5453
less.process(src, $scope.compress)

‎less/ui-grid.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! ui-grid - v3.0.0-rc.11-174f252 - 2014-10-07
1+
/*! ui-grid - v3.0.0-rc.11-f9801a9 - 2014-10-08
22
* Copyright (c) 2014 ; License: MIT */
33
.ui-grid-animate-spin {
44
-moz-animation: ui-grid-spin 2s infinite linear;

‎release/ui-grid-unstable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! ui-grid - v3.0.0-rc.11-174f252 - 2014-10-07
1+
/*! ui-grid - v3.0.0-rc.11-f9801a9 - 2014-10-08
22
* Copyright (c) 2014 ; License: MIT */
33
(function () {
44
'use strict';

‎release/ui-grid-unstable.min.js

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

0 commit comments

Comments
 (0)