mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-11-29 12:15:43 +03:00
Merge branch 'apps' of https://github.com/urbit/urbit into apps
This commit is contained in:
commit
1cdabc4cd4
@ -1758,12 +1758,23 @@
|
||||
=^ moz +>.$ ra-abet:(~(ra-cancel ra ost.hid ~) src.hid pax)
|
||||
[moz +>.$(shells (~(del by shells) ost.hid))]
|
||||
::
|
||||
::++ poke-bit
|
||||
:: |= [~]
|
||||
:: ^- (quip move +>)
|
||||
:: :_ +>.$
|
||||
:: =+ paf=/(scot %p our.hid)/try/(scot %da now.hid)/talk/backlog/jam
|
||||
:: [ost.hid %info /jamfile our.hid (foal paf (jam +<+.+>.$))]~
|
||||
++ poke-save
|
||||
|= man=span
|
||||
^- (quip move +>)
|
||||
:_ +>.$
|
||||
=+ paf=/(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/jam
|
||||
=+ grams:(~(got by stories) man)
|
||||
[ost.hid %info /jamfile our.hid (foal paf [%jam !>((jam -))])]~
|
||||
::
|
||||
++ poke-load
|
||||
|= man=span
|
||||
=+ ^= grams
|
||||
%- (hard (list telegram))
|
||||
%- cue
|
||||
%- (hard ,@)
|
||||
.^(%cx /(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/jam)
|
||||
=+ toy=(~(got by stories) man)
|
||||
[~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))]
|
||||
::
|
||||
++ prep
|
||||
|= [old=(unit house)]
|
||||
|
16
mar/jam.hoon
Normal file
16
mar/jam.hoon
Normal file
@ -0,0 +1,16 @@
|
||||
::
|
||||
:::: /hoon/core/jam/mar
|
||||
::
|
||||
!:
|
||||
|_ mud=@
|
||||
++ grow
|
||||
|%
|
||||
++ mime [/application/octet-stream (taco mud)]
|
||||
--
|
||||
++ grab
|
||||
|% :: convert from
|
||||
++ mime |=([p=mite q=octs] q.q)
|
||||
++ noun ,@ :: clam from %noun
|
||||
--
|
||||
++ grad %mime
|
||||
--
|
10
mar/load.hoon
Normal file
10
mar/load.hoon
Normal file
@ -0,0 +1,10 @@
|
||||
::
|
||||
:::: /hoon/core/load/mar
|
||||
::
|
||||
!:
|
||||
|_ man=span
|
||||
++ grab
|
||||
|% :: convert from
|
||||
++ noun span :: clam from %noun
|
||||
--
|
||||
--
|
10
mar/save.hoon
Normal file
10
mar/save.hoon
Normal file
@ -0,0 +1,10 @@
|
||||
::
|
||||
:::: /hoon/core/save/mar
|
||||
::
|
||||
!:
|
||||
|_ man=span
|
||||
++ grab
|
||||
|% :: convert from
|
||||
++ noun span :: clam from %noun
|
||||
--
|
||||
--
|
@ -106,7 +106,11 @@ h1.leader:after {
|
||||
margin-left: 0.6rem;
|
||||
}
|
||||
.ctrl .sort label,
|
||||
.ctrl .filter label,
|
||||
.ctrl .filter label {
|
||||
text-transform: capitalize;
|
||||
font-size: 1rem;
|
||||
letter-spacing: 0.07rem;
|
||||
}
|
||||
.item .status {
|
||||
text-transform: uppercase;
|
||||
font-size: 0.7rem;
|
||||
@ -118,28 +122,37 @@ h1.leader:after {
|
||||
.ctrl h1 {
|
||||
font-size: 1rem;
|
||||
}
|
||||
.ctrl .sorts {
|
||||
.ctrl .sorts,
|
||||
.ctrl .filters {
|
||||
margin-left: -0.3rem;
|
||||
}
|
||||
.ctrl .sorts {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
.ctrl .sort,
|
||||
.ctrl .filter label {
|
||||
font-weight: 500;
|
||||
}
|
||||
.ctrl .filter {
|
||||
line-height: 2rem;
|
||||
margin-right: 1rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.ctrl .sort {
|
||||
background-color: transparent;
|
||||
outline: none;
|
||||
border: 0;
|
||||
cursor: pointer;
|
||||
background-color: #000;
|
||||
color: #fff;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.ctrl .filter label {
|
||||
margin-right: 0.3rem;
|
||||
}
|
||||
.ctrl .sort label,
|
||||
.ctrl .filter label {
|
||||
line-height: 2rem;
|
||||
}
|
||||
.ctrl .sort.s-1,
|
||||
.ctrl .sort.s--1 {
|
||||
font-weight: 500;
|
||||
}
|
||||
.ctrl .sort.s-1 label,
|
||||
.ctrl .sort.s--1 label {
|
||||
margin-right: 0.3rem;
|
||||
@ -175,14 +188,22 @@ h1.leader:after {
|
||||
background-color: #fff;
|
||||
transition: max-height 200ms linear;
|
||||
}
|
||||
.item .description,
|
||||
.item .discussion {
|
||||
display: none;
|
||||
}
|
||||
.item.expand {
|
||||
max-height: 24rem;
|
||||
transition: max-height 200ms linear;
|
||||
}
|
||||
.item.expand .description,
|
||||
.item.expand .discussion {
|
||||
display: inherit;
|
||||
}
|
||||
.item .expand {
|
||||
margin-left: 2rem;
|
||||
cursor: pointer;
|
||||
transform-origin: 3px 12px;
|
||||
transform-origin: 6px 12px;
|
||||
transition: transform 200ms linear;
|
||||
}
|
||||
.item.expand .expand {
|
||||
@ -267,7 +288,7 @@ h1.leader:after {
|
||||
.item .description,
|
||||
.item .discussion {
|
||||
line-height: 2rem;
|
||||
margin: 0.5rem 0 0.5rem 2.3rem;
|
||||
margin: 0.5rem 0 0.5rem 2rem;
|
||||
}
|
||||
.item .discussion {
|
||||
max-height: 18rem;
|
||||
@ -275,7 +296,7 @@ h1.leader:after {
|
||||
overflow-y: scroll;
|
||||
}
|
||||
.item .description textarea {
|
||||
min-width: 27rem;
|
||||
min-width: 32rem;
|
||||
min-height: 6rem;
|
||||
}
|
||||
.item .comp {
|
||||
@ -312,7 +333,7 @@ h1.leader:after {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
.comment.new .input {
|
||||
max-width: 27rem;
|
||||
max-width: 31rem;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
/* global */
|
||||
@ -332,8 +353,8 @@ h1.leader:after {
|
||||
}
|
||||
.input {
|
||||
outline: none;
|
||||
padding: 0 0.3rem;
|
||||
background-color: #f9f9f9;
|
||||
padding: 0 0.6rem 0 0.3rem;
|
||||
background-color: #ececec;
|
||||
border: 0;
|
||||
font: inherit;
|
||||
resize: none;
|
||||
@ -345,16 +366,16 @@ h1.leader:after {
|
||||
color: #f00;
|
||||
}
|
||||
.caret.left {
|
||||
border-left: 6px solid #000;
|
||||
border-top: 6px solid transparent;
|
||||
border-right: 6px solid transparent;
|
||||
border-bottom: 6px solid transparent;
|
||||
border-left: 12px solid #000;
|
||||
border-top: 9px solid transparent;
|
||||
border-right: 9px solid transparent;
|
||||
border-bottom: 9px solid transparent;
|
||||
margin-top: 0.4rem;
|
||||
}
|
||||
.s-1 .caret,
|
||||
.caret.down {
|
||||
border-left: 6px solid transparent;
|
||||
border-top: 6px solid #000;
|
||||
border-top: 6px solid #fff;
|
||||
border-right: 6px solid transparent;
|
||||
border-bottom: 6px solid transparent;
|
||||
}
|
||||
@ -363,7 +384,7 @@ h1.leader:after {
|
||||
border-left: 6px solid transparent;
|
||||
border-top: 6px solid transparent;
|
||||
border-right: 6px solid transparent;
|
||||
border-bottom: 6px solid #000;
|
||||
border-bottom: 6px solid #fff;
|
||||
}
|
||||
.hr1 {
|
||||
height: 0.2rem;
|
||||
|
@ -29,6 +29,10 @@ h1.leader:after
|
||||
|
||||
.ctrl .sort label
|
||||
.ctrl .filter label
|
||||
text-transform capitalize
|
||||
font-size 1rem
|
||||
letter-spacing .07rem
|
||||
|
||||
.item .status
|
||||
text-transform uppercase
|
||||
font-size .7rem
|
||||
@ -41,18 +45,31 @@ h1.leader:after
|
||||
font-size 1rem
|
||||
|
||||
.sorts
|
||||
.filters
|
||||
margin-left -.3rem
|
||||
|
||||
.sorts
|
||||
margin-top 1rem
|
||||
|
||||
.sort
|
||||
.filter label
|
||||
font-weight 500
|
||||
|
||||
.filter
|
||||
line-height 2rem
|
||||
margin-right 1rem
|
||||
vertical-align middle
|
||||
|
||||
.sort
|
||||
background-color transparent
|
||||
outline none
|
||||
border 0
|
||||
cursor pointer
|
||||
background-color #000
|
||||
color #fff
|
||||
margin-right 1rem
|
||||
|
||||
.filter label
|
||||
margin-right .3rem
|
||||
|
||||
.sort label
|
||||
.filter label
|
||||
@ -60,8 +77,6 @@ h1.leader:after
|
||||
|
||||
.sort.s-1
|
||||
.sort.s--1
|
||||
font-weight 500
|
||||
|
||||
label
|
||||
margin-right .3rem
|
||||
cursor pointer
|
||||
@ -96,15 +111,23 @@ h1.leader:after
|
||||
overflow hidden
|
||||
background-color #fff
|
||||
transition max-height 200ms linear
|
||||
|
||||
.description
|
||||
.discussion
|
||||
display none
|
||||
|
||||
&.expand
|
||||
max-height 24rem
|
||||
transition max-height 200ms linear
|
||||
|
||||
.description
|
||||
.discussion
|
||||
display inherit
|
||||
|
||||
.expand
|
||||
margin-left 2rem
|
||||
cursor pointer
|
||||
transform-origin 3px 12px
|
||||
transform-origin 6px 12px
|
||||
transition transform 200ms linear
|
||||
|
||||
&.expand .expand
|
||||
@ -189,7 +212,7 @@ h1.leader:after
|
||||
.description
|
||||
.discussion
|
||||
line-height 2rem
|
||||
margin .5rem 0 .5rem 2.3rem
|
||||
margin .5rem 0 .5rem 2rem
|
||||
|
||||
.discussion
|
||||
max-height 18rem
|
||||
@ -197,7 +220,7 @@ h1.leader:after
|
||||
overflow-y scroll
|
||||
|
||||
.description textarea
|
||||
min-width 27rem
|
||||
min-width 32rem
|
||||
min-height 6rem
|
||||
|
||||
.comp
|
||||
@ -233,7 +256,7 @@ h1.leader:after
|
||||
margin-top 1rem
|
||||
|
||||
&.new .input
|
||||
max-width 27rem
|
||||
max-width 31rem
|
||||
margin-top 1rem
|
||||
|
||||
/* global */
|
||||
@ -254,8 +277,8 @@ h1.leader:after
|
||||
|
||||
.input
|
||||
outline none
|
||||
padding 0 .3rem
|
||||
background-color #f9f9f9
|
||||
padding 0 .6rem 0 .3rem
|
||||
background-color #ececec
|
||||
border 0
|
||||
font inherit
|
||||
resize none
|
||||
@ -267,16 +290,16 @@ h1.leader:after
|
||||
color red
|
||||
|
||||
.caret.left
|
||||
border-left 6px solid #000
|
||||
border-top 6px solid transparent
|
||||
border-right 6px solid transparent
|
||||
border-bottom 6px solid transparent
|
||||
border-left 12px solid #000
|
||||
border-top 9px solid transparent
|
||||
border-right 9px solid transparent
|
||||
border-bottom 9px solid transparent
|
||||
margin-top .4rem
|
||||
|
||||
.s-1 .caret
|
||||
.caret.down
|
||||
border-left 6px solid transparent
|
||||
border-top 6px solid #000
|
||||
border-top 6px solid #fff
|
||||
border-right 6px solid transparent
|
||||
border-bottom 6px solid transparent
|
||||
|
||||
@ -285,7 +308,7 @@ h1.leader:after
|
||||
border-left 6px solid transparent
|
||||
border-top 6px solid transparent
|
||||
border-right 6px solid transparent
|
||||
border-bottom 6px solid #000
|
||||
border-bottom 6px solid #fff
|
||||
|
||||
.hr1
|
||||
height .2rem
|
||||
|
@ -77,7 +77,7 @@ module.exports = recl
|
||||
rece Field, $.extend props, {render,_key,item:@props.item,defaultValue}
|
||||
|
||||
renderTopField: (key,props,format)->
|
||||
_props = _.extend {className:"#{props.className ? key} top"}, props
|
||||
_props = _.extend props,{className:"#{props.className ? key} top"}
|
||||
@renderField key,_props,format
|
||||
|
||||
componentDidMount: ->
|
||||
|
@ -568,9 +568,9 @@ module.exports = recl({
|
||||
},
|
||||
renderTopField: function(key, props, format) {
|
||||
var _props, ref1;
|
||||
_props = _.extend({
|
||||
_props = _.extend(props, {
|
||||
className: ((ref1 = props.className) != null ? ref1 : key) + " top"
|
||||
}, props);
|
||||
});
|
||||
return this.renderField(key, _props, format);
|
||||
},
|
||||
componentDidMount: function() {
|
||||
@ -1462,9 +1462,9 @@ _updated = Date.now();
|
||||
_filters = {
|
||||
done: null,
|
||||
creator: null,
|
||||
tags: null,
|
||||
status: null,
|
||||
audience: null,
|
||||
status: null
|
||||
tags: null
|
||||
};
|
||||
|
||||
_sorts = {
|
||||
|
@ -10,9 +10,9 @@ _updated = Date.now()
|
||||
_filters =
|
||||
done:null
|
||||
creator:null
|
||||
tags:null
|
||||
audience:null
|
||||
status:null
|
||||
audience:null
|
||||
tags:null
|
||||
_sorts =
|
||||
sort:0
|
||||
title:0
|
||||
|
Loading…
Reference in New Issue
Block a user