Skip to content

Commit

Permalink
Merge pull request #87 from danielperna84/revert-86-master
Browse files Browse the repository at this point in the history 
Revert 86 master
  • Loading branch information
@danielperna84
danielperna84 authored Apr 19, 2018
2 parents 01eeaed + 6a17f79 commit 8af74fe
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 35 deletions.
28 changes: 11 additions & 17 deletions configurator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<title>HASS Configurator</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.2.43/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.0.46/css/materialdesignicons.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
<style type="text/css" media="screen">
body {
Expand All @@ -110,7 +110,7 @@
#editor {
position: fixed;
top: 145px;
top: 135px;
right: 0;
bottom: 0;
}
Expand Down Expand Up @@ -236,16 +236,11 @@
input.currentfile_input {
margin-bottom: 0;
padding-top: 10px;
margin-top: 0;
padding-left: 5px;
border-bottom: 0;
}
.input_padding {
padding-top: 10px;
}
.side_tools {
vertical-align: middle;
}
Expand Down Expand Up @@ -562,9 +557,9 @@
height: auto;
}
</style>
<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.3.3/ext-modelist.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>
<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.2.9/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>
</head>
<body>
<div class="preloader-background">
Expand Down Expand Up @@ -1593,7 +1588,6 @@
<a class="light-blue-text" href="https://github.com/nodeca/js-yaml" target="_blank">
<div class="card grey lighten-3 hoverable">
<div class="card-image">
<img src="https://avatars2.githubusercontent.com/u/723678?s=200&v=4">
</div>
<div class="card-content">
<p class="grey-text text-darken-2">js-yaml</p>
Expand All @@ -1616,7 +1610,7 @@
</div>
</div>
<!-- Main Editor Area -->
<div class="row input_padding">
<div class="row">
<div class="col m4 l3 hide-on-small-only">
<br>
<div class="input-field col s12">
Expand Down Expand Up @@ -1660,8 +1654,8 @@
</div>
</div>
<div class="col s12 m8 l9">
<div class="input-field col s12 pathtip">
<input placeholder="File Path" class="currentfile_input" value="" id="currentfile" type="text">
<div class="card input-field col s12 grey lighten-4 hoverable pathtip">
<input class="currentfile_input" value="" id="currentfile" type="text">
<i class="material-icons" id="lint-status" onclick="show_lint_error()"></i>
</div>
</div>
Expand Down Expand Up @@ -2068,14 +2062,14 @@
<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>
</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.3.3 </p>
<p class="center col s12"> Ace Editor 1.2.9 </p>
</div>
</ul>
</div>
</main>
<input type="hidden" id="fb_currentfile" value="" />
<!-- Scripts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript">
var global_current_filepath = null;
Expand Down
30 changes: 12 additions & 18 deletions dev.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<title>HASS Configurator</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.2.43/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.0.46/css/materialdesignicons.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
<style type="text/css" media="screen">
body {
Expand All @@ -23,7 +23,7 @@

#editor {
position: fixed;
top: 145px;
top: 135px;
right: 0;
bottom: 0;
}
Expand Down Expand Up @@ -149,16 +149,11 @@

input.currentfile_input {
margin-bottom: 0;

padding-top: 10px;
margin-top: 0;
padding-left: 5px;
border-bottom: 0;
}

.input_padding {
padding-top: 10px;
}

.side_tools {
vertical-align: middle;
}
Expand Down Expand Up @@ -475,9 +470,9 @@
height: auto;
}
</style>
<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.3.3/ext-modelist.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>
<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.2.9/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>
</head>
<body>
<div class="preloader-background">
Expand Down Expand Up @@ -1506,7 +1501,6 @@ <h4 class="grey-text text-darken-3"><a class="black-text" href="https://github.c
<a class="light-blue-text" href="https://github.com/nodeca/js-yaml" target="_blank">
<div class="card grey lighten-3 hoverable">
<div class="card-image">
<img src="https://avatars2.githubusercontent.com/u/723678?s=200&v=4">
</div>
<div class="card-content">
<p class="grey-text text-darken-2">js-yaml</p>
Expand All @@ -1529,7 +1523,7 @@ <h4 class="grey-text text-darken-3"><a class="black-text" href="https://github.c
</div>
</div>
<!-- Main Editor Area -->
<div class="row input_padding">
<div class="row">
<div class="col m4 l3 hide-on-small-only">
<br>
<div class="input-field col s12">
Expand Down Expand Up @@ -1573,8 +1567,8 @@ <h4 class="grey-text text-darken-3"><a class="black-text" href="https://github.c
</div>
</div>
<div class="col s12 m8 l9">
<div class="input-field col s12 pathtip">
<input placeholder="File Path" class="currentfile_input" value="" id="currentfile" type="text">
<div class="card input-field col s12 grey lighten-4 hoverable pathtip">
<input class="currentfile_input" value="" id="currentfile" type="text">
<i class="material-icons" id="lint-status" onclick="show_lint_error()"></i>
</div>
</div>
Expand Down Expand Up @@ -1981,14 +1975,14 @@ <h4 class="grey-text text-darken-3"><a class="black-text" href="https://github.c
<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>
</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.3.3 </p>
<p class="center col s12"> Ace Editor 1.2.9 </p>
</div>
</ul>
</div>
</main>
<input type="hidden" id="fb_currentfile" value="" />
<!-- Scripts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript">
var global_current_filepath = null;
Expand Down Expand Up @@ -3130,4 +3124,4 @@ <h4 class="grey-text text-darken-3"><a class="black-text" href="https://github.c
editor.on('change', queue_lint);
</script>
</body>
</html>
</html>

0 comments on commit 8af74fe

Please sign in to comment.