initial changes

apinf · Jan 15, 2018 · 7d2e145 · 7d2e145
1 parent e094292
commit 7d2e145
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 77 deletions.
diff --git a/apinf_packages/apis/client/card/api_card.html b/apinf_packages/apis/client/card/api_card.html
@@ -43,9 +43,11 @@ <h3>
         </li>
       </ul>
     </div>
-    <div class="api-card-logo clearfix">
-        {{> viewApiLogo api=api }}
-    </div>
+    <a href="{{ pathFor 'viewApi' slug=api.slug }}" class="api-card-a">
+      <div class="api-card-logo clearfix">
+          {{> viewApiLogo api=api }}
+      </div>
+    </a>
     <div class="api-card-description">
       <p class="text-center">
         {{ api.description }}

diff --git a/apinf_packages/apis/client/profile/header/header.html b/apinf_packages/apis/client/profile/header/header.html
@@ -149,9 +149,6 @@ <h1 id="api-header">
             {{/ if }}
           {{/ if }}
         </ul>
-        {{# if api.currentUserCanView }}
-          {{> apiIntro }}
-        {{/ if }}
       </div>
     </div>
   </div>

diff --git a/apinf_packages/core/client/custom_stylesheet/custom_stylesheet.html b/apinf_packages/core/client/custom_stylesheet/custom_stylesheet.html
@@ -6,28 +6,30 @@
 <template name="customStylesheet">
   <style>
     footer {
-      background-color: {{ primaryColor }};
+      /*background-color: {{ primaryColor }};*/
+      padding-bottom: 1em;
+      padding-top: 2em;
     }
 
     .footer-text, footer a, footer a:hover, footer a:focus {
       color: {{ primaryColorText }};
     }
 
-    #language-select, #language-select:focus, #language-select:active {
+    /*#language-select, #language-select:focus, #language-select:active {
       color: {{ primaryColorText}};
       background-color: {{ primaryColor }};
       border: 1px solid {{ primaryColor }};
-      margin-left: -0.7em;
-    }
+      margin-left: -0.4em;
+    }*/
 
     .coverphoto {
       background-color: {{ primaryColor }} !important;
     }
 
-    .dropdown-toggle {
+    /*.dropdown-toggle {
       background-color: {{ mostReadableBackground }} !important;
       color: {{ primaryColorText }} !important;
-    }
+    }*/
 
     .project-name-link {
       color: {{ primaryColorText }} !important;
@@ -37,48 +39,48 @@
       background: {{ primaryColor }} !important;
     }
 
-    .main-navigation {
+    /*.main-navigation {
       background-color: {{ primaryColor }} !important;
-    }
+    }*/
 
-    .navbar-nav > li > a:hover,
+    /*.navbar-nav > li > a:hover,
     .navbar-nav > .active > a,
     .navbar-nav > .active > a:hover,
     .navbar-nav > .active > a:focus {
       background-color: {{ mostReadableBackground }} !important;
-    }
+    }*/
 
-    .search-box {
+    /*.search-box {
       background-color: {{ primaryColor }} !important;
-    }
+    }*/
 
-    .media-heading {
+    /*.media-heading {
       color: {{ primaryColorText }} !important;
-    }
+    }*/
 
-    #api-navigation-tabs .nav-tabs > li.active > a {
+    /*#api-navigation-tabs .nav-tabs > li.active > a {
       border-top-color: {{ primaryColor }} !important;
-    }
+    }*/
 
-    #statisticswrap {
+    /*#statisticswrap {
       background-color: {{ primaryColor }};
       color: {{ primaryColorText }};
-    }
+    }*/
 
     #headerwrap {
       background: {{ coverPhotoOverlay }};
     }
 
     /* Only select top-level navigation menu items */
-    #main-navbar > li > a {
+    /*#main-navbar > ul > li > a {
       color: {{ primaryColorText }} !important;
-    }
+    }*/
 
-    #settings-menu .list-group-item.active {
+    /* #settings-menu .list-group-item.active {
       color: {{ primaryColorText }} !important;
       background-color: {{ primaryColor }} !important;
       border-color: {{ primaryColor }};
-    }
+    } */
 
     #site-title {
       color: {{ primaryColorText }} !important;
@@ -87,11 +89,11 @@
     #site-slogan {
       color: {{ primaryColorText }} !important;
     }
-
+/* 
     #get-more-apis {
       color: {{ primaryColorText }} !important;
       background-color: {{ primaryColor }} !important;
       border-color: {{ primaryColor }};
-    }
+    } */
   </style>
 </template>
diff --git a/apinf_packages/core/client/footer/footer.less b/apinf_packages/core/client/footer/footer.less
@@ -6,7 +6,7 @@
 footer {
   padding-bottom: 1em;
   padding-top: 1em;
-
+  background-color: #2c2c2c;
   @media only screen and (max-width: 767px) {
     .social-media-icon {
       width: 3em;

diff --git a/apinf_packages/core/client/navbar/navbar.html b/apinf_packages/core/client/navbar/navbar.html
@@ -27,13 +27,13 @@
         {{ else }}
         <li>
           <a class="navbar-login" href="{{ pathFor 'signUp' }}" id="signup-button">
-            <i class="fa fa-user-plus" aria-hidden="true"></i>
+            <!-- <i class="fa fa-user-plus" aria-hidden="true"></i> -->
             {{_ "navbar_signUp" }}
           </a>
         </li>
         <li>
           <a class="navbar-login" href="{{ pathFor 'signIn' }}" id="signin-button">
-            <i class="fa fa-sign-in" aria-hidden="true"></i>
+            <!-- <i class="fa fa-sign-in" aria-hidden="true"></i> -->
             {{_ "navbar_signIn" }}
           </a>
         </li>
@@ -53,7 +53,7 @@
             {{# if userCanViewDashboard }}
               <li class="{{ isActiveRoute 'dashboard' }}">
                 <a href="{{ pathFor 'dashboard' }}" id="dashboard-button">
-                  <i class="fa fa-bar-chart" aria-hidden="true"></i>
+                  <!-- <i class="fa fa-bar-chart" aria-hidden="true"></i> -->
                   {{_ "navbar_dashboard" }}
                 </a>
               </li>
@@ -62,21 +62,21 @@
         {{/ if }}
         <li class="{{ isActiveRoute 'apiCatalog' }}">
           <a href="{{ pathFor 'apiCatalog' }}" id="apis-button">
-            <i class="fa fa-book" aria-hidden="true"></i>
+            <!-- <i class="fa fa-book" aria-hidden="true"></i> -->
             {{_ "navbar_apis" }}
           </a>
         </li>
         <li class="{{ isActiveRoute 'organizationCatalog' }}">
           <a href="{{ pathFor 'organizationCatalog' }}" id="organizations-button">
-            <i class="fa fa-address-card" aria-hidden="true"></i>
+            <!-- <i class="fa fa-address-card" aria-hidden="true"></i> -->
             {{_ "navbar_organizations" }}
           </a>
         </li>
         {{# if currentUser }}
           {{# if userCanAddApi }}
           <li class="{{ isActiveRoute 'addApi' }}">
             <a href="{{ pathFor 'addApi' }}" id="addapi-button">
-              <i class="fa fa-plus" aria-hidden="true"></i>
+              <!-- <i class="fa fa-plus" aria-hidden="true"></i> -->
               {{_ "navbar_addAPIBackend" }}
             </a>
           </li>
@@ -85,20 +85,12 @@
           {{# if isInRole 'admin' }}
             <li class="{{ isActiveRoute 'accountsAdmin' }}">
               <a href="{{ pathFor 'accountsAdmin' }}" id="users-button">
-                <i class="fa fa-users" aria-hidden="true"></i>
+                <!-- <i class="fa fa-users" aria-hidden="true"></i> -->
                 {{_ "navbar_users" }}
               </a>
             </li>
           {{/ if }}
         {{/ if }}
-        {{# if branding.homeCustomBlock }}
-        <li class="{{ isActiveRoute 'pricing' }}">
-          <a href="{{ pathFor 'pricing' }}" id="pricing-button">
-            <i class="fa fa-credit-card" aria-hidden="true"></i>
-            {{_ "navbar_pricing" }}
-          </a>
-        </li>
-        {{/ if }}
       </ul>
     </div>
     <div class="container">

diff --git a/apinf_packages/core/client/style/bootstrap-variables.less b/apinf_packages/core/client/style/bootstrap-variables.less
@@ -25,7 +25,7 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
 @gray-light:             lighten(@gray-base, 60%);   // #999
 @gray-lighter:           lighten(@gray-base, 93.5%); // #eee
 
-@brand-primary:         #2FA4E7;
+@brand-primary:         #0a77d1;
 @brand-success:         #28ae4f;
 @brand-info:            #00BCD4;
 @brand-warning:         #e15400;

diff --git a/apinf_packages/core/client/style/global.less b/apinf_packages/core/client/style/global.less
@@ -76,34 +76,10 @@ hr {
 }
 
 .navigation-tabs {
-  position: relative;
-  top: 9px; // needs to be in px
-  margin-top: 0.6em;
-  clear: both;
-
+  margin-top: 2em;
   .nav-tabs {
     border-bottom: none;
-    display: inline-block;
-    margin-bottom: 0.23em;
-  }
-
-  .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
-    font-weight: bold;
-    line-height: initial;
-    color: #333;
-    background-color: #fff;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
-    border-top: 3px @brand-primary;
-    border-right-color: #EEE;
-    border-left-color: #EEE;
-  }
-
-  .nav-tabs > li {
-    border: solid transparent;
-    border-width: 3px 1px 1px;
-    border-radius: 3px 3px 0 0;
-    height: 42px;
+    margin-bottom: 1px;
   }
 
   .nav-tabs > li > a {
@@ -112,9 +88,7 @@ hr {
 
   .nav > li > a:hover, .nav > li > a:focus {
     text-decoration: none;
-    background-color: transparent;
     color: #333;
-    border-color: transparent;
   }
 }