Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
This commit is contained in:
commit
eb57e555e9
3 changed files with 27 additions and 2 deletions
|
@ -346,6 +346,10 @@
|
||||||
.sidebarSearch .tt-dataset-mappers .tt-suggestion .icon {
|
.sidebarSearch .tt-dataset-mappers .tt-suggestion .icon {
|
||||||
margin: 4px 9px 4px 4px;
|
margin: 4px 9px 4px 4px;
|
||||||
}
|
}
|
||||||
|
.sidebarSearch .tt-dataset-mappers .resultText {
|
||||||
|
width: 150px;
|
||||||
|
}
|
||||||
|
|
||||||
.sidebarSearch .resultText {
|
.sidebarSearch .resultText {
|
||||||
width: 260px;
|
width: 260px;
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
|
@ -381,6 +385,9 @@
|
||||||
.tt-dataset-maps div.autoOptions {
|
.tt-dataset-maps div.autoOptions {
|
||||||
width: 84px;
|
width: 84px;
|
||||||
}
|
}
|
||||||
|
.sidebarSearch .tt-dataset-mappers .autoOptions {
|
||||||
|
width: 235px;
|
||||||
|
}
|
||||||
.sidebarSearch .tt-is-under-cursor .autoOptions,
|
.sidebarSearch .tt-is-under-cursor .autoOptions,
|
||||||
.sidebarSearch .tt-is-under-mouse-cursor .autoOptions {
|
.sidebarSearch .tt-is-under-mouse-cursor .autoOptions {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -514,7 +521,24 @@
|
||||||
|
|
||||||
.sidebarSearch .tt-dataset-mappers div.mapCount {
|
.sidebarSearch .tt-dataset-mappers div.mapCount {
|
||||||
top: 8px;
|
top: 8px;
|
||||||
|
left: 170px;
|
||||||
}
|
}
|
||||||
|
.sidebarSearch .tt-dataset-mappers div.mapperCreated {
|
||||||
|
left: 0px;
|
||||||
|
padding-left: 0px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: 'din-medium', helvetica, sans-serif;
|
||||||
|
line-height: 24px;
|
||||||
|
}
|
||||||
|
.sidebarSearch .tt-dataset-mappers div.mapperGeneration {
|
||||||
|
top: 20px;
|
||||||
|
left: 0px;
|
||||||
|
padding-left: 0px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: 'din-medium', helvetica, sans-serif;
|
||||||
|
line-height: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
/* end search */
|
/* end search */
|
||||||
|
|
||||||
/* end upperLeftUI */
|
/* end upperLeftUI */
|
||||||
|
|
|
@ -10,6 +10,7 @@ module UsersHelper
|
||||||
user['value'] = u.name
|
user['value'] = u.name
|
||||||
user['profile'] = u.image.url(:thumb)
|
user['profile'] = u.image.url(:thumb)
|
||||||
user['mapCount'] = u.maps.count
|
user['mapCount'] = u.maps.count
|
||||||
|
user['created_at'] = u.created_at.strftime("%m/%d/%Y")
|
||||||
user['rtype'] = "mapper"
|
user['rtype'] = "mapper"
|
||||||
|
|
||||||
temp.push user
|
temp.push user
|
||||||
|
|
|
@ -137,10 +137,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="autoOptions">
|
<div class="autoOptions">
|
||||||
<div class="mapperCreated">
|
<div class="mapperCreated">
|
||||||
<span>Mapping since: {{created_at}}</span>
|
<p>Mapping since: {{created_at}}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="mapperGeneration">
|
<div class="mapperGeneration">
|
||||||
<span>Generation {{generation}}</span>
|
<p>Generation: 1</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="mapCount">
|
<div class="mapCount">
|
||||||
{{mapCount}}
|
{{mapCount}}
|
||||||
|
|
Loading…
Reference in a new issue