Skip to content

Commit

Permalink
0.49.0
Browse files Browse the repository at this point in the history
This closes #18
  • Loading branch information
coni2k committed Mar 3, 2016
1 parent 9485bcf commit af3ee29
Show file tree
Hide file tree
Showing 125 changed files with 120,786 additions and 203 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
### Changelog

**0.49.0**

* ngClient - _system folder
https://github.com/forCrowd/WealthEconomy/issues/18

**0.48.0**

* Reset / Forgot Password
Expand Down
3 changes: 2 additions & 1 deletion SolutionItems/Documents/Content Notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ crowd: individuals that work on a certain subject..

---
# Articles
. formula calculation
. capitalism is dead but why can't we get rid of it?
. organization.json
. formula calculation
. Difficulty of lying - Blue polar bear
. TEDs
http://www.ted.com/talks/audrey_choi_how_to_make_a_profit_while_making_a_difference - not very strong but..

# Description
Alt: Measuring the goodness
New: An experimental, open source crowd investment platform
Old: An experimental resource management system that aims to provide a more sustainable and productive economic model

Expand Down
9 changes: 5 additions & 4 deletions SolutionItems/Documents/Todo.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
*** HOT ***

users can enter what they want, except..
reserved ones will start with "_" ?
or "_system" | "sys" | "_sys" ?
send exception to server in 404 case?

---
design for forcrowd? http://osfund.co/
Find a designer! Ozgur's Ali | http://foundry.mediumra.re/variant/builder.html

Expand Down Expand Up @@ -88,6 +85,8 @@ Nadia's
. From F18 slides: check the grants

---
rating UI: Current ratings are from 0 to 100, could to 5, 10 or 1000 as well?

IMPORTANT BUT LATER!
do we correctly update RatingCount (probably yes..)?
but do we update other computed values (resourcepooltotal, count, numericvaluetotal, count, fieldratingtotal, count) correctly?
Expand Down Expand Up @@ -122,6 +121,8 @@ objects vs entities

add newly created cmrps to fetchedList in cmrpfactory - and don't use newlyCreated flag



resourcepool - resourcepoolratetotal, count, ratingcount never null
elementfiel - indexratingtotal, count never null
elementcell - numericvaluecount never null - ONLY numericvaluetotal CAN BE NULL? which can be changed to NOT NULL!
Expand Down
2 changes: 1 addition & 1 deletion SolutionItems/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
//
// AssemblyFileVersion is not in use for the moment
//
[assembly: AssemblyVersion("0.48.0")]
[assembly: AssemblyVersion("0.49.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
224 changes: 224 additions & 0 deletions ngClient/_system/css/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
/* Brand styling - Probably css class names can be better, parent child structure? */
.brandLink,
.brandLink > a,
.brandLink > a:focus,
.brandLink > a:hover {
text-decoration: none;
line-height: 1em;
}

.brandLinkImage {
margin-right: 10px;
float: left;
}

.brandLinkText {
font-family: 'Century Gothic';
text-decoration: none;
line-height: 1em;
}

.brandLinkPrimary {
color: #b08b5f;
font-size: 16px;
}

.brandLinkSecondary {
color: #2B2A28;
font-size: 11px;
}

body {
font-size: 15px;
padding-top: 50px;
padding-bottom: 20px;
}

/* Set padding to keep content from hitting the edges */
.body-content {
padding-left: 15px;
padding-right: 15px;
}

/* Set width on the form input elements since they're 100% wide by default */
input,
select,
textarea {
max-width: 280px;
}

.bg-info {
padding: 15px;
}

ul.bg-info {
padding-left: 25px;
}

.btn-xs {
font-size: 10px;
height: 18px;
width: 18px;
}

/* Callout Begin */

.bs-callout {
padding: 20px;
margin: 20px 0;
border: 1px solid #eee;
border-left-width: 5px;
border-radius: 3px;
}

.bs-callout h4 {
margin-top: 0;
margin-bottom: 5px;
}

.bs-callout p:last-child {
margin-bottom: 0;
}

.bs-callout code {
border-radius: 3px;
}

.bs-callout + .bs-callout {
margin-top: -5px;
}

.bs-callout-danger {
border-left-color: #d9534f;
}

.bs-callout-danger h4 {
color: #d9534f;
}

.bs-callout-warning {
border-left-color: #f0ad4e;
}

.bs-callout-warning h4 {
color: #f0ad4e;
}

.bs-callout-info {
border-left-color: #5bc0de;
}

.bs-callout-info h4 {
color: #5bc0de;
}

/* Callout End */

/* styles for validation helpers */
.field-validation-error {
color: #b94a48;
}

.field-validation-valid {
display: none;
}

input.input-validation-error {
border: 1px solid #b94a48;
}

input[type="checkbox"].input-validation-error {
border: 0 none;
}

.validation-summary-errors {
color: #b94a48;
}

.validation-summary-valid {
display: none;
}

/* Project level custom helpers / SH 24 Jan. '14 */
.buffer-top {
margin-top: 15px;
}

.buffer-left {
margin-left: 15px;
}

.vcenter {
display: inline-block;
vertical-align: middle;
float: none;
}
.resourcePoolEditor {
font-family: Tahoma;
/*font-family: Verdana, Geneva, Tahoma, sans-serif;*/
font-size: 10px;
padding: 1.5em 0;
}

.resourcePoolEditor .panel-title {
font-size: 18px;
line-height: 2em;
}

.resourcePoolTable {
/*table-layout: fixed;*/
}

.resourcePoolTable > thead > tr > th {
vertical-align: top;
}

.resourcePoolTable > thead > tr > th,
.resourcePoolTable > thead > tr > td,
.resourcePoolTable > tbody > tr > td,
.resourcePoolTable > tfoot > tr > td {
line-height: 2em;
min-width: 85px;
overflow: hidden; /* Hide text outside the cell */
padding: 3px;
}

.resourcePoolTable .fixedWidth35Cell {
display: inline-block;
width: 35px;
}

.resourcePoolTable .fixedWidth45Cell {
display: inline-block;
width: 45px;
}

.resourcePoolTable .infoText {
margin-left: 2px;
}

.resourcePoolTable .incomeStatusLow {
color: #a94442;
}

.resourcePoolTable .incomeStatusAverage {
/* color: ? */
}

.resourcePoolTable .incomeStatusHigh {
color: #3c763d;
}

.label-as-on-badge {
border-radius: 1em;
background-color: #3c763d;
cursor: pointer;
margin-left: 5px;
}

.label-as-off-badge {
border-radius: 1em;
background-color: #a94442;
cursor: pointer;
margin-left: 5px;
}
1 change: 1 addition & 0 deletions ngClient/_system/css/app.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added ngClient/_system/css/fonts/FontAwesome.otf
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit af3ee29

Please sign in to comment.