Skip to content

Commit

Permalink
Layout reworked. ISSUES: #1 #8 #9
Browse files Browse the repository at this point in the history
  • Loading branch information
@enkogu
enkogu committed Nov 17, 2017
1 parent 3f18abb commit 43275b8
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 35 deletions.
12 changes: 1 addition & 11 deletions client/components/5-pull-right-menu.ls
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
components.pull-right-menu=-> ul class:'pull-right h-menu',
li class:'dropdown hm-profile',
a "data-toggle":'dropdown' class:'jazz-logo' name:web3?eth?defaultAccount, href:'',
img alt:''
ul class:'dropdown-menu pull-right dm-icon',
li a href:"https://etherscan.io/address/#{web3?eth?defaultAccount}" target:\_blank,
i class:'zmdi zmdi-account'
"Your address: #{web3?eth?defaultAccount}"
li a href:"https://etherscan.io/address/#{web3?eth?defaultAccount}" target:\_blank,
i class:'zmdi zmdi-file-text'
"Thetta address: #{web3?eth?defaultAccount}"
components.pull-right-menu=-> li class:'jazz-logo-li', a class:'jazz-logo' name:web3?eth?defaultAccount, href:''
91 changes: 74 additions & 17 deletions client/styles/app.min.1.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10040,15 +10040,15 @@ html {
overflow-x: hidden;
}

