Skip to content

Commit

Permalink
butler page : change icon
Browse files Browse the repository at this point in the history
  • Loading branch information
fritz-smh committed Apr 1, 2016
1 parent 04a0509 commit bb3cb6f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
12 changes: 6 additions & 6 deletions components/butler.html
@@ -1,8 +1,8 @@
<style>
@font-face {
font-family: 'FontAwesome';
src: url('/static/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot?v=4.5.0');
src: url('/static/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('/static/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('/static/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('/static/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('/static/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');
src: url('/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot?v=4.5.0');
src: url('/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -16,7 +16,7 @@
<style>
@import '/libraries/bootstrap-3.3.5/css/bootstrap.min.css';
</style>
<link rel="stylesheet" href="/static/libraries/font-awesome-4.5.0/css/font-awesome.min.css" shim-domshadow>
<link rel="stylesheet" href="/libraries/font-awesome-4.5.0/css/font-awesome.min.css" shim-domshadow>
<style type="text/css">
#speakButton {
width: 6em;
Expand Down Expand Up @@ -154,12 +154,12 @@ <h1>Butler</h1>
-->

<div id="speakButton" on-click="{{startVoiceRecog}}">
<!-- <span><i class="fa fa-microphone"></i></span> -->
<span>SPEAK</span>
<span><i class="fa fa-microphone fa-3x"></i></span>
<!-- <span>SPEAK</span> -->
</div>

<ul id="chat">
<li id="request" class="itemButler"><span>{{ request }}</span></li>
<li id="request" class="itemUser"><span>{{ request }}</span></li>
<li id="butlerResponse" class="itemButler"><span>{{ butlerResponse }}</span></li>
</ul>

Expand Down
4 changes: 4 additions & 0 deletions static/css/navigation.css
Expand Up @@ -64,6 +64,10 @@
font-size: 2em;
margin: 0 0 0.5em 0.5em;
}
#toggle-radial-top-right i {
font-size: 2em;
margin: 0 0 0.5em 0.5em;
}
#toggle-radial-top-right:hover, #toggle-radial-top-right:active, #toggle-radial-top-right.active {
background: #ffffff;
color: #2D2C2F;
Expand Down
5 changes: 4 additions & 1 deletion templates/base.html
Expand Up @@ -13,6 +13,7 @@
<link rel="stylesheet" href="/libraries/bootstrap-3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/libraries/notifIt-1.1/notifIt/css/notifIt.css">
<link rel="stylesheet" href="/css/style.css">
<link rel="stylesheet" href="/libraries/font-awesome-4.5.0/css/font-awesome.min.css" shim-domshadow>
<link rel="manifest" href="/manifests/manifest.json">
<style type="text/css" id="gridstyle"></style>
<style type="text/css" id="sectionstyle" shim-shadowdom>
Expand Down Expand Up @@ -74,7 +75,9 @@
{{ display_tree(sections, 0) }}
</div>
<div id="butler">
<button id="toggle-radial-top-right"><span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span></button>
<button id="toggle-radial-top-right">
<i class="fa fa-microphone"></i>
</button>
</div>
<div id="modal-overlay" class="overlay"></div>
<script src="/libraries/bootstrap-3.3.5/js/bootstrap.min.js"></script>
Expand Down

0 comments on commit bb3cb6f

Please sign in to comment.