From 2e10a0ed5343879a09b32bf399a550ae0296d41b Mon Sep 17 00:00:00 2001 From: samwinslet Date: Thu, 16 Mar 2017 14:31:56 +0000 Subject: [PATCH 1/5] docs header colour fix --- .../jekylldocs/assets/css/new-style.min.css | 2 +- .../jekylldocs/assets/css/new-style.scss | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/composer-website/jekylldocs/assets/css/new-style.min.css b/packages/composer-website/jekylldocs/assets/css/new-style.min.css index 960be84486..9179778dfc 100644 --- a/packages/composer-website/jekylldocs/assets/css/new-style.min.css +++ b/packages/composer-website/jekylldocs/assets/css/new-style.min.css @@ -1 +1 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600");html{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;height:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;padding-bottom:0}h1{font-family:"Open Sans";font-weight:300;font-size:2.50rem;color:#19273C}h2{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.35rem;line-height:130%;color:#19273C}p{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#19273C;font-weight:400;font-size:0.9rem}svg{font-family:"Source Code Pro"}button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;flex-basis:auto;width:auto;padding-right:30px;padding-left:30px;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px}button:focus{outline:none}button+button{margin-left:0.8em}button h1{display:inline;margin-right:.5em}button[disabled],button[disabled]:hover{opacity:.65;cursor:not-allowed}button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}button.primary:hover{background-color:#2D3D7D}button.primary.active,button.primary:active,button.primary:focus{background-color:#2D3D7D}button.primary[disabled],button.primary[disabled]:hover{background-color:#B8C1C1;border-color:#B8C1C1}button.secondary{background-color:#FDFDFD;color:#3F55AF;border-color:#E3ECEC}button.secondary:hover{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary.active,button.secondary:active,button.secondary:focus{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary[disabled],button.secondary[disabled]:hover{border-color:#B8C1C1;color:#B8C1C1}button.expand{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:25px;box-shadow:0 0 20px rgba(0,0,0,0.1);padding:0;font-size:0.75em;line-height:25px;color:#8C9696}button.action{border:none;border-bottom:2px solid transparent;background-color:transparent;color:#19273C;min-width:0;padding:0;border-radius:0px}button.action:hover{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:hover svg.ibm-icon{fill:#3F55AF}button.action:focus,button.action.active,button.action:active{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:focus svg.ibm-icon,button.action.active svg.ibm-icon,button.action:active svg.ibm-icon{fill:#3F55AF}button.action[disabled],button.action[disabled]:hover{background-color:transparent;color:#F1F3F7;border-bottom:2px solid #F1F3F7}button.action[disabled] svg.ibm-icon,button.action[disabled]:hover svg.ibm-icon{fill:#F1F3F7}button.icon{background-color:transparent;min-width:0;padding:0}button.icon:hover{color:#3F55AF;background-color:transparent}button.icon:hover svg.ibm-icon{fill:#3F55AF}button.basic{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:0.25em}.overlay{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGUlEQVQImWPwS9olhQsz+CXtkmLABQabJABXUBO1fQxIrwAAAABJRU5ErkJggg==) repeat,linear-gradient(137deg, #3F55AF 0%, #5376D4 40%, #5477D5 42%, #597FDE 52%, #B4E4FF 100%);box-shadow:2px 2px 10px 0 rgba(0,0,0,0.2);overflow:hidden;top:0;left:0;bottom:0;right:0;z-index:-100}.hero_container{width:70vw;margin:auto;margin-top:17vh;display:flex;position:relative;flex-direction:row;z-index:10;box-sizing:border-box}.hero_container .leftcontent{flex-basis:40%;display:flex;flex-direction:column;padding-right:2rem;padding-bottom:8rem}.hero_container .hero_illustration{flex-basis:55%;padding-bottom:5rem;box-sizing:border-box}.hero_container .hero_illustration img{max-height:30rem}.hero_container button{box-shadow:0 1px 7px 0 rgba(0,0,0,0.2)}.hero_container h1{color:#FDFDFD;line-height:50px}.hero_container .social-container{display:flex}.hero_container .social-container ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.hero_container .social-container li{margin-right:1.5rem;flex-direction:column;justify-content:center;height:100%;display:flex}.hero_container .social-container .icon2{font-size:1.2rem;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#FDFDFD}.hero_container .social-container .icon2:hover{color:#2D3D7D}.buttoncontainer{margin-top:3.5rem;margin-bottom:2.5rem;display:flex}.navbar{display:flex;flex-basis:auto;width:100vw;height:4rem;margin:auto;background-color:none;color:#19273C}.navbar-inverse .navbar-nav>li>a{color:#19273C}.navbar-inverse .navbar-nav>li>a:hover{color:#19273C}.navbar-inverse .navbar-brand{color:#19273C}.navbar-inverse .navbar-brand:hover{color:#19273C}.navbar-fixed-top{border:none}.indexnav{display:flex;flex-direction:row;align-items:center;width:100%;height:3rem;z-index:11;padding-top:0px;position:absolute}.navcontent{font-size:0.9rem;display:flex;width:70vw;margin:auto;padding-top:2rem}.navlogo{flex-grow:1;flex-basis:100%;flex-shrink:1}.navlogo .brand{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#FDFDFD;font-weight:400;font-size:0.9rem;cursor:pointer;text-decoration:none}.navlogo .brand a{text-decoration:none}.menuitems{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.menuitems ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.menuitems ul li{margin-left:1rem;margin-right:1rem;flex-direction:column;justify-content:center;height:100%;display:flex}.menuitems ul li a{color:#FDFDFD;text-decoration:none}.menuitems ul li a:hover{border-bottom:1px solid #FDFDFD;padding-bottom:3px}.footer-bg{display:flex;background-color:#3F55AF;width:100vw;height:auto}.footer-container{display:flex;width:70vw;margin:auto;padding-top:3rem;margin-bottom:4rem}.footer-container .footer-left{display:flex;flex-grow:1;flex-shrink:1}.footer-container .footer-left p{color:#FDFDFD}.footer-container .footer-left .icon2{font-size:20px;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#19273C}.footer-container .footer-left .icon2:hover{color:#3F55AF}.footer-container .footer-right{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.footer-container .footer-right ul{display:flex;flex-grow:2;flex-direction:row;margin:0;padding:0;height:100%}.footer-container .footer-right li{margin-left:2rem;flex-direction:column;justify-content:center;height:100%;display:flex}.footer-container .footer-right li a{color:#FDFDFD;text-decoration:none;font-size:0.9rem}.footer-container .footer-right li a:hover{border-bottom:1px solid #FDFDFD}.footer-container .footer-right li p{opacity:0.6;color:#FDFDFD}.trio{margin-top:9rem;margin-bottom:7rem;margin-left:auto;margin-right:auto;width:70vw;display:flex;flex-direction:row;justify-content:space-around;flex-wrap:wrap}.trio p{text-align:center}.trio h2{text-align:center;padding-bottom:1rem}.trio .trio-left{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-left img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-center{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-center img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-right{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-right img{display:flex;height:60px;width:auto;margin:auto}.contact-bg{background-color:#F1F3F7;position:relative;padding-bottom:4rem;padding-top:4rem;height:auto}.contact-bg .contact-us{display:flex;flex-direction:row;justify-content:center;margin-left:auto;margin-right:auto;width:70vw}.contact-bg .contact-us .contact-illustration{flex-basis:40%;flex-grow:0}.contact-bg .contact-us .contact-illustration img{display:flex;height:17rem;width:auto}.contact-bg .contact-us .contact-content{flex-basis:50%}.contact-bg .contact-us .contact-content .social-icons{display:flex;flex-wrap:wrap;flex-direction:row}.contact-bg .contact-us .contact-content .social-icons .icon3{margin-top:0.5rem;margin-right:1rem;color:#3F55AF;font-size:1.5rem;width:auto}.contact-bg .contact-us .contact-content a{color:#19273C}.contact-bg .contact-us .contact-content a:hover{text-decoration:none}.contact-bg .contact-us .contact-content .community{color:#3F55AF;border-bottom:1px solid #3F55AF;padding-bottom:3px}.contact-bg .contact-us .contact-content .community:hover{color:#2D3D7D;border-bottom:1px solid #2D3D7D;padding-bottom:3px;text-decoration:none}.contact-bg .contact-us .contact-content .social-icons>div{display:flex;flex-basis:calc(40% - 30px);justify-content:center;flex-direction:column;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons>div>div{display:flex;flex-direction:row}.contact-bg .contact-us .contact-content button{margin-top:1rem;margin-bottom:1rem}.contact-bg .contact-us .contact-content p{margin-top:1rem}@media only screen and (max-width: 1200px){.hero_container{flex-direction:column-reverse}.hero_container .hero_illustration{padding-bottom:2rem}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-illustration{margin-right:2rem}}@media only screen and (max-width: 900px){.trio{flex-direction:column;max-width:30rem;margin-top:4rem;margin-bottom:4rem}.trio .trio-left{margin-bottom:3rem}.trio .trio-center{margin-bottom:3rem}.trio .trio-right{margin-bottom:3rem}.contact-bg .contact-us{flex-direction:column}.contact-bg .contact-us .contact-illustration{padding-bottom:2rem}}@media only screen and (max-width: 750px){.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}}@media only screen and (max-width: 500px){.indexnav{overflow:hidden;height:auto}.indexnav .navcontent{flex-direction:column}.indexnav .navcontent .navlogo{margin-bottom:0.5rem}.indexnav .navcontent .menuitems{justify-content:flex-start}.indexnav .navcontent .menuitems ul{margin-top:0.5rem}.indexnav .navcontent .menuitems ul li{margin-left:0;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons{flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}.hero_container .leftcontent .textcontent .buttoncontainer{display:flex}.footer-bg .footer-container{flex-wrap:wrap;flex-direction:column}.footer-bg .footer-container .footer-right ul{flex-direction:column}.footer-bg .footer-container .footer-right li{margin-left:0}.footer-bg .footer-container .footer-right li a{padding-top:0.6rem}.footer-bg .footer-container .footer-right li a:hover{border-bottom:none}} +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600");html{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;height:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;padding-bottom:0}h1{font-family:"Open Sans";font-weight:300;font-size:2.50rem;color:#19273C}h2{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.35rem;line-height:130%;color:#19273C}p{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#19273C;font-weight:400;font-size:0.9rem}svg{font-family:"Source Code Pro"}button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;flex-basis:auto;width:auto;padding-right:30px;padding-left:30px;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px}button:focus{outline:none}button+button{margin-left:0.8em}button h1{display:inline;margin-right:.5em}button[disabled],button[disabled]:hover{opacity:.65;cursor:not-allowed}button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}button.primary:hover{background-color:#2D3D7D}button.primary.active,button.primary:active,button.primary:focus{background-color:#2D3D7D}button.primary[disabled],button.primary[disabled]:hover{background-color:#B8C1C1;border-color:#B8C1C1}button.secondary{background-color:#FDFDFD;color:#3F55AF;border-color:#E3ECEC}button.secondary:hover{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary.active,button.secondary:active,button.secondary:focus{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary[disabled],button.secondary[disabled]:hover{border-color:#B8C1C1;color:#B8C1C1}button.expand{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:25px;box-shadow:0 0 20px rgba(0,0,0,0.1);padding:0;font-size:0.75em;line-height:25px;color:#8C9696}button.action{border:none;border-bottom:2px solid transparent;background-color:transparent;color:#19273C;min-width:0;padding:0;border-radius:0px}button.action:hover{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:hover svg.ibm-icon{fill:#3F55AF}button.action:focus,button.action.active,button.action:active{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:focus svg.ibm-icon,button.action.active svg.ibm-icon,button.action:active svg.ibm-icon{fill:#3F55AF}button.action[disabled],button.action[disabled]:hover{background-color:transparent;color:#F1F3F7;border-bottom:2px solid #F1F3F7}button.action[disabled] svg.ibm-icon,button.action[disabled]:hover svg.ibm-icon{fill:#F1F3F7}button.icon{background-color:transparent;min-width:0;padding:0}button.icon:hover{color:#3F55AF;background-color:transparent}button.icon:hover svg.ibm-icon{fill:#3F55AF}button.basic{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:0.25em}.overlay{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGUlEQVQImWPwS9olhQsz+CXtkmLABQabJABXUBO1fQxIrwAAAABJRU5ErkJggg==) repeat,linear-gradient(137deg, #3F55AF 0%, #5376D4 40%, #5477D5 42%, #597FDE 52%, #B4E4FF 100%);box-shadow:2px 2px 10px 0 rgba(0,0,0,0.2);overflow:hidden;top:0;left:0;bottom:0;right:0;z-index:-100}.hero_container{width:70vw;margin:auto;margin-top:17vh;display:flex;position:relative;flex-direction:row;z-index:10;box-sizing:border-box}.hero_container .leftcontent{flex-basis:40%;display:flex;flex-direction:column;padding-right:2rem;padding-bottom:8rem}.hero_container .hero_illustration{flex-basis:55%;padding-bottom:5rem;box-sizing:border-box}.hero_container .hero_illustration img{max-height:30rem}.hero_container button{box-shadow:0 1px 7px 0 rgba(0,0,0,0.2)}.hero_container h1{color:#FDFDFD;line-height:50px}.hero_container .social-container{display:flex}.hero_container .social-container ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.hero_container .social-container li{margin-right:1.5rem;flex-direction:column;justify-content:center;height:100%;display:flex}.hero_container .social-container .icon2{font-size:1.2rem;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#FDFDFD}.hero_container .social-container .icon2:hover{color:#2D3D7D}.buttoncontainer{margin-top:3.5rem;margin-bottom:2.5rem;display:flex}.navbar{display:flex;flex-basis:auto;width:100vw;height:4rem;margin:auto;background-color:none;color:#19273C}.navbar-fixed-top{border:none}.indexnav{display:flex;flex-direction:row;align-items:center;width:100%;height:3rem;z-index:11;padding-top:0px;position:absolute}.navcontent{font-size:0.9rem;display:flex;width:70vw;margin:auto;padding-top:2rem}.navlogo{flex-grow:1;flex-basis:100%;flex-shrink:1}.navlogo .brand{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#FDFDFD;font-weight:400;font-size:0.9rem;cursor:pointer;text-decoration:none}.navlogo .brand a{text-decoration:none}.menuitems{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.menuitems ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.menuitems ul li{margin-left:1rem;margin-right:1rem;flex-direction:column;justify-content:center;height:100%;display:flex}.menuitems ul li a{color:#FDFDFD;text-decoration:none}.menuitems ul li a:hover{border-bottom:1px solid #FDFDFD;padding-bottom:3px}.footer-bg{display:flex;background-color:#3F55AF;width:100vw;height:auto}.footer-container{display:flex;width:70vw;margin:auto;padding-top:3rem;margin-bottom:4rem}.footer-container .footer-left{display:flex;flex-grow:1;flex-shrink:1}.footer-container .footer-left p{color:#FDFDFD}.footer-container .footer-left .icon2{font-size:20px;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#19273C}.footer-container .footer-left .icon2:hover{color:#3F55AF}.footer-container .footer-right{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.footer-container .footer-right ul{display:flex;flex-grow:2;flex-direction:row;margin:0;padding:0;height:100%}.footer-container .footer-right li{margin-left:2rem;flex-direction:column;justify-content:center;height:100%;display:flex}.footer-container .footer-right li a{color:#FDFDFD;text-decoration:none;font-size:0.9rem}.footer-container .footer-right li a:hover{border-bottom:1px solid #FDFDFD}.footer-container .footer-right li p{opacity:0.6;color:#FDFDFD}.trio{margin-top:9rem;margin-bottom:7rem;margin-left:auto;margin-right:auto;width:70vw;display:flex;flex-direction:row;justify-content:space-around;flex-wrap:wrap}.trio p{text-align:center}.trio h2{text-align:center;padding-bottom:1rem}.trio .trio-left{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-left img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-center{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-center img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-right{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-right img{display:flex;height:60px;width:auto;margin:auto}.contact-bg{background-color:#F1F3F7;position:relative;padding-bottom:4rem;padding-top:4rem;height:auto}.contact-bg .contact-us{display:flex;flex-direction:row;justify-content:center;margin-left:auto;margin-right:auto;width:70vw}.contact-bg .contact-us .contact-illustration{flex-basis:40%;flex-grow:0}.contact-bg .contact-us .contact-illustration img{display:flex;height:17rem;width:auto}.contact-bg .contact-us .contact-content{flex-basis:50%}.contact-bg .contact-us .contact-content .social-icons{display:flex;flex-wrap:wrap;flex-direction:row}.contact-bg .contact-us .contact-content .social-icons .icon3{margin-top:0.5rem;margin-right:1rem;color:#3F55AF;font-size:1.5rem;width:auto}.contact-bg .contact-us .contact-content a{color:#19273C}.contact-bg .contact-us .contact-content a:hover{text-decoration:none}.contact-bg .contact-us .contact-content .community{color:#3F55AF;border-bottom:1px solid #3F55AF;padding-bottom:3px}.contact-bg .contact-us .contact-content .community:hover{color:#2D3D7D;border-bottom:1px solid #2D3D7D;padding-bottom:3px;text-decoration:none}.contact-bg .contact-us .contact-content .social-icons>div{display:flex;flex-basis:calc(40% - 30px);justify-content:center;flex-direction:column;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons>div>div{display:flex;flex-direction:row}.contact-bg .contact-us .contact-content button{margin-top:1rem;margin-bottom:1rem}.contact-bg .contact-us .contact-content p{margin-top:1rem}@media only screen and (max-width: 1200px){.hero_container{flex-direction:column-reverse}.hero_container .hero_illustration{padding-bottom:2rem}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-illustration{margin-right:2rem}}@media only screen and (max-width: 900px){.trio{flex-direction:column;max-width:30rem;margin-top:4rem;margin-bottom:4rem}.trio .trio-left{margin-bottom:3rem}.trio .trio-center{margin-bottom:3rem}.trio .trio-right{margin-bottom:3rem}.contact-bg .contact-us{flex-direction:column}.contact-bg .contact-us .contact-illustration{padding-bottom:2rem}}@media only screen and (max-width: 750px){.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}}@media only screen and (max-width: 500px){.indexnav{overflow:hidden;height:auto}.indexnav .navcontent{flex-direction:column}.indexnav .navcontent .navlogo{margin-bottom:0.5rem}.indexnav .navcontent .menuitems{justify-content:flex-start}.indexnav .navcontent .menuitems ul{margin-top:0.5rem}.indexnav .navcontent .menuitems ul li{margin-left:0;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons{flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}.hero_container .leftcontent .textcontent .buttoncontainer{display:flex}.footer-bg .footer-container{flex-wrap:wrap;flex-direction:column}.footer-bg .footer-container .footer-right ul{flex-direction:column}.footer-bg .footer-container .footer-right li{margin-left:0}.footer-bg .footer-container .footer-right li a{padding-top:0.6rem}.footer-bg .footer-container .footer-right li a:hover{border-bottom:none}} diff --git a/packages/composer-website/jekylldocs/assets/css/new-style.scss b/packages/composer-website/jekylldocs/assets/css/new-style.scss index 531a81f691..190e0c6959 100644 --- a/packages/composer-website/jekylldocs/assets/css/new-style.scss +++ b/packages/composer-website/jekylldocs/assets/css/new-style.scss @@ -317,19 +317,19 @@ li { color: $primary-text; } -.navbar-inverse .navbar-nav > li > a { - color: $primary-text; - &:hover { - color: $primary-text; - } -} - -.navbar-inverse .navbar-brand { - color: $primary-text; - &:hover { - color: $primary-text; - } -} +// .navbar-inverse .navbar-nav > li > a { +// color: $primary-text; +// &:hover { +// color: $primary-text; +// } +// } +// +// .navbar-inverse .navbar-brand { +// color: $primary-text; +// &:hover { +// color: $primary-text; +// } +// } .navbar-fixed-top { border: none; From a8e94b075ea3d21b68f23e9e2db05cef22b8d219 Mon Sep 17 00:00:00 2001 From: EdProsser Date: Thu, 16 Mar 2017 15:06:38 +0000 Subject: [PATCH 2/5] link fixes and calling out playground local --- .../jekylldocs/_includes/sidebars/integrating.md | 2 +- .../composer-website/jekylldocs/_includes/sidebars/tutorials.md | 2 +- packages/composer-website/jekylldocs/index.html | 2 +- .../jekylldocs/tutorials/defining-a-business-network.md | 1 + packages/composer-website/jekylldocs/tutorials/tutorialindex.md | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md b/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md index fd57781afa..bd170ba7e8 100644 --- a/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md +++ b/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md @@ -4,7 +4,7 @@ **[Defining Business Networks](../business-network/businessnetwork.html)** **[Writing Applications](../applications/genapp.html)** **[Integrating Existing Systems](../integrating/integrating-index.html)** -[Using Loopback to generate a REST API for your business network](../integrating/getting-started0rest-api.html) +[Using Loopback to generate a REST API for your business network](../integrating/getting-started-rest-api.html) **[Managing and Operating](../managing/participant-add.html)** **[Determining Problems](../problems/diagnostics.html)** **[Reference](../reference/MeetTheModules.html)** diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md b/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md index 7942abee67..e4f8935da8 100644 --- a/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md +++ b/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md @@ -1,7 +1,7 @@ **[Introduction](../introduction/introduction.html)** **[Tutorials](../tutorials/tutorialindex.html)** [Tutorial 1: Building your first business network](../tutorials/defining-a-business-network.html) -[Getting started with the command line](../tutorial/getting-started-cmd-line.html) +[Getting started with the command line](../tutorials/getting-started-cmd-line.html) [Getting started with the playground](../tutorials/getting-started-playground.html) **[Installing](../installing/prerequisites.html)** **[Defining Business Networks](../business-network/businessnetwork.html)** diff --git a/packages/composer-website/jekylldocs/index.html b/packages/composer-website/jekylldocs/index.html index 11cef79778..98afcc70b2 100644 --- a/packages/composer-website/jekylldocs/index.html +++ b/packages/composer-website/jekylldocs/index.html @@ -34,7 +34,7 @@

Build Hyperledger Fabric applications and business networks your way

Really simple models

-

Define a business network in our purpose-bulit modelling language, and script trasactions in Javascript: the most popular language on the planet.

+

Define a business network in our purpose-built modelling language, and script transactions in Javascript: the most popular language on the planet.

diff --git a/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md b/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md index 2bb3768e0d..22bd27abf7 100644 --- a/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md +++ b/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md @@ -19,6 +19,7 @@ Defining a business network is the entry point to any {{site.data.conrefs.fabric Before beginning this tutorial you will need: * A GitHub account +* If you want to run this tutorial locally, see [Installing and running the {{site.data.conrefs.composer_full}} Playground locally](../tutorials/getting-started-playground.html). --- diff --git a/packages/composer-website/jekylldocs/tutorials/tutorialindex.md b/packages/composer-website/jekylldocs/tutorials/tutorialindex.md index 88fb1656aa..5517ae3fa2 100644 --- a/packages/composer-website/jekylldocs/tutorials/tutorialindex.md +++ b/packages/composer-website/jekylldocs/tutorials/tutorialindex.md @@ -28,7 +28,7 @@ These getting started guides are intended for more technical users and may requi * [Quickstart](../installing/quickstart.html) installs and tests the prerequisites for the digital property network sample. * [Running a sample with the command line](../tutorials/getting-started-cmd-line.html). -* [Installing and running the {{site.data.conrefs.composer_short}} Playground locally](../tutorials/getting-started-playground.html). +* [Installing and running the {{site.data.conrefs.composer_short}} Playground locally](../tutorials/getting-started-playground.html). To run the [business network tutorial](..tutorials/defining-a-business-network.html) locally, install the playground locally first. {% for page in site.tutorials %}
    From 8a0e16b6c08b62e6afd0e7c2e4cca1095f787837 Mon Sep 17 00:00:00 2001 From: EdProsser Date: Thu, 16 Mar 2017 15:14:34 +0000 Subject: [PATCH 3/5] Minor codeblock fix --- .../jekylldocs/tutorials/defining-a-business-network.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md b/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md index 22bd27abf7..eb7cab0ad4 100644 --- a/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md +++ b/packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md @@ -37,6 +37,7 @@ which controls the transactions, in this script file, there is JavaScript logic 1. To get a better understanding of how business network definitions work in practise, click the **Test** tab at the top. From this screen, we can create assets and participants, and submit transactions. 2. To start with, add a *Member* participant by clicking **Member** then clicking **Create New Participant**. Enter the balance, email, and name credentials for the new participant in the following format, then click **Create New**. The credentials which are required for each participant are defined in the `.cto` file viewable in the **Define** tab. + ``` { "$class": "org.acme.vehicle.auction.Member", @@ -62,6 +63,7 @@ which controls the transactions, in this script file, there is JavaScript logic ``` 6. Next, to sell the car at auction, an auction listing asset must be created. Assets can be any tangible or intangible goods or services, in this case, the auction listing itself. To create the auction listing, click **VehicleListing** then click **Create New Asset**. The *VehicleListing* requires several properties, and should have the following format: + ``` { "$class": "org.acme.vehicle.auction.VehicleListing", @@ -77,6 +79,7 @@ which controls the transactions, in this script file, there is JavaScript logic ### Running the auction 1. Now that you have *Members* to own and bid on an asset, an *Auctioneer*, a *Vehicle* asset with registered ownership, and a *VehicleListing* asset to track the bids, reserve price, and state of the auction. The next step is to begin using transactions to interact with assets. This sample includes the *Offer* and *CloseBidding* transactions. Transactions, combined with assets and participants, make up the economic model of a business network. Transactions can modify, transfer, or otherwise alter assets, as in this sample, where transactions allow participants to place bids or allow the auctioneer to close the auction. Placing a bid uses the *Offer* transaction. To submit a transaction, click the **Submit Transaction** button. In the dialog box, use the dropdown to select the *Offer* transaction type. The *Offer* transaction requires a number of properties and should have the following format: + ``` { "$class": "org.acme.vehicle.auction.Offer", From 6d95d978d8b5374f68f105fefda7cc8e688f319b Mon Sep 17 00:00:00 2001 From: EdProsser Date: Thu, 16 Mar 2017 15:26:59 +0000 Subject: [PATCH 4/5] link fix --- packages/composer-website/jekylldocs/tutorials/tutorialindex.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/composer-website/jekylldocs/tutorials/tutorialindex.md b/packages/composer-website/jekylldocs/tutorials/tutorialindex.md index 5517ae3fa2..a59b89bea1 100644 --- a/packages/composer-website/jekylldocs/tutorials/tutorialindex.md +++ b/packages/composer-website/jekylldocs/tutorials/tutorialindex.md @@ -28,7 +28,7 @@ These getting started guides are intended for more technical users and may requi * [Quickstart](../installing/quickstart.html) installs and tests the prerequisites for the digital property network sample. * [Running a sample with the command line](../tutorials/getting-started-cmd-line.html). -* [Installing and running the {{site.data.conrefs.composer_short}} Playground locally](../tutorials/getting-started-playground.html). To run the [business network tutorial](..tutorials/defining-a-business-network.html) locally, install the playground locally first. +* [Installing and running the {{site.data.conrefs.composer_short}} Playground locally](../tutorials/getting-started-playground.html). To run the [business network tutorial](../tutorials/defining-a-business-network.html) locally, install the playground locally first. {% for page in site.tutorials %}
      From 2a23ed234477b128415308dbbe1ede1a164476c1 Mon Sep 17 00:00:00 2001 From: EdProsser Date: Thu, 16 Mar 2017 16:30:39 +0000 Subject: [PATCH 5/5] fix local playground file --- .../{applications => tutorials}/docker-compose.yml | 2 +- .../tutorials/getting-started-playground.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) rename packages/composer-website/jekylldocs/{applications => tutorials}/docker-compose.yml (97%) diff --git a/packages/composer-website/jekylldocs/applications/docker-compose.yml b/packages/composer-website/jekylldocs/tutorials/docker-compose.yml similarity index 97% rename from packages/composer-website/jekylldocs/applications/docker-compose.yml rename to packages/composer-website/jekylldocs/tutorials/docker-compose.yml index 5df1afcadc..496bcf07a3 100644 --- a/packages/composer-website/jekylldocs/applications/docker-compose.yml +++ b/packages/composer-website/jekylldocs/tutorials/docker-compose.yml @@ -31,7 +31,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock composer: - image: fabriccomposer/composer-ui + image: fabriccomposer/composer-playground ports: - '8080:8080' links: diff --git a/packages/composer-website/jekylldocs/tutorials/getting-started-playground.md b/packages/composer-website/jekylldocs/tutorials/getting-started-playground.md index 8a5261a05e..c8ad7e8684 100644 --- a/packages/composer-website/jekylldocs/tutorials/getting-started-playground.md +++ b/packages/composer-website/jekylldocs/tutorials/getting-started-playground.md @@ -173,17 +173,17 @@ In order to install Fabric Composer Playground with npm, you need the following You can install Fabric Composer Playground by running the following command in your terminal or command prompt: ``` - sudo npm install -g composer-ui + sudo npm install -g composer-playground ``` You should see the following output in your terminal or command prompt: ``` - $ sudo npm install -g composer-ui + $ sudo npm install -g composer-playground ... - /usr/local/bin/composer-ui -> /usr/local/lib/node_modules/composer-ui/cli.js + /usr/local/bin/composer-playground -> /usr/local/lib/node_modules/composer-playground/cli.js /usr/local/lib/node_modules - └─┬ composer-ui@0.4.3 + └─┬ composer-playground@0.4.3 ... ``` @@ -192,7 +192,7 @@ Verify that no errors occurred. If any part of this process fails, then Fabric C You can then start Fabric Composer Playground by running the following command in your terminal or command prompt: ``` - composer-ui + composer-playground ``` A web browser will be automatically opened once the playground has started, but should that not happen you should be able to access Fabric Composer Playground by clicking on this link: http://localhost:8080 @@ -227,13 +227,13 @@ In order to install Fabric Composer Playground with Docker, you need the followi You can install Fabric Composer Playground by running the following Docker command in your terminal or command prompt: ``` - docker run -d -p 8080:8080 fabriccomposer/composer-ui + docker run -d -p 8080:8080 fabriccomposer/composer-playground ``` You should see the following output in your terminal or command prompt: ``` - $ docker run -d -p 8080:8080 fabriccomposer/composer-ui + $ docker run -d -p 8080:8080 fabriccomposer/composer-playground afd1baff0487de5c69626b8baea69c702744f92813043e3d2b0ef786c7f77517 ```