master
Lucas Pleß 10 years ago
parent 076eb83d36
commit a0a37bfd1e

@ -3,14 +3,16 @@
<component name="ChangeListManager">
<list default="true" id="72d93b4a-de8e-43f1-9d4b-34713e827c14" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/css/style.css" afterPath="$PROJECT_DIR$/bootstrap/css/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="nodeartnet.iws" />
<ignored path=".idea/workspace.xml" />
<file path="$PROJECT_DIR$/../hackcentercontrol/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356729852724" ignored="false" />
<file path="/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356736182346" ignored="false" />
<file path="/index.html" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737224079" ignored="false" />
<file path="/Dummy.txt" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737254340" ignored="false" />
<file path="/index.html" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747261765" ignored="false" />
<file path="/Dummy.txt" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737465166" ignored="false" />
<file path="/style.css" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747281902" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -79,19 +81,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="21" selection-start="253" selection-end="253" vertical-scroll-proportion="-6.6666665">
<folding />
<state line="186" column="21" selection-start="8852" selection-end="8852" vertical-scroll-proportion="-17.5">
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="style.css" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="style.css" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="61" column="0" selection-start="888" selection-end="888" vertical-scroll-proportion="0.0">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="1.3847874">
<folding />
</state>
</provider>
@ -117,8 +121,8 @@
<list>
<option value="$PROJECT_DIR$/bootstrap/css/screen.css" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/bootstrap/css/style.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/bootstrap/css/style.css" />
</list>
</option>
</component>
@ -174,24 +178,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="bootstrap" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
@ -378,19 +364,23 @@
<created>1356737256300</created>
<updated>1356737256300</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="bugfix">
<created>1356737467286</created>
<updated>1356737467286</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-4" y="25" width="1608" height="853" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3286119" sideWeight="0.497426" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3286119" sideWeight="0.497426" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3286119" sideWeight="0.4980695" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286119" sideWeight="0.4980695" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@ -446,7 +436,7 @@
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="blub" />
<option name="LAST_COMMIT_MESSAGE" value="bugfix" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@ -462,6 +452,7 @@
<MESSAGE value="included badboys buttons" />
<MESSAGE value="added some logging" />
<MESSAGE value="blub" />
<MESSAGE value="bugfix" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@ -477,27 +468,31 @@
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="96" selection-start="672" selection-end="672" vertical-scroll-proportion="0.0">
<folding />
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state line="61" column="0" selection-start="888" selection-end="888" vertical-scroll-proportion="0.0">
<state line="46" column="20" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="46" column="20" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.0">
<folding />
<state line="186" column="21" selection-start="8852" selection-end="8852" vertical-scroll-proportion="-17.5">
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="21" selection-start="253" selection-end="253" vertical-scroll-proportion="-6.6666665">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="1.3847874">
<folding />
</state>
</provider>

@ -17,9 +17,12 @@
}
.span3 {
border: 1px solid black;
margin: 5px;
width: 250px;
margin: 10px;
width: 200px;
height: 150px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.spansmall {
width: 100px;
@ -59,3 +62,8 @@
.btn-group + .btn-group {
margin-left: 0;
}
.footer {
margin-left: 20px;
}

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Hackcenter Light Control</title>
<title>hackcenter light control</title>
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="css/style.css" rel="stylesheet" media="screen">
@ -9,6 +9,9 @@
</head>
<body>
<div class="container left">
<h3>hackcenter light control</h3>
<div class="row">
<div class="span3">
<div class="btn-group wabe-1-1-red" data-channel="/2/multitoggle/1/1">
@ -158,7 +161,6 @@
<button class="btn btn-danger">off</button>
</div>
</div>
</div>
</div>
@ -175,13 +177,16 @@
</div>
-->
<!--
<br style="clear: both" />
<div class="container bottom">
<input type="range" name="bottom-slider" id="bottom-slider" min="0" max="100" value="0" />
</div> -->
<br style="clear: both" />
<!--
<div class="container bottom">
<input type="range" name="bottom-slider" id="bottom-slider" min="0" max="100" value="0" />
</div> -->
<div class="footer">
from top to bottom: red/green/blue
</div>
<script src="/socket.io/socket.io.js"></script>

Loading…
Cancel
Save