Merge branch 'master' into master

hyperledger-archives · Mar 16, 2017 · 0bdfd68 · 0bdfd68
2 parents cff3ef6 + 6bb1db4
commit 0bdfd68
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 77 deletions.
diff --git a/packages/composer-playground/src/app/add-file/add-file.component.ts b/packages/composer-playground/src/app/add-file/add-file.component.ts
@@ -114,8 +114,8 @@ export class AddFileComponent implements OnInit {
     if (this.fileType === 'js') {
       let code =
         `/**
-  * New script file
-  */`;
+ * New script file
+ */`;
       let scriptManager = this.businessNetwork.getScriptManager();
       let existingScripts = scriptManager.getScripts();
       let filteredScripts = existingScripts.filter((script) => {
@@ -141,10 +141,10 @@ export class AddFileComponent implements OnInit {
 
       let code =
         `/**
-  * New model file
-  */
+ * New model file
+ */
 
-  namespace ${this.addModelNamespace + numModels}`;
+namespace ${this.addModelNamespace + numModels}`;
 
       this.currentFile = new ModelFile(modelManager, code, this.addModelFileName + numModels + this.addModelFileExtension);
       this.currentFileName = this.currentFile.getFileName();

diff --git a/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.html b/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.html
@@ -37,13 +37,13 @@ <h2>Contact Us</h2>
 </section>
 <section class="main-view">
   <div class="playground-profile-warning" *ngIf="warningVisible">
-    <div style="display:flex;">
-      <div style="margin-right:8px;">
+    <div class="profile-warning-content">
+      <div>
         <svg class="ibm-icon blue-icon" aria-hidden="true">
           <use xlink:href="#icon-world_24"></use>
         </svg>
       </div>
-      <div>
+      <div class="profile-warning-text">
         <h3>Connection Profiles are not available in Web Playground</h3>
         <p>
           It is not possible to add Connection Profiles in the Web Playground version of Fabric Composer.
@@ -53,7 +53,7 @@ <h3>Connection Profiles are not available in Web Playground</h3>
         <p>And of course it's still 100% open source</p>
         <p><a href="http://fabric-composer.org/">Learn more in the docs</a></p>
       </div>
-      <div style="flex:1;text-align:right;">
+      <div>
         <button type="button" class="button secondary" (click)="hideWarning()">Hide</button>
       </div>
     </div>

diff --git a/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.scss b/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.scss
@@ -4,15 +4,11 @@
 connection-profile {
   display: flex;
   width: 100%;
-  height: 100vh;
 
   .side-bar {
-    width: 25%;
     display: flex;
     flex-direction: column;
 
-    box-shadow: 5px 0 5px -5px #333;
-
     .profiles {
       & > * {
         padding: $space-medium $space-large;
@@ -30,17 +26,32 @@ connection-profile {
     }
 
     .about {
-      flex:1;
+      flex: 1;
       justify-content: flex-end;
       padding: $space-medium $space-large;
     }
   }
 
   .main-view {
     background-color: $fourth-highlight;
-    width: 75%;
     padding: $space-large $space-large $space-medium $space-large;
 
+    .playground-profile-warning {
+      background-color: $white;
+      border: 1px solid $fourth-highlight;
+      border-radius: 0.25em;
+      padding: $space-medium;
+      margin-bottom: $space-large;
+
+      .profile-warning-content {
+        display: flex;
+
+        .profile-warning-text {
+          margin: 0 $space-smedium;
+        }
+      }
+    }
+
     .business-network-details {
       display: flex;
 
@@ -56,18 +67,4 @@ connection-profile {
       }
     }
   }
-
-  .playground-profile-warning{
-    background-color:$white;
-    border: 1px solid $fourth-highlight;
-    border-radius: 0.25em;
-    padding: $space-medium;
-    margin-bottom: $space-large;
-
-  }
-
-  .current-profile{
-
-  }
-
 }
diff --git a/packages/composer-playground/src/app/resource/resource.component.scss b/packages/composer-playground/src/app/resource/resource.component.scss
@@ -19,8 +19,9 @@ resource-modal {
 
     .resource-bound {
       max-height: 40px;
-      min-width: 410px;
-      max-width: 410px;
+      min-width: 100%;
+     // min-width: 410px;
+     // max-width: 410px;
       margin-top: $space-medium;
     }
 

diff --git a/packages/composer-website/jekylldocs/_includes/navbar.html b/packages/composer-website/jekylldocs/_includes/navbar.html
@@ -9,7 +9,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="{{site.baseurl}}/index.html">Fabric Composer</a>
+            <a class="navbar-brand" href="{{site.baseurl}}/index.html"><b>Fabric</b> Composer</a>
         </div>
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -18,36 +18,16 @@
                     <a href="services.html">Composer</a>
                 </li> -->
                 <li>
-                    <a href="{{site.baseurl}}/start/quickstart.html">Quickstart</a>
+                    <a href="http://composer-playground.mybluemix.net/">Playground</a>
                 </li>
                 <li>
-                    <a href="{{site.baseurl}}/overview/overview.html">Documentation</a>
+                    <a href="../tutorials/tutorialindex.html">Tutorials</a>
+                </li>
+                <li>
+                    <a href="../introduction/introduction.html">Docs</a>
                 </li>
-                <!-- <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li>
-                            <a href="{{site.baseurl}}/overview/overview.html">Overview</a>
-                        </li>
-                        <li>
-                            <a href="{{site.baseurl}}/start/index.html">Getting Started</a>
-                        </li>
-                        <li>
-                            <a href="{{site.baseurl}}/concepts/index.html">Concepts</a>
-                        </li>
-                        <li>
-                            <a href="{{site.baseurl}}/tasks/index.html">Tasks</a>
-                        </li>
-                        <li>
-                            <a href="{{site.baseurl}}/reference/index.html">Reference</a>
-                        </li>
-                        <li>
-                            <a href="{{site.baseurl}}/jsdoc/index.html">API Documentation</a>
-                        </li>
-                    </ul>
-                </li> -->
                 <li>
-                    <a href="{{site.baseurl}}/support/index.html">Support</a>
+                    <a href="../support/index.html">Community</a>
                 </li>
             </ul>
         </div>

diff --git a/packages/composer-website/jekylldocs/_layouts/support.html b/packages/composer-website/jekylldocs/_layouts/support.html
@@ -8,13 +8,13 @@
     <div class="row" padding-bottom="30px">
         <div class="col-lg-12">
             <h1 class="page-header">
-                Support
+                Community
             </h1>
         </div>
         <div class="col-lg-12">
           <p>We're building a community to help people use and contribute to Fabric Composer: either join our team discussion on Rocket.chat, or ask us a question on Stackoverflow.  We'd also love to hear your thoughts or feedback on what we're doing!</p>
           <br>
-          <p>And that's not all: if you're a developer, come join us on GitHub: browse our code, or send us a pull request (and we'll love you forever).</p>
+          <p>And that's not all: if you're a developer, come join us on GitHub.  Browse our code, or send us a pull request (and we'll love you forever).</p>
         </div>
       </div>
 
@@ -26,7 +26,7 @@ <h4><i class="fa fa-fw fa-rocket"></i> Hyperledger Rocket Chat</h4>
                 </div>
                 <div class="panel-body">
                     <p>You will need a <a href="https://identity.linuxfoundation.org/">Linux Foundation id</a>, or alternatively you can log in with Facebook, Github, Google, or OpenStack.</p>
-                    <a href="https://chat.hyperledger.org/channel/fabric-composer" class="btn btn-default">Rocket.chat</a>
+                    <a href="https://chat.hyperledger.org/channel/fabric-composer" class="btn btn-default">Let's chat</a>
                 </div>
             </div>
         </div>
@@ -57,6 +57,13 @@ <h4><i class="fa fa-fw fa-github"></i> GitHub</h4>
 
       </div>
 
+      <div class="row">
+        <div class="col-lg-12">
+          <p>Oh hey, you're on the Community page!  Hopefully that means you've given Fabric Composer a try: what did you think?</p>
+          <p>You can help us out by completing this 1-question <a href="https://goo.gl/forms/7YPMLP2LTN2hjIRk2"><b>survey</b></a> (score us from 0 to 10) - we really appreciate your feedback!</p>
+        </div>
+      </div>
+
     <article class="main">
       {% if page.social_text %}
         {% include social.html %}

diff --git a/packages/composer-website/jekylldocs/assets/css/bootstrap.css b/packages/composer-website/jekylldocs/assets/css/bootstrap.css
@@ -5,7 +5,7 @@
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 html {
-  font-family: sans-serif;
+  font-family: "Open Sans", sans-serif;
   -webkit-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;
 }
@@ -1084,7 +1084,7 @@ html {
 }
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 16px;
+  font-size: 15px;
   line-height: 1.42857143;
   color: #333;
   background-color: #fff;
@@ -4247,23 +4247,23 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   }
 }
 .navbar-fixed-top {
-  background-color: #343334;
-  border-color: #343334;
+  background-color: #5068C2;
+  border-color: #5068C2;
   top: 0;
   border-width: 0 0 1px;
 }
 .navbar-fixed-bottom {
   bottom: 0;
   margin-bottom: 0;
   border-width: 1px 0 0;
-  background-color: #343334;
-  border-color: #343334;
+  background-color: #323232;
+  border-color: #323232;
 }
 .navbar-brand {
   float: left;
   height: 50px;
   padding: 15px 15px;
-  font-size: 18px;
+  font-size: 15px;
   line-height: 20px;
 }
 .navbar-brand:hover,
@@ -4604,15 +4604,12 @@ fieldset[disabled] .navbar-default .btn-link:focus {
 .navbar-inverse .navbar-nav > .disabled > a,
 .navbar-inverse .navbar-nav > .disabled > a:hover,
 .navbar-inverse .navbar-nav > .disabled > a:focus {
-  color: #444;
+  color: #5068C2;
   background-color: transparent;
 }
-.navbar-inverse .navbar-toggle {
-  border-color: #333;
-}
 .navbar-inverse .navbar-toggle:hover,
 .navbar-inverse .navbar-toggle:focus {
-  background-color: #272727;
+  background-color: #3F55AF;
 }
 .navbar-inverse .navbar-toggle .icon-bar {
   background-color: #fff;

diff --git a/packages/composer-website/jekylldocs/assets/css/composer-style.css b/packages/composer-website/jekylldocs/assets/css/composer-style.css
@@ -9,18 +9,20 @@
 html,
 body {
     height: 100%;
-    font-family: 'Roboto', sans-serif;
+    font-family: 'Open Sans', sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 html {
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Open Sans', sans-serif;
 }
 
 h1, h2, h3, h4, h5, h6 {
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Open Sans', sans-serif;
 }
 body {
     /*padding-top: 50px; /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */*/
-    font-family: 'Roboto', sans-serif;
+    font-family: 'Open Sans', sans-serif;
 }
 
 .img-portfolio {