Merge pull request #86 from jmart518/master

CDN Update
This commit is contained in:
Daniel Perna 2018-04-20 00:26:05 +02:00 committed by GitHub
commit 01eeaed84c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 23 deletions

View file

@ -92,7 +92,7 @@ INDEX = Template(r"""<!DOCTYPE html>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<title>HASS Configurator</title> <title>HASS Configurator</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.0.46/css/materialdesignicons.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.2.43/css/materialdesignicons.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { body {
@ -110,7 +110,7 @@ INDEX = Template(r"""<!DOCTYPE html>
#editor { #editor {
position: fixed; position: fixed;
top: 135px; top: 145px;
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
@ -236,11 +236,16 @@ INDEX = Template(r"""<!DOCTYPE html>
input.currentfile_input { input.currentfile_input {
margin-bottom: 0; margin-bottom: 0;
margin-top: 0;
padding-top: 10px;
padding-left: 5px; padding-left: 5px;
border-bottom: 0; border-bottom: 0;
} }
.input_padding {
padding-top: 10px;
}
.side_tools { .side_tools {
vertical-align: middle; vertical-align: middle;
} }
@ -557,9 +562,9 @@ INDEX = Template(r"""<!DOCTYPE html>
height: auto; height: auto;
} }
</style> </style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-modelist.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-language_tools.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-language_tools.js" type="text/javascript" charset="utf-8"></script>
</head> </head>
<body> <body>
<div class="preloader-background"> <div class="preloader-background">
@ -1588,6 +1593,7 @@ INDEX = Template(r"""<!DOCTYPE html>
<a class="light-blue-text" href="https://github.com/nodeca/js-yaml" target="_blank"> <a class="light-blue-text" href="https://github.com/nodeca/js-yaml" target="_blank">
<div class="card grey lighten-3 hoverable"> <div class="card grey lighten-3 hoverable">
<div class="card-image"> <div class="card-image">
<img src="https://avatars2.githubusercontent.com/u/723678?s=200&v=4">
</div> </div>
<div class="card-content"> <div class="card-content">
<p class="grey-text text-darken-2">js-yaml</p> <p class="grey-text text-darken-2">js-yaml</p>
@ -1610,7 +1616,7 @@ INDEX = Template(r"""<!DOCTYPE html>
</div> </div>
</div> </div>
<!-- Main Editor Area --> <!-- Main Editor Area -->
<div class="row"> <div class="row input_padding">
<div class="col m4 l3 hide-on-small-only"> <div class="col m4 l3 hide-on-small-only">
<br> <br>
<div class="input-field col s12"> <div class="input-field col s12">
@ -1654,8 +1660,8 @@ INDEX = Template(r"""<!DOCTYPE html>
</div> </div>
</div> </div>
<div class="col s12 m8 l9"> <div class="col s12 m8 l9">
<div class="card input-field col s12 grey lighten-4 hoverable pathtip"> <div class="input-field col s12 pathtip">
<input class="currentfile_input" value="" id="currentfile" type="text"> <input placeholder="File Path" class="currentfile_input" value="" id="currentfile" type="text">
<i class="material-icons" id="lint-status" onclick="show_lint_error()"></i> <i class="material-icons" id="lint-status" onclick="show_lint_error()"></i>
</div> </div>
</div> </div>
@ -2062,14 +2068,14 @@ INDEX = Template(r"""<!DOCTYPE html>
<input id="wrap_limit" type="number" onchange="editor.setOption('wrap', parseInt(this.value))" min="1" value="80"> <input id="wrap_limit" type="number" onchange="editor.setOption('wrap', parseInt(this.value))" min="1" value="80">
<label class="active" for="wrap_limit">Wrap Limit</label> <label class="active" for="wrap_limit">Wrap Limit</label>
</div> <a class="waves-effect waves-light btn light-blue" onclick="save_ace_settings()">Save Settings Locally</a> </div> <a class="waves-effect waves-light btn light-blue" onclick="save_ace_settings()">Save Settings Locally</a>
<p class="center col s12"> Ace Editor 1.2.9 </p> <p class="center col s12"> Ace Editor 1.3.3 </p>
</div> </div>
</ul> </ul>
</div> </div>
</main> </main>
<input type="hidden" id="fb_currentfile" value="" /> <input type="hidden" id="fb_currentfile" value="" />
<!-- Scripts --> <!-- Scripts -->
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var global_current_filepath = null; var global_current_filepath = null;

View file

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<title>HASS Configurator</title> <title>HASS Configurator</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.0.46/css/materialdesignicons.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.2.43/css/materialdesignicons.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { body {
@ -23,7 +23,7 @@
#editor { #editor {
position: fixed; position: fixed;
top: 135px; top: 145px;
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
@ -149,11 +149,16 @@
input.currentfile_input { input.currentfile_input {
margin-bottom: 0; margin-bottom: 0;
margin-top: 0;
padding-top: 10px;
padding-left: 5px; padding-left: 5px;
border-bottom: 0; border-bottom: 0;
} }
.input_padding {
padding-top: 10px;
}
.side_tools { .side_tools {
vertical-align: middle; vertical-align: middle;
} }
@ -470,9 +475,9 @@
height: auto; height: auto;
} }
</style> </style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-modelist.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-language_tools.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-language_tools.js" type="text/javascript" charset="utf-8"></script>
</head> </head>
<body> <body>
<div class="preloader-background"> <div class="preloader-background">
@ -1501,6 +1506,7 @@
<a class="light-blue-text" href="https://github.com/nodeca/js-yaml" target="_blank"> <a class="light-blue-text" href="https://github.com/nodeca/js-yaml" target="_blank">
<div class="card grey lighten-3 hoverable"> <div class="card grey lighten-3 hoverable">
<div class="card-image"> <div class="card-image">
<img src="https://avatars2.githubusercontent.com/u/723678?s=200&v=4">
</div> </div>
<div class="card-content"> <div class="card-content">
<p class="grey-text text-darken-2">js-yaml</p> <p class="grey-text text-darken-2">js-yaml</p>
@ -1523,7 +1529,7 @@
</div> </div>
</div> </div>
<!-- Main Editor Area --> <!-- Main Editor Area -->
<div class="row"> <div class="row input_padding">
<div class="col m4 l3 hide-on-small-only"> <div class="col m4 l3 hide-on-small-only">
<br> <br>
<div class="input-field col s12"> <div class="input-field col s12">
@ -1567,8 +1573,8 @@
</div> </div>
</div> </div>
<div class="col s12 m8 l9"> <div class="col s12 m8 l9">
<div class="card input-field col s12 grey lighten-4 hoverable pathtip"> <div class="input-field col s12 pathtip">
<input class="currentfile_input" value="" id="currentfile" type="text"> <input placeholder="File Path" class="currentfile_input" value="" id="currentfile" type="text">
<i class="material-icons" id="lint-status" onclick="show_lint_error()"></i> <i class="material-icons" id="lint-status" onclick="show_lint_error()"></i>
</div> </div>
</div> </div>
@ -1975,14 +1981,14 @@
<input id="wrap_limit" type="number" onchange="editor.setOption('wrap', parseInt(this.value))" min="1" value="80"> <input id="wrap_limit" type="number" onchange="editor.setOption('wrap', parseInt(this.value))" min="1" value="80">
<label class="active" for="wrap_limit">Wrap Limit</label> <label class="active" for="wrap_limit">Wrap Limit</label>
</div> <a class="waves-effect waves-light btn light-blue" onclick="save_ace_settings()">Save Settings Locally</a> </div> <a class="waves-effect waves-light btn light-blue" onclick="save_ace_settings()">Save Settings Locally</a>
<p class="center col s12"> Ace Editor 1.2.9 </p> <p class="center col s12"> Ace Editor 1.3.3 </p>
</div> </div>
</ul> </ul>
</div> </div>
</main> </main>
<input type="hidden" id="fb_currentfile" value="" /> <input type="hidden" id="fb_currentfile" value="" />
<!-- Scripts --> <!-- Scripts -->
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var global_current_filepath = null; var global_current_filepath = null;
@ -3124,4 +3130,4 @@ function show_lint_error() {
editor.on('change', queue_lint); editor.on('change', queue_lint);
</script> </script>
</body> </body>
</html> </html>