diff --git a/apinf_packages/apis/client/card/api_card.html b/apinf_packages/apis/client/card/api_card.html index ae0f104b90..827eee509c 100644 --- a/apinf_packages/apis/client/card/api_card.html +++ b/apinf_packages/apis/client/card/api_card.html @@ -43,9 +43,11 @@

- + + +

{{ api.description }} diff --git a/apinf_packages/apis/client/profile/header/header.html b/apinf_packages/apis/client/profile/header/header.html index bdbc961746..b03ca909c0 100644 --- a/apinf_packages/apis/client/profile/header/header.html +++ b/apinf_packages/apis/client/profile/header/header.html @@ -149,9 +149,6 @@

{{/ if }} {{/ if }} - {{# if api.currentUserCanView }} - {{> apiIntro }} - {{/ if }}

diff --git a/apinf_packages/core/client/custom_stylesheet/custom_stylesheet.html b/apinf_packages/core/client/custom_stylesheet/custom_stylesheet.html index ad8b186b66..79e5dc24bf 100644 --- a/apinf_packages/core/client/custom_stylesheet/custom_stylesheet.html +++ b/apinf_packages/core/client/custom_stylesheet/custom_stylesheet.html @@ -6,28 +6,30 @@ diff --git a/apinf_packages/core/client/footer/footer.less b/apinf_packages/core/client/footer/footer.less index eb5ed03ae3..111979c9ea 100644 --- 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 index 6915cc0ec4..7f50cb9a68 100755 --- a/apinf_packages/core/client/navbar/navbar.html +++ b/apinf_packages/core/client/navbar/navbar.html @@ -27,13 +27,13 @@ {{ else }}
  • @@ -53,7 +53,7 @@ {{# if userCanViewDashboard }}
  • - + {{_ "navbar_dashboard" }}
  • @@ -62,13 +62,13 @@ {{/ if }}
  • - + {{_ "navbar_apis" }}
  • - + {{_ "navbar_organizations" }}
  • @@ -76,7 +76,7 @@ {{# if userCanAddApi }}
  • - + {{_ "navbar_addAPIBackend" }}
  • @@ -85,20 +85,12 @@ {{# if isInRole 'admin' }}
  • - + {{_ "navbar_users" }}
  • {{/ if }} {{/ if }} - {{# if branding.homeCustomBlock }} -
  • - - - {{_ "navbar_pricing" }} - -
  • - {{/ if }}
    diff --git a/apinf_packages/core/client/style/bootstrap-variables.less b/apinf_packages/core/client/style/bootstrap-variables.less index c1ba65e6b2..429f18312d 100755 --- 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 index d100179646..be530e6408 100755 --- 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; } } diff --git a/apinf_packages/core/client/style/suomi-sdk-mods.less b/apinf_packages/core/client/style/suomi-sdk-mods.less new file mode 100644 index 0000000000..f111f2837e --- /dev/null +++ b/apinf_packages/core/client/style/suomi-sdk-mods.less @@ -0,0 +1,132 @@ +/* Copyright 2018 Apinf Oy +This file is covered by the EUPL license. +You may obtain a copy of the licence at +https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 */ + +.api-card-a:hover { + text-decoration: none; +} + +.list-inline { + margin-left: 0 !important; +} + +.api-card-action-bar { + border-bottom: 10px solid #f25d0d; +} + +.api-card { + border: 1px solid #d9d9d9 !important; + border-radius: 3px !important; + box-shadow: none; +} + +.api-card:hover { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.15); + -webkit-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.15); + cursor: pointer; +} + +.api-card-heading { + padding: 0; + + a h3 { + background-color: #ececec !important; + padding-top: 7.5px !important; + padding-bottom: 7.5px !important; + font-size: 1.3em !important; + color: #333 !important; + } +} + + +.master-layout .navbar-default .navbar-nav > .open > a, .master-layout .navbar-default .navbar-nav > .open > a:hover, .master-layout .navbar-default .navbar-nav > .open > a:focus { + background-color: #0a77d1 !important; +} + + +.master-layout .navbar-default .navbar-nav > li > a { + color: #333; +} + +.main-navigation { + + .searchblock { + .btn { + background-color: #0a77d1 !important; + } + } + + background-color: #ececec !important; + + .navbar-nav > li > a:hover, + .navbar-nav > .active > a, + .navbar-nav > .active > a:hover, + .navbar-nav > .active > a:focus, + .navbar-nav > .active > a:active { + background-color: #0a77d1 !important; + color: #fff !important; + text-decoration: none !important; + } +} + +#headerwrap { + .coverphoto { + background-repeat: no-repeat; + background-size: cover; + background-color: #fff; + background-position: center center; + } + + #site-title, #site-slogan { + text-shadow: 0 0 10px #464646; + } + + .search-box { + background-color: #f25d0d; + padding: 40px; + + .btn { + margin-left: 20px; + border-color: #fff; + border-radius: 5px; + border-width: 3px; + background-color: transparent; + color: #fff; + text-transform: uppercase; + } + + input { + border-radius: 5px; + } + + .form-control:focus { + border-color: #fff; + transition: box-shadow 0.2s; + box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.3); + } + } +} + +#statisticswrap { + background-color: #fff; + color: #333; +} + +#language-select, #language-select:focus, #language-select:active { + background-color: transparent; +} + +#get-more-apis { + color: #fff !important; + background-color: #0a77d1 !important; + border-color: #0a77d1 !important; +} + + +#settings-menu .list-group-item.active { + color: #fff !important; + background-color: #0a77d1 !important; + border-color: #0a77d1 !important; +} diff --git a/apinf_packages/home/client/body/homeBody.less b/apinf_packages/home/client/body/homeBody.less index faf8c7beab..0d70e1eb9a 100644 --- a/apinf_packages/home/client/body/homeBody.less +++ b/apinf_packages/home/client/body/homeBody.less @@ -9,7 +9,6 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence /* Cover photo */ .coverphoto { - background: @brand-primary no-repeat center center; background-size: cover; } @@ -114,4 +113,4 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence .count { font-size: 2em; padding: 10px; -} \ No newline at end of file +}