Skip to content

Commit a6e339b

Browse files
onokumusonokumus
committed
Merge branch 'develop'
2 parents 97a544b + 66c50a3 commit a6e339b

614 files changed

Lines changed: 17687 additions & 15574 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,33 @@
1616
[submodule "assets/plupload"]
1717
path = assets/plupload
1818
url = https://github.com/moxiecode/plupload.git
19-
[submodule "assets/fuelux"]
20-
path = assets/fuelux
21-
url = https://github.com/ExactTarget/fuelux.git
19+
[submodule "assets/Font-awesome"]
20+
path = assets/Font-awesome
21+
url = https://github.com/FortAwesome/Font-Awesome.git
22+
[submodule "assets/animate"]
23+
path = assets/animate
24+
url = https://github.com/daneden/animate.css.git
25+
[submodule "assets/uniform"]
26+
path = assets/uniform
27+
url = https://github.com/pixelmatrix/uniform.git
28+
[submodule "assets/validation-engine"]
29+
path = assets/validation-engine
30+
url = https://github.com/posabsolute/jQuery-Validation-Engine.git
31+
[submodule "assets/validation"]
32+
path = assets/validation
33+
url = https://github.com/jzaefferer/jquery-validation.git
34+
[submodule "assets/pagedown-bootstrap"]
35+
path = assets/pagedown-bootstrap
36+
url = https://github.com/samwillis/pagedown-bootstrap.git
37+
[submodule "assets/formwizard"]
38+
path = assets/formwizard
39+
url = https://github.com/thecodemine/formwizard.git
40+
[submodule "assets/bootstrap-timepicker"]
41+
path = assets/bootstrap-timepicker
42+
url = https://github.com/jdewit/bootstrap-timepicker.git
43+
[submodule "assets/img/pattern"]
44+
path = assets/img/pattern
45+
url = https://github.com/subtlepatterns/SubtlePatterns.git
46+
[submodule "assets/gritter"]
47+
path = assets/gritter
48+
url = https://github.com/jboesch/Gritter.git

‎403.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<meta name="viewport" content="width=device-width">
99
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css" />
1010
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap-responsive.min.css" />
11-
<link rel="stylesheet" href="assets/css/font-awesome.min.css" />
11+
<link rel="stylesheet" href="assets/Font-awesome/css/font-awesome.min.css">
1212
<link type="text/css" rel="stylesheet" href="assets/css/error.css" />
1313

1414
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
1515
<!--[if lt IE 9]>
1616
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
1717
<!--[if IE 7]>
18-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome-ie7.min.css"/>
18+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome-ie7.min.css"/>
1919
<![endif]-->
2020
</head>
2121
<body>

‎404.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<meta name="viewport" content="width=device-width">
99
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css" />
1010
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap-responsive.min.css" />
11-
<link rel="stylesheet" href="assets/css/font-awesome.min.css" />
11+
<link rel="stylesheet" href="assets/Font-awesome/css/font-awesome.min.css">
1212
<link type="text/css" rel="stylesheet" href="assets/css/error.css" />
1313

1414
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
1515
<!--[if lt IE 9]>
1616
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
1717
<!--[if IE 7]>
18-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome-ie7.min.css"/>
18+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome-ie7.min.css"/>
1919
<![endif]-->
2020
</head>
2121
<body>

‎405.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<meta name="viewport" content="width=device-width">
99
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css" />
1010
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap-responsive.min.css" />
11-
<link rel="stylesheet" href="assets/css/font-awesome.min.css" />
11+
<link rel="stylesheet" href="assets/Font-awesome/css/font-awesome.min.css">
1212
<link type="text/css" rel="stylesheet" href="assets/css/error.css" />
1313

1414
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
1515
<!--[if lt IE 9]>
1616
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
1717
<!--[if IE 7]>
18-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome-ie7.min.css"/>
18+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome-ie7.min.css"/>
1919
<![endif]-->
2020
</head>
2121
<body>

