Permalink
Browse files

slicing John's templates

  • Loading branch information...
1 parent 7a333e5 commit 42423d88c5a606bc0316024ed4dcbf70da118be9 fluxtream committed May 25, 2012
View
@@ -38,4 +38,5 @@ tasks.xml
# Files to ignore
GeoLiteCity.dat
-.idea/workspace.xml
+.idea/workspace.xml
+node_modules
@@ -20,5 +20,126 @@
<jsp:include page="<%=widgetsDir+userWidgets.get(i).name+\".jsp\"%>" />
<% } %>
+<<<<<<< Updated upstream
<div class="flx-spacer"></div>
+=======
+<div class="flx-widget span4">
+ <header>
+ <div class="flx-widget-controls">
+ <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
+ <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
+ </div>
+ <h3 class="flx-title">Steps</h3>
+ </header>
+ <div class="flx-body">
+ <div class="flx-stepsNmbr"><img src="/css/dashboardImgDummies/w1.png" alt="w1" width="" height="" /></div>
+ </div>
+ <footer>
+ </footer>
+</div>
+<div class="flx-widget span4">
+ <header>
+ <div class="flx-widget-controls">
+ <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
+ <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
+ </div>
+ <h3 class="flx-title">Sleep</h3>
+ </header>
+ <div class="flx-body">
+ <div class="flx-sleepStats"><img src="/css/dashboardImgDummies/w2.png" alt="w2" width="" height="" /></div>
+ </div>
+ <footer>
+ </footer>
+</div>
+<div class="flx-widget span4">
+ <header>
+ <div class="flx-widget-controls">
+ <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
+ <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
+ </div>
+ <h3 class="flx-title">Food</h3>
+ </header>
+ <div class="flx-body">
+ <div class="flx-foodthumbnails"><img src="/css/dashboardImgDummies/w3.png" alt="w3" width="" height="" /></div>
+ </div>
+ <footer>
+ </footer>
+</div>
+
+</div>
+
+<div class="row-fluid">
+
+<div class="flx-widget span4">
+ <header>
+ <div class="flx-widget-controls">
+ <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
+ <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
+ </div>
+ <h3 class="flx-title">Activity</h3>
+ </header>
+ <div class="flx-body">
+ <div class="flx-activity"><img src="/css/dashboardImgDummies/w4.png" alt="w4" width="" height="" /></div>
+ </div>
+ <footer>
+ </footer>
+</div>
+<div class="flx-widget span4">
+ <header>
+ <div class="flx-widget-controls">
+ <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
+ <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
+ </div>
+ <h3 class="flx-title">Finance</h3>
+ </header>
+ <div class="flx-body">
+ <div class="flx-finance"><img src="/css/dashboardImgDummies/w5.png" alt="w5" width="" height="" /></div>
+ </div>
+ <footer>
+ </footer>
+</div>
+<div class="flx-widget span4">
+ <header>
+ <div class="flx-widget-controls">
+ <a href="#" class="flx-settings"><i class="icon-cog"></i></a>
+ <a href="#" class="flx-remove"><i class="icon-remove"></i></a>
+ </div>
+ <h3 class="flx-title">mffboston09</h3>
+ </header>
+ <div class="flx-body">
+ <div class="flx-stepsNmbr"><img src="/css/dashboardImgDummies/w6.png" alt="w6" width="" height="" /></div>
+ </div>
+ <footer>
+ </footer>
+</div>
+
+
+<div class="row"> <!-- Remove when added to the clock tab -->
+ <div class="flx-clockToolTipContainer">
+ <span class="flx-toolTipTail">
+ </span>
+ <div class="flx-toolTipBody">
+ <div class="flx-toolTipData">
+ <h4 class="flx-dataType">Weight</h4>
+ <span class="flx-deviceIcon"></span>
+ <span class="flx-tTime">9:43</span>
+ <span class="flx-data">71.05 kg</span>
+ <span class="flx-miniGraph"></span>
+ <ul class="flx-toolTipLinks">
+ <li><a href="#"></i>List <i class="icon-list"></a></i>
+ <li><a href="#"></i>Timeline <i class="icon-film"></a></i>
+ <li><a href="#"></i>Bodytrack <i class="icon-map-marker"></a></i>
+
+ </ul>
+ </div>
+ <div class="flx-toolTipContext">
+
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<!-- <div class="flx-spacer"></div> -->
+>>>>>>> Stashed changes
</div>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 42423d8

Please sign in to comment.