mirror of
https://github.com/urbit/shrub.git
synced 2024-12-14 20:02:51 +03:00
Merge branch 'apps' of https://github.com/urbit/urbit into apps
This commit is contained in:
commit
25377228fb
@ -320,3 +320,5 @@ h1.leader:after
|
|||||||
height .1rem
|
height .1rem
|
||||||
width 3rem
|
width 3rem
|
||||||
background-color #ccc
|
background-color #ccc
|
||||||
|
|
||||||
|
@import 'mobile'
|
13
pub/work/src/css/mobile.styl
Normal file
13
pub/work/src/css/mobile.styl
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
/* computers --------*/
|
||||||
|
// @media only screen and (min-width: 1024px)
|
||||||
|
|
||||||
|
|
||||||
|
/* laptops / small screens ----------- */
|
||||||
|
// @media only screen and (max-width: 1170px)
|
||||||
|
|
||||||
|
|
||||||
|
/* tablets + phones ----------- */
|
||||||
|
// @media only screen and (min-width: 320px) and (max-width: 1024px)
|
||||||
|
|
||||||
|
/* phones portrait and landscape ----------- */
|
||||||
|
// @media only screen and (min-device-width: 320px) and (max-device-width: 480px)
|
@ -45,7 +45,7 @@ module.exports = recl
|
|||||||
_changeStatus: (e) ->
|
_changeStatus: (e) ->
|
||||||
return if @props.item.status is 'released'
|
return if @props.item.status is 'released'
|
||||||
if @props.item.status is 'accepted' and
|
if @props.item.status is 'accepted' and
|
||||||
@formatOwner(@props.item.creator) isnt window.urb.ship
|
@formatCreator(@props.item.creator) isnt window.urb.ship
|
||||||
return
|
return
|
||||||
own = "claim" if @props.item.status is "announced"
|
own = "claim" if @props.item.status is "announced"
|
||||||
own = "announce" if @props.item.status is "accepted"
|
own = "announce" if @props.item.status is "accepted"
|
||||||
@ -66,9 +66,9 @@ module.exports = recl
|
|||||||
_d += "..#{d.getHours()}.#{d.getMinutes()}.#{d.getSeconds()}"
|
_d += "..#{d.getHours()}.#{d.getMinutes()}.#{d.getSeconds()}"
|
||||||
_d
|
_d
|
||||||
|
|
||||||
formatOwner: (o="") -> o.replace /\~/g,""
|
formatCreator: (o="") -> o.replace /\~/g,""
|
||||||
|
|
||||||
formatAudience: (a=[]) -> @formatOwner a.join(" ")
|
formatAudience: (a=[]) -> @formatCreator a.join(" ")
|
||||||
|
|
||||||
getInitialState: -> {expand:false}
|
getInitialState: -> {expand:false}
|
||||||
|
|
||||||
@ -96,7 +96,7 @@ module.exports = recl
|
|||||||
action = ""
|
action = ""
|
||||||
if @props.item.status is 'announced'
|
if @props.item.status is 'announced'
|
||||||
action = "claim"
|
action = "claim"
|
||||||
if @props.item.status is 'accepted' and @formatOwner(@props.item.creator) is window.urb.ship
|
if @props.item.status is 'accepted' and @formatCreator(@props.item.creator) is window.urb.ship
|
||||||
action = "release"
|
action = "release"
|
||||||
|
|
||||||
(div {
|
(div {
|
||||||
@ -107,7 +107,7 @@ module.exports = recl
|
|||||||
(div {
|
(div {
|
||||||
className:'header'
|
className:'header'
|
||||||
},
|
},
|
||||||
(div {className:'creator ib'}, @formatOwner(@props.item.owner))
|
(div {className:'creator ib'}, @formatCreator(@props.item.creator))
|
||||||
(div {
|
(div {
|
||||||
className:'status ib action-'+(action.length > 0)
|
className:'status ib action-'+(action.length > 0)
|
||||||
'data-key':'status'
|
'data-key':'status'
|
||||||
|
@ -168,7 +168,6 @@ module.exports = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"../dispatcher/Dispatcher.coffee":9,"../persistence/Persistence.coffee":15,"../util.coffee":17}],2:[function(require,module,exports){
|
},{"../dispatcher/Dispatcher.coffee":9,"../persistence/Persistence.coffee":15,"../util.coffee":17}],2:[function(require,module,exports){
|
||||||
var WorkActions, div, rece, recl, ref, textarea,
|
var WorkActions, div, rece, recl, ref, textarea,
|
||||||
slice = [].slice;
|
slice = [].slice;
|
||||||
@ -333,7 +332,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"../actions/WorkActions.coffee":1}],3:[function(require,module,exports){
|
},{"../actions/WorkActions.coffee":1}],3:[function(require,module,exports){
|
||||||
var div, h1, label, rece, recl, ref;
|
var div, h1, label, rece, recl, ref;
|
||||||
|
|
||||||
@ -445,7 +443,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{}],4:[function(require,module,exports){
|
},{}],4:[function(require,module,exports){
|
||||||
var Field, WorkActions, div, rece, recl, ref, textarea;
|
var Field, WorkActions, div, rece, recl, ref, textarea;
|
||||||
|
|
||||||
@ -508,7 +505,7 @@ module.exports = recl({
|
|||||||
if (this.props.item.status === 'released') {
|
if (this.props.item.status === 'released') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.props.item.status === 'accepted' && this.formatOwner(this.props.item.creator) !== window.urb.ship) {
|
if (this.props.item.status === 'accepted' && this.formatCreator(this.props.item.creator) !== window.urb.ship) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.props.item.status === "announced") {
|
if (this.props.item.status === "announced") {
|
||||||
@ -540,7 +537,7 @@ module.exports = recl({
|
|||||||
}
|
}
|
||||||
return _d;
|
return _d;
|
||||||
},
|
},
|
||||||
formatOwner: function(o) {
|
formatCreator: function(o) {
|
||||||
if (o == null) {
|
if (o == null) {
|
||||||
o = "";
|
o = "";
|
||||||
}
|
}
|
||||||
@ -550,7 +547,7 @@ module.exports = recl({
|
|||||||
if (a == null) {
|
if (a == null) {
|
||||||
a = [];
|
a = [];
|
||||||
}
|
}
|
||||||
return this.formatOwner(a.join(" "));
|
return this.formatCreator(a.join(" "));
|
||||||
},
|
},
|
||||||
getInitialState: function() {
|
getInitialState: function() {
|
||||||
return {
|
return {
|
||||||
@ -598,7 +595,7 @@ module.exports = recl({
|
|||||||
if (this.props.item.status === 'announced') {
|
if (this.props.item.status === 'announced') {
|
||||||
action = "claim";
|
action = "claim";
|
||||||
}
|
}
|
||||||
if (this.props.item.status === 'accepted' && this.formatOwner(this.props.item.creator) === window.urb.ship) {
|
if (this.props.item.status === 'accepted' && this.formatCreator(this.props.item.creator) === window.urb.ship) {
|
||||||
action = "release";
|
action = "release";
|
||||||
}
|
}
|
||||||
return div({
|
return div({
|
||||||
@ -610,7 +607,7 @@ module.exports = recl({
|
|||||||
className: 'header'
|
className: 'header'
|
||||||
}, div({
|
}, div({
|
||||||
className: 'creator ib'
|
className: 'creator ib'
|
||||||
}, this.formatOwner(this.props.item.owner)), div({
|
}, this.formatCreator(this.props.item.creator)), div({
|
||||||
className: 'status ib action-' + (action.length > 0),
|
className: 'status ib action-' + (action.length > 0),
|
||||||
'data-key': 'status',
|
'data-key': 'status',
|
||||||
onClick: this._changeStatus
|
onClick: this._changeStatus
|
||||||
@ -686,7 +683,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"../actions/WorkActions.coffee":1,"./FieldComponent.coffee":2}],5:[function(require,module,exports){
|
},{"../actions/WorkActions.coffee":1,"./FieldComponent.coffee":2}],5:[function(require,module,exports){
|
||||||
var FilterComponent, ItemComponent, ListeningComponent, SortComponent, WorkActions, WorkStore, div, h1, input, rece, recl, ref, textarea;
|
var FilterComponent, ItemComponent, ListeningComponent, SortComponent, WorkActions, WorkStore, div, h1, input, rece, recl, ref, textarea;
|
||||||
|
|
||||||
@ -930,7 +926,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"../actions/WorkActions.coffee":1,"../stores/WorkStore.coffee":16,"./FilterComponent.coffee":3,"./ItemComponent.coffee":4,"./ListeningComponent.coffee":6,"./SortComponent.coffee":7}],6:[function(require,module,exports){
|
},{"../actions/WorkActions.coffee":1,"../stores/WorkStore.coffee":16,"./FilterComponent.coffee":3,"./ItemComponent.coffee":4,"./ListeningComponent.coffee":6,"./SortComponent.coffee":7}],6:[function(require,module,exports){
|
||||||
var div, h1, input, rece, recl, ref, textarea;
|
var div, h1, input, rece, recl, ref, textarea;
|
||||||
|
|
||||||
@ -949,7 +944,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{}],7:[function(require,module,exports){
|
},{}],7:[function(require,module,exports){
|
||||||
var button, div, h1, label, rece, recl, ref;
|
var button, div, h1, label, rece, recl, ref;
|
||||||
|
|
||||||
@ -994,7 +988,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{}],8:[function(require,module,exports){
|
},{}],8:[function(require,module,exports){
|
||||||
var ListComponent, div, h1, rece, recl, ref;
|
var ListComponent, div, h1, rece, recl, ref;
|
||||||
|
|
||||||
@ -1017,7 +1010,6 @@ module.exports = recl({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"./ListComponent.coffee":5}],9:[function(require,module,exports){
|
},{"./ListComponent.coffee":5}],9:[function(require,module,exports){
|
||||||
var Dispatcher;
|
var Dispatcher;
|
||||||
|
|
||||||
@ -1039,7 +1031,6 @@ module.exports = _.merge(new Dispatcher(), {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"flux":11}],10:[function(require,module,exports){
|
},{"flux":11}],10:[function(require,module,exports){
|
||||||
var WorkComponent;
|
var WorkComponent;
|
||||||
|
|
||||||
@ -1052,7 +1043,6 @@ $(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"./components/WorkComponent.coffee":8,"./util.coffee":17}],11:[function(require,module,exports){
|
},{"./components/WorkComponent.coffee":8,"./util.coffee":17}],11:[function(require,module,exports){
|
||||||
/**
|
/**
|
||||||
* Copyright (c) 2014-2015, Facebook, Inc.
|
* Copyright (c) 2014-2015, Facebook, Inc.
|
||||||
@ -1450,7 +1440,6 @@ module.exports = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{}],16:[function(require,module,exports){
|
},{}],16:[function(require,module,exports){
|
||||||
var Dispatcher, EventEmitter, WorkStore, _filters, _ghost, _list, _listening, _sorts, _tasks, _updated, assign, uuid32;
|
var Dispatcher, EventEmitter, WorkStore, _filters, _ghost, _list, _listening, _sorts, _tasks, _updated, assign, uuid32;
|
||||||
|
|
||||||
@ -1699,7 +1688,6 @@ WorkStore.dispatchToken = Dispatcher.register(function(p) {
|
|||||||
module.exports = WorkStore;
|
module.exports = WorkStore;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{"../dispatcher/Dispatcher.coffee":9,"../util.coffee":17,"events":18,"object-assign":14}],17:[function(require,module,exports){
|
},{"../dispatcher/Dispatcher.coffee":9,"../util.coffee":17,"events":18,"object-assign":14}],17:[function(require,module,exports){
|
||||||
module.exports = {
|
module.exports = {
|
||||||
uuid32: function() {
|
uuid32: function() {
|
||||||
@ -1758,7 +1746,6 @@ module.exports = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},{}],18:[function(require,module,exports){
|
},{}],18:[function(require,module,exports){
|
||||||
// Copyright Joyent, Inc. and other Node contributors.
|
// Copyright Joyent, Inc. and other Node contributors.
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user