‎500.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<meta name="viewport" content="width=device-width">
99
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css" />
1010
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap-responsive.min.css" />
11-
<link rel="stylesheet" href="assets/css/font-awesome.min.css" />
11+
<link rel="stylesheet" href="assets/Font-awesome/css/font-awesome.min.css">
1212
<link type="text/css" rel="stylesheet" href="assets/css/error.css" />
1313

1414
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
1515
<!--[if lt IE 9]>
1616
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
1717
<!--[if IE 7]>
18-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome-ie7.min.css"/>
18+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome-ie7.min.css"/>
1919
<![endif]-->
2020
</head>
2121
<body>

‎503.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<meta name="viewport" content="width=device-width">
99
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css" />
1010
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap-responsive.min.css" />
11-
<link rel="stylesheet" href="assets/css/font-awesome.min.css" />
11+
<link rel="stylesheet" href="assets/Font-awesome/css/font-awesome.min.css">
1212
<link type="text/css" rel="stylesheet" href="assets/css/error.css" />
1313

1414
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
1515
<!--[if lt IE 9]>
1616
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
1717
<!--[if IE 7]>
18-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome-ie7.min.css"/>
18+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome-ie7.min.css"/>
1919
<![endif]-->
2020
</head>
2121
<body>

‎alterne.html‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta name="viewport" content="width=device-width">
1212
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.css">
1313
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap-responsive.min.css">
14-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome.min.css">
14+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome.min.css">
1515
<link type="text/css" rel="stylesheet" href="assets/css/style.css">
1616
<link rel="stylesheet" type="text/css" href="assets/css/layout2.css"/>
1717
<link type="text/css" rel="stylesheet" href="assets/css/calendar.css"/>
@@ -24,7 +24,7 @@
2424
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
2525
<!--[if IE 7]>
2626
27-
<link type="text/css" rel="stylesheet" href="assets/css/font-awesome-ie7.min.css"/>
27+
<link type="text/css" rel="stylesheet" href="assets/Font-awesome/css/font-awesome-ie7.min.css"/>
2828
<![endif]-->
2929
</head>
3030
<body>
@@ -42,7 +42,7 @@
4242
<span class="icon-bar"></span>
4343
<span class="icon-bar"></span>
4444
</a>
45-
<a class="brand" href="index.html">Metis <small class="text-info"><sup>1.0</sup></small></a>
45+
<a class="brand" href="index.html">Metis</a>
4646
<!-- .topnav -->
4747
<div class="btn-toolbar topnav">
4848
<div class="btn-group">
@@ -233,7 +233,7 @@ <h5 class="media-heading">Archie</h5>
233233
<div class="row-fluid">
234234
<!-- .inner -->
235235
<div class="span12 inner">
236-
<div class="tac">
236+
<div class="text-center">
237237
<ul class="stats_box">
238238
<li>
239239
<div class="sparkline bar_week"></div>
@@ -266,46 +266,48 @@ <h5 class="media-heading">Archie</h5>
266266
</ul>
267267
</div>
268268
<hr>
269-
<div class="tac">
270-
<a class="glyph" href="#">
269+
<div class="text-center">
270+
271+
<a class="quick-btn" href="#">
271272
<i class="icon-bolt icon-2x"></i>
272273
<span>inverse</span>
273274
<span class="label label-inverse">2</span>
274275
</a>
275-
<a class="glyph" href="#">
276+
<a class="quick-btn" href="#">
276277
<i class="icon-check icon-2x"></i>
277278
<span>important</span>
278279
<span class="label label-important">2</span>
279280
</a>
280-
<a class="glyph" href="#">
281+
<a class="quick-btn" href="#">
281282
<i class="icon-building icon-2x"></i>
282283
<span>No Label</span>
283284
</a>
284-
<a class="glyph" href="#">
285+
<a class="quick-btn" href="#">
285286
<i class="icon-envelope icon-2x"></i>
286287
<span>success</span>
287288
<span class="label label-success">-456</span>
288289
</a>
289-
<a class="glyph" href="#">
290+
<a class="quick-btn" href="#">
290291
<i class="icon-signal icon-2x"></i>
291292
<span>warning</span>
292293
<span class="label label-warning">+25</span>
293294
</a>
294-
<a class="glyph" href="#">
295+
<a class="quick-btn" href="#">
295296
<i class="icon-external-link icon-2x"></i>
296-
<span>&pi;</span>
297+
<span>π</span>
297298
<span class="label btn-metis-2">3.14159265</span>
298299
</a>
299-
<a class="glyph" href="#">
300+
<a class="quick-btn" href="#">
300301
<i class="icon-lemon icon-2x"></i>
301-
<span>&eacute;</span>
302+
<span>é</span>
302303
<span class="label btn-metis-4">2.71828</span>
303304
</a>
304-
<a class="glyph" href="#">
305+
<a class="quick-btn" href="#">
305306
<i class="icon-glass icon-2x"></i>
306-
<span>&phi;</span>
307+
<span>φ</span>
307308
<span class="label btn-metis-3">1.618</span>
308309
</a>
310+
309311
</div>
310312
<hr>
311313
<div class="row-fluid">
@@ -490,23 +492,25 @@ <h3 id="helpModalLabel"><i class="icon-external-link"></i> Help</h3>
490492
</div>
491493
<!-- /#helpModal -->
492494