body:before {
/*body:before {
content: '';
height: 265px;
height: 169px;
width: 100%;
position: absolute;
left: 0;
top: 0;
}

*/
audio,
video {
outline: none;
Expand Down Expand Up @@ -10127,8 +10127,8 @@ pre {
-ms-user-select: none;
user-select: none;
position: relative;
padding: 40px 45px;
margin-bottom: 20px;
padding: 10px 45px;
margin-bottom: -72px;
z-index: 10;
}

Expand Down Expand Up @@ -10170,11 +10170,35 @@ pre {
}
}

@media (max-width: 1279px) {
@media (min-width: 768px) and (max-width: 1279px) {
.h-logo .menu-collapse {
margin-top: 8px;
float: left;
/*margin-top: 8px;*/
/*float: left;*/
/*position: relative;*/
/*top: -51px;*/
/*margin-bottom: -3px;*/
/*right: 65px;*/
/*right: 70px;*/
}

}

@media (max-width: 767px) {
.h-logo .menu-collapse {
/*margin-top: 8px;*/
/*float: left;*/
/*position: relative;*/
/*top: -51px;*/
/*margin-bottom: -3px;*/
/*right: 65px;*/
/*right: 70px;*/
}


}

.action-header{
background-color: rgba(103,172,92,0) !important;
}

/*----------------------------------
Expand Down Expand Up @@ -10425,13 +10449,41 @@ pre {
margin: -5px 0 0 5px;
}

.hm-profile > a img {
width: 45px;
height: 45px;
.jazz-logo-li {
width: 30px;
height: 30px;
}

.jazz-logo-li > a{
padding-top: 9px !important;
}

.jazz-logo {
/*margin-top: 20px;*/
float: center;
width: 100%;
height: 100%;
position: relative;
top:1px;
/*border-radius: 50%;*/
/*border: 2px solid rgba(255, 255, 255, 0.8);*/
/*margin-left: 70px*/
}

.jazz-logo > div{
border-radius: 50%;
border: 2px solid rgba(255, 255, 255, 0.8);
border: 1px solid rgba(255, 255, 255, 1);
}



@media (max-width: 768px) {
.jazz-logo{
display: none !important;
}
}


@media (min-width: 1280px) {
.hm-alerts {
display: none !important;
Expand Down Expand Up @@ -10624,7 +10676,7 @@ pre {
.smm-alerts {
list-style: none;
padding: 0;
margin: 30px 0 60px;
margin: 0px 0 50px;
padding-left: 40px;
}

Expand Down Expand Up @@ -15085,12 +15137,12 @@ html:not(.ie9) .select.fg-line:before {

.menu-collapse {
cursor: pointer;
position: relative;
/*position: absolute;*/
width: 55px;
height: 35px;
padding: 12px 0 0 8px;
}

/*
.menu-collapse:before {
content: "";
position: absolute;
Expand All @@ -15105,7 +15157,7 @@ html:not(.ie9) .select.fg-line:before {
-o-transform: scale(0);
transform: scale(0);
z-index: 0;
}
}*/

.menu-collapse.toggled .mc-wrap {
-webkit-transform: rotate(180deg);
Expand Down Expand Up @@ -15212,7 +15264,7 @@ html.ismobile .page-loader {
font-weight: 500;
color: #4C4C4C;
margin-bottom: 10px;
font-size: 15px;
font-size: 20px;
position: relative;
z-index: 1;
background-color: #f7f7f7;
Expand Down Expand Up @@ -15759,4 +15811,9 @@ body.o-hidden {

.preloader.pls-amber .plc-path {
stroke: #ffc107;
}

.pull-left.h-logo{
display: flex;
flex-direction: row;
}
37 changes: 37 additions & 0 deletions client/styles/y-custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,28 @@ i.zmdi{

#content{
min-height: 500px !important;
z-index: 100 !important;
margin-top: 7px;
}



.container{
z-index: 100 !important;
}



.action-header{
z-index: 100 !important;
padding-bottom: 0px;
padding-top: 0px;
display: flex;
flex-direction: column;
justify-content: center;
margin-bottom: 20px;


}


Expand All @@ -27,4 +49,19 @@ i.zmdi{
height: 45px;
border-radius: 50%;
border: 2px solid rgba(255, 255, 255, 0.8);
}

h5.lgi-heading{
margin-top: 0px;
font-weight: bold;
}

.bounty-logo{
padding-top: 1px;
border-radius: 5px !important;

}

svg{
position: static !important;
}
15 changes: 9 additions & 6 deletions client/views/0-layout.ls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@ template \layout -> html lang:\en,
body "data-ma-header":'green',
header_blaze id:'header' class:'media',
div class:'pull-left h-logo',
a href:'/home' class:'hidden-xs', "Thetta",
small "bounties"
div class:'menu-collapse' "data-ma-action":'sidebar-open' "data-ma-target":'main-menu',
div class:'mc-wrap',
div class:'mcw-line top palette-White bg'
div class:'mcw-line center palette-White bg'
div class:'mcw-line bottom palette-White bg'
components.pull-right-menu!
components.search-field!


a href:'/home' class:'hidden-xs', "Thetta",
small "bounties"

# components.pull-right-menu!
# components.search-field!

section id:'main',
components.sidebar!
# components.sidebar!
components.main-menu!

Blaze.If (~> web3?), (~> SI @lookupTemplate \yield),
Expand Down Expand Up @@ -516,7 +519,7 @@ Template.layout.rendered=->
easyPieChart 'easy-pie-3', '#fff', 'rgba(0,0,0,0.08)', 'rgba(0,0,0,0)', 2, 75
easyPieChart 'easy-pie-4', '#fff', 'rgba(0,0,0,0.08)', 'rgba(0,0,0,0)', 2, 75

$('.jazz-logo').html(jazzicon(45, $('.jazz-logo').attr('name')))
$('.jazz-logo').html(jazzicon(20, $('.jazz-logo').attr('name')))

@activeQ=->
if Router.current!?route?getName! == it => \active
Expand Down
75 changes: 74 additions & 1 deletion client/views/2-bounties.ls
View file
Original file line number Diff line number Diff line change
@@ -1 +1,74 @@
T \bounties -> msg 'Bounties' 'So tasty, so exciting, wow'
T \bounties -> section id:'content', d \.container d \.card,
div class:'action-header palette-Green-400 bg clearfix',
div class:'ah-label hidden-xs palette-White text', "Bounties"
div class:'ah-search',
input type:'text' placeholder:'Start typing...' class:'ahs-input'
i class:'ah-search-close zmdi zmdi-long-arrow-left' "data-ma-action":'ah-search-close'
ul class:'ah-actions actions a-alt',
li a href:'' class:'ah-search-trigger' "data-ma-action":'ah-search-open',
i class:'zmdi zmdi-search'
li a href:'',
i class:'zmdi zmdi-time'
li class:'dropdown',
a href:'' "data-toggle":'dropdown' "aria-expanded":'true',
i class:'zmdi zmdi-sort'
ul class:'dropdown-menu dropdown-menu-right',
li a href:'', "Last Modified"
li a href:'', "Last Edited"
li a href:'', "Name"
li a href:'', "Date"
li a href:'',
i class:'zmdi zmdi-info'
li class:'dropdown',
a href:'' "data-toggle":'dropdown' "aria-expanded":'true',
i class:'zmdi zmdi-more-vert'
ul class:'dropdown-menu dropdown-menu-right',
li a href:'', "Refresh"
li a href:'', "Listview Settings"
# li a href:'' class:'jazz-logo' name:web3?eth?defaultAccount


div class:'list-group lg-alt lg-even-black',
replicate 7 item!

ul class:'pagination lg-pagination',
li a href:'' "aria-label":'Previous',
i class:'zmdi zmdi-chevron-left'
li class:'active', a href:'', "1"
li a href:'', "2"
li a href:'', "3"
li a href:'', "4"
li a href:'', "5"
li a href:'' "aria-label":'Next',
i class:'zmdi zmdi-chevron-right'

@item=-> div class:'list-group-item media',
div class:'pull-right',
ul class:'actions',
li class:'dropdown',
a href:'' "data-toggle":'dropdown' "aria-expanded":'false',
i class:'zmdi zmdi-more-vert'
ul class:'dropdown-menu dropdown-menu-right',
li a href:'', "Check bounty contract address on etherscan"
li a href:'', "Check creator address on etherscan"
li a href:'', "Claim as complited"


div class:'pull-left',
div class:\bounty-logo name:\123
div class:'media-body',
div class:'lgi-heading',
b "Thetta project: "
"Profile page. As a User I want to be able to go to the Profile page by clicking on the avatar on the top right."

ul class:'lgi-attrs',
li "Created: 2017-10-10 13:54"
li "Status: prepaid"
li "Bounty: 2.5 ETH"
li "Days left: 17"


Template.bounties.rendered=->
for it in $ \.bounty-logo
$(it).html jazzicon 38, \0x + drop 15 md5 $(it).attr \name
# map (-> $(it).html jazzicon(38, $(it).attr \name) ), $ \.bounty-logo

0 comments on commit 43275b8

Please sign in to comment.