Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions client/views/AllShiftsView/AllShiftsView.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,18 @@
]
}">
<div class="shiftMeta">
<span class="selected">
<input type="checkbox" class="SSInputField"/>

<span class="shiftActions">
<span class="shiftActionShare">Share</span>
<span class="shiftActionEdit">Edit</span>
</span>

<span class="selected shiftActionEdit">
<input type="checkbox" class="SSInputField"/>
</span>

<img class="spaceIcon"></img>

<span class="summaryContainer">
<span class="spaceName"></span>
<span class="wrapper">
Expand Down
17 changes: 9 additions & 8 deletions client/views/SSSpaceMenu/SSSpaceMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
.SSSpaceMenuFrameBody button#SSSpaceMenuClose{
font-family: Georgia;
font-weight: normal;
top: 0;
top: 0; right: 0;
cursor: pointer;
}

Expand Down Expand Up @@ -106,7 +106,7 @@ ul#SpaceMenuList li

-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border: 1px solid #ccc;
border: 1px solid #aaa;
margin-bottom: 1px;
height: 60px;
color: #89867d;
Expand All @@ -129,28 +129,28 @@ ul#SpaceMenuList li > img, ul#SpaceMenuList li > span
{
float: left;
margin-left: 6px;
margin-top: 6px;
margin-top: 0px;
}

ul#SpaceMenuList li > span.name h3{
margin: 3px 0 0;
ul#SpaceMenuList li > span h3.name{
margin: 1px 0 -8px;
color: #464540;
font-family: Georgia, Serif;
font-size: 20px;
font-weight: normal;
}

ul#SpaceMenuList li:hover > span.name h3{
ul#SpaceMenuList li:hover > span h3.name{
color: #f63b02;
}

ul#SpaceMenuList li > span.icon {
ul#SpaceMenuList li > span.iconFrame {
border:1px solid #DDDDDD;
margin:13px 7px 7px 12px;
padding:7px;
}

ul#SpaceMenuList li:hover > span.icon {
ul#SpaceMenuList li:hover > span.iconFrame {
background: #fff;
}

Expand All @@ -161,6 +161,7 @@ ul#SpaceMenuList li > span.space-vid
margin-right: 10px;
width: 25px; height: 48px;
display: block;
margin-top:6px;
}

ul#SpaceMenuList li:hover > span.handle{
Expand Down
6 changes: 3 additions & 3 deletions client/views/SSSpaceMenu/SSSpaceMenu.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3>Shift this page:</h3>
properties: ['name', 'icon', 'action'],
}"
outlet="SpaceMenu">
<span>
<span class="iconFrame">
<img class="icon"></img>
</span>
<span>
Expand All @@ -35,7 +35,7 @@ <h3 class="name"></h3>
<span class="space-vid" title="intro video"></span>
</li>

<!--

<li class="SSSpaceMenuListCell SSCellClone SSSpaceMenuListBottom SSPreserve" id="SSGetSpaces">
<span class="name">
<h3>Get more apps</h3>
Expand All @@ -49,7 +49,7 @@ <h3>Make your own apps</h3>
<span class="action">using html, css &amp; js (easy)</span>
</span>
</li>
-->


</ul>
</div>
Expand Down
6 changes: 4 additions & 2 deletions client/views/SSSpaceMenuListCell/SSSpaceMenuListCell.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ ul#SpaceMenuList li.SSSpaceMenuListBottom{
ul#SpaceMenuList li.SSSpaceMenuListBottom:hover > span h3,
ul#SpaceMenuList li.SSSpaceMenuListBottom:hover > span span{
color: #444;
text-shadow:1px 1px 0 rgba(255, 255, 255, 0.2), -1px -1px 0 rgba(0, 0, 0, 0.1);
}

ul#SpaceMenuList li.SSSpaceMenuListBottom > span h3,
ul#SpaceMenuList li.SSSpaceMenuListBottom > span span{
color: #777;
text-shadow:1px 1px 0 #DDDDDD;
color:#666;
margin:0;
padding-bottom:0;
}