493-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
494-
<script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
495+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
496+
<script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
497+
495498

496-
<script src="assets/js/vendor/jquery-migrate-1.1.1.min.js"></script>
497499

498-
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/jquery-ui.min.js"></script>
500+
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
499501
<script>window.jQuery.ui || document.write('<script src="assets/js/vendor/jquery-ui-1.10.0.custom.min.js"><\/script>')</script>
500502

501503

502504
<script src="assets/js/vendor/bootstrap.min.js"></script>
503505
<script src="assets/js/lib/jquery.mousewheel.js"></script>
504-
<script src="assets/js/lib/jquery.cookie.js"></script>
506+
505507
<script src="assets/js/lib/jquery.sparkline.min.js"></script>
506-
<script src="assets/js/lib/flot/jquery.flot.js"></script>
507-
<script src="assets/js/lib/flot/jquery.flot.pie.js"></script>
508-
<script src="assets/js/lib/flot/jquery.flot.selection.js"></script>
509-
<script src="assets/js/lib/flot/jquery.flot.resize.js"></script>
508+
509+
<script src="assets/flot/jquery.flot.js"></script>
510+
<script src="assets/flot/jquery.flot.pie.js"></script>
511+
<script src="assets/flot/jquery.flot.selection.js"></script>
512+
<script src="assets/flot/jquery.flot.resize.js"></script>
513+
510514
<script src="assets/js/lib/fullcalendar.min.js"></script>
511515
<script src="assets/js/lib/jquery.tablesorter.min.js"></script>
512516

assets/img/cleditor/buttons.gif renamed to assets/CLEditor1_4_1/images/buttons.gif

File renamed without changes.

assets/img/cleditor/toolbar.gif renamed to assets/CLEditor1_4_1/images/toolbar.gif

File renamed without changes.

assets/css/jquery.cleditor.css renamed to assets/CLEditor1_4_1/jquery.cleditor.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.cleditorMain {border:1px solid #999; padding:0 1px 1px; background-color:white}
22
.cleditorMain iframe {border:none; margin:0; padding:0}
33
.cleditorMain textarea {border:none; margin:0; padding:0; overflow-y:scroll; font:10pt Arial,Verdana; resize:none; outline:none /* webkit grip focus */}
4-
.cleditorToolbar {background: url('../img/cleditor/toolbar.gif') repeat}
4+
.cleditorToolbar {background: url('images/toolbar.gif') repeat}
55
.cleditorGroup {float:left; height:26px}
6-
.cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('../img/cleditor/buttons.gif')}
6+
.cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('images/buttons.gif')}
77
.cleditorDisabled {opacity:0.3; filter:alpha(opacity=30)}
88
.cleditorDivider {float:left; width:1px; height:23px; margin:1px 0 1px 0; background:#CCC}
9-
.cleditorPopup {border:solid 1px #999; background-color:white; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000}
9+
.cleditorPopup {border:solid 1px #999; background-color:white; color:#333333; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000}
1010
.cleditorList div {padding:2px 4px 2px 4px}
1111
.cleditorList p,
1212
.cleditorList h1,

0 commit comments

Comments
 (0)