ul#SpaceMenuList li#SSGetSpaces > span {
Expand Down
Binary file modified images/Console/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Console/share.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/Console/shift-ops-bg.png
Binary file not shown.
Binary file added images/Console/shiftActions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sandbox/favicon.ico
Binary file not shown.
Binary file added sandbox/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions sandbox/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<script src="/externals/mootools-1.2.3.1-more.js" type="text/javascript"></script>
<script src="/sandbox/install.js" type="text/javascript" charset="utf-8"></script>
<script src="/builds/shiftspace.sandbox.js" type="text/javascript"></script>
<link id="page_favicon" type="image/x-icon" rel="icon" href="favicon.ico">
<style type="text/css">
.first {
margin-top:100px;
Expand Down
2 changes: 1 addition & 1 deletion shifty.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ def main(argv):
elif action == "runserver":
print
print "Make sure that you start lucene as well with:"
print "\tpython shift.py runlucene"
print "\tpython shifty.py runlucene"
print
runserver(argv)
elif action == "runlucene":
Expand Down
4 changes: 2 additions & 2 deletions spaces/Embed/attrs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "Embed",
"authors": ["me"],
"icon": "Embed.png",
"description": "Add a description (this will appear in the Installed Spaces tab in the Console)",
"tooltip": "Add a tooltip (this will appear when using the Space Menu)",
"description": "Drop embed code from YouTube, Google Maps and such or write your own HTML",
"tooltip": "Drop embed code from YouTube, Google Maps and such or write your own HTML",
"ui": {"space": { "css": "Embed.css" },
"shift": { "html": "Embed.html" }},
"version": "0.0",
Expand Down
4 changes: 4 additions & 0 deletions spaces/Lulzify/Lulzify.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ body.lulzifySomething img:hover{
outline: 2px dotted red;
}

img:hover{
outline: 2px dotted red;
}

.LulzifyShift
{
font: 50px verdana sans-serif;
Expand Down
3 changes: 1 addition & 2 deletions spaces/Lulzify/Lulzify.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ var LulzifyShift = Shift({

//tell the page it can be lulzified:
$(document.body).addClass('lulzifySomething');
$$('#install').addClass('lulzifySomething');


if (this.isNewShift()){
console.log('editing new shift');

Expand Down
4 changes: 2 additions & 2 deletions spaces/Lulzify/attrs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "Lulzify",
"authors": ["me"],
"icon": "Lulzify.png",
"description": "Add a description (this will appear in the Installed Spaces tab in the Console)",
"tooltip": "Add a tooltip (this will appear when using the Space Menu)",
"description": "Add the LULZ text to cat images (known to work on non-cat images too)",
"tooltip": "Add the LULZ text to cat images (known to work on non-cat images too)",
"ui": {"space": { "css": "Lulzify.css" },
"shift": { "html": "Lulzify.html" }},
"version": "0.0",
Expand Down
74 changes: 73 additions & 1 deletion styles/SSGlobalStyles.css
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ div.panelButtons{

.SSTabView > .SSControlView > div.SSButton:hover
{
/*background-color: #fff;*/
color: #F63B02;
}


Expand Down Expand Up @@ -256,6 +256,78 @@ ul.ShiftListView li.ShiftListViewCell input.SSInputField
/*margin-top: 2px;*/
}

/* Shift Actions *******************/

.ShiftListView li.ShiftListViewCell .shiftActions{
display: block;
width: 0;
height: 26px;
float: left;
background: url(/images/Console/shiftActions.png) right no-repeat;
}

.ShiftListView li.ShiftListViewCell:hover .shiftActions{
width: 60px;
}

/* Uncomment this to allow the wide options only for the user's shifts: */
/*
.ShiftListView li.ShiftListViewCell:hover .shiftActions{
width: 30px;
}

.ShiftListView li.ShiftListViewCell.authorShift:hover .shiftActions{
width: 60px;
}

.ShiftListView li.ShiftListViewCell .shiftActions .shiftActionEdit{
display:none;
}

.ShiftListView li.ShiftListViewCell.authorShift .shiftActions .shiftActionEdit{
display:block;
}

*/

.ShiftListView li.ShiftListViewCell .shiftActions *{
display: none;
float: left;
text-indent: -9999px;
}

.ShiftListView li.ShiftListViewCell:hover .shiftActions *{
display: block;
}

.ShiftListView li.ShiftListViewCell:hover .shiftActions span{
width: 26px; height: 26px;
display: block;
background-position: top left;
}

.ShiftListView li.ShiftListViewCell .shiftActions .shiftActionShare{
background: url(/images/Console/share.png) no-repeat;
}

.ShiftListView li.ShiftListViewCell .shiftActions .shiftActionEdit{
background: url(/images/Console/edit.png) no-repeat;
}

.ShiftListView li.ShiftListViewCell .shiftActions span:hover{
background-position: bottom left;
}

/*
.ShiftListView li.ShiftListViewCell .shiftActions input{
margin:4px;
background: url(/images/Console/share.png) no-repeat;
border: 0;
}
*/

/* END Shift Actions ***************/

.ShiftListView .ShiftListViewCell .spaceName
{
height: 26px;
Expand Down