Change header back to white and remove CoreOS product bar

As the product bar has been removed from the other CoreOS sites, change back to match
This commit is contained in:
Joseph Schorr 2016-11-21 15:50:11 -05:00
parent 498d7fc15e
commit 24f16fc0d2
6 changed files with 5 additions and 148 deletions

View file

@ -57,25 +57,6 @@ nav.navbar-default .navbar-nav>li>a.active {
background: white; background: white;
} }
.header-bar-element.dark .header-bar-content {
background-color: rgba(11, 57, 90, 0.9);
box-shadow: none !important;
color: white;
}
.header-bar-element.dark .navbar-nav>li>a {
color: white;
}
.header-bar-element.dark .navbar-nav>li>a:hover,
.header-bar-element.dark .navbar-default .navbar-nav>li>a:focus,
.header-bar-element.dark .navbar-nav>li>a.active,
.header-bar-element.dark .navbar-nav>li>a:focus {
background-color: rgba(0,0,0,.25);
text-shadow:1px 1px 12px rgba(0,0,0,0.60); /* Increase opacity and spread */
color: white !important;
}
.header-bar-element .search-box { .header-bar-element .search-box {
position: absolute; position: absolute;
left: 0px; left: 0px;
@ -237,14 +218,6 @@ nav.navbar-default .navbar-nav>li>a.active {
margin-right: 20px; margin-right: 20px;
} }
.header-bar-element.dark .user-tools .user-tool {
color: white;
}
.header-bar-element.dark .user-tools .caret {
color: white;
}
.user-tools.with-menu { .user-tools.with-menu {
margin-right: 6px; margin-right: 6px;
} }
@ -266,11 +239,6 @@ nav.navbar-default .navbar-nav>li>a.active {
color: #333; color: #333;
} }
.header-bar-element.dark .user-tools i.user-tool:hover {
cursor: pointer;
color: #78CDF1;
}
.user-tools .new-menu { .user-tools .new-menu {
background: transparent !important; background: transparent !important;
} }

View file

@ -1,5 +1,5 @@
<span class="header-bar-parent"> <span class="header-bar-parent">
<div class="header-bar-element" ng-class="Features.BILLING ? 'dark' : 'light'"> <div class="header-bar-element">
<div class="header-bar-content" ng-class="searchVisible ? 'search-visible' : ''"> <div class="header-bar-content" ng-class="searchVisible ? 'search-visible' : ''">
<!-- Quay --> <!-- Quay -->
<div class="navbar-header"> <div class="navbar-header">

View file

@ -1,7 +1,7 @@
<div class="user-setup-element"> <div class="user-setup-element">
<div class="user-setup-element-view"> <div class="user-setup-element-view">
<div class="setup-logo-container" ng-show="hideLogo != 'true'"> <div class="setup-logo-container" ng-show="hideLogo != 'true'">
<img ng-src="{{ Config.getEnterpriseLogo(true) }}"> <img ng-src="{{ Config.getEnterpriseLogo() }}">
</div> </div>
<div class="user-setup-content"> <div class="user-setup-content">

View file

@ -148,7 +148,7 @@ angular.module('quay').directive('headerBar', function () {
}; };
$scope.getEnterpriseLogo = function() { $scope.getEnterpriseLogo = function() {
return Config.getEnterpriseLogo(false); return Config.getEnterpriseLogo();
}; };
$scope.toggleSearch = function() { $scope.toggleSearch = function() {

View file

@ -71,14 +71,10 @@ angular.module('quay').factory('Config', ['Features', function(Features) {
return value; return value;
}; };
config.getEnterpriseLogo = function(forWhiteBackground) { config.getEnterpriseLogo = function() {
if (!config.ENTERPRISE_LOGO_URL) { if (!config.ENTERPRISE_LOGO_URL) {
if (Features.BILLING) { if (Features.BILLING) {
if (forWhiteBackground) { return '/static/img/quay-horizontal-color.svg';
return '/static/img/quay-horizontal-color.svg';
} else {
return '/static/img/quay-horizontal-whiteblue-nobackground.svg';
}
} else { } else {
return '/static/img/QuayEnterprise_horizontal_color.svg'; return '/static/img/QuayEnterprise_horizontal_color.svg';
} }

View file

@ -131,113 +131,6 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
</head> </head>
<body ng-class="pageClass + ' ' + (user.anonymous ? 'anon' : 'signedin')" class="co-img-bg-network"> <body ng-class="pageClass + ' ' + (user.anonymous ? 'anon' : 'signedin')" class="co-img-bg-network">
<div id="co-l-footer-wrapper"> <div id="co-l-footer-wrapper">
{% if has_billing %}
<!-- Global Nav -->
<div class="co-m-global-nav">
<div class="col-lg-6 col-md-6 col-sm-6 co-m-global-nav-left">
<div class="co-m-global-nav-item">
<a href="https://coreos.com/" data-category="Global Navigation" data-event"coreos.com">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
preserveAspectRatio="xMidYMin" height="15px" viewBox="28.689 45.527 734.622 214.947"
enable-background="new 28.689 45.527 734.622 214.947" xml:space="preserve">
<g>
<g>
<path fill="#53A3DA" d="M136.168,45.527C76.898,45.527,28.689,93.739,28.689,153c0,59.265,48.209,107.474,107.479,107.474
c59.252,0,107.465-48.209,107.465-107.474C243.633,93.739,195.42,45.527,136.168,45.527z"/>
<path fill="#F1606D" d="M136.168,55.389c-17.283,0-31.941,27.645-37.235,66.069c-0.169,1.236-0.333,2.487-0.478,3.746
c-0.723,6.047-1.213,12.335-1.458,18.808c-0.117,2.962-0.175,5.956-0.175,8.988c0,3.029,0.058,6.029,0.175,8.985
c0.245,6.472,0.735,12.764,1.458,18.811c8.104,1.049,16.769,1.761,25.807,2.099c3.907,0.146,7.872,0.233,11.907,0.233
c4.023,0,8-0.088,11.895-0.233c9.049-0.338,17.708-1.05,25.819-2.099c0.892-0.114,1.77-0.239,2.659-0.368
c33.754-4.74,57.235-15.232,57.235-27.428C233.776,99.088,190.071,55.389,136.168,55.389z"/>
<path fill="#FFFFFF" d="M176.541,125.569c-0.979-1.428-2.029-2.796-3.148-4.11c-8.956-10.557-22.297-17.265-37.224-17.265
c-4.839,0-9.148,7.407-11.907,18.909c-1.096,4.586-1.947,9.819-2.495,15.498c-0.432,4.551-0.665,9.391-0.665,14.399
s0.233,9.849,0.665,14.396c4.554,0.432,9.387,0.664,14.402,0.664c5.009,0,9.842-0.232,14.396-0.664
c10.011-0.95,18.653-2.875,24.775-5.411c6.046-2.501,9.624-5.615,9.624-8.985C184.963,142.832,181.858,133.388,176.541,125.569z"
/>
</g>
<g>
<path fill="#231F20" d="M344.891,100.053c12.585,0,22.816,6.138,29.262,13.062l-10.064,11.326
c-5.353-5.192-11.175-8.495-19.041-8.495c-16.839,0-28.953,14.16-28.953,37.291c0,23.448,11.169,37.608,28.32,37.608
c9.128,0,15.895-3.775,21.717-10.228l10.067,11.169c-8.335,9.598-19.038,14.95-32.099,14.95c-26.119,0-46.731-18.88-46.731-53.025
C297.37,120.036,318.454,100.053,344.891,100.053z"/>
<path fill="#231F20" d="M416.961,125.701c19.352,0,36.822,14.793,36.822,40.597c0,25.647-17.471,40.439-36.822,40.439
c-19.197,0-36.66-14.792-36.66-40.439C380.301,140.494,397.764,125.701,416.961,125.701z M416.961,191.945
c11.33,0,18.25-10.228,18.25-25.647c0-15.577-6.92-25.804-18.25-25.804s-18.094,10.227-18.094,25.804
C398.867,181.717,405.631,191.945,416.961,191.945z"/>
<path fill="#231F20" d="M459.771,127.589h14.943l1.26,13.688h0.629c5.506-10.07,13.691-15.577,21.871-15.577
c3.938,0,6.455,0.472,8.811,1.574l-3.148,15.734c-2.67-0.784-4.717-1.257-8.018-1.257c-6.139,0-13.539,4.245-18.256,15.893v47.203
h-18.092L459.771,127.589L459.771,127.589z"/>
<path fill="#231F20" d="M541.121,125.701c20.928,0,31.941,15.107,31.941,36.667c0,3.458-0.314,6.604-0.787,8.495h-49.09
c1.57,14.003,10.379,21.869,22.811,21.869c6.613,0,12.273-2.041,17.941-5.662l6.135,11.326
c-7.395,4.878-16.676,8.341-26.432,8.341c-21.404,0-38.08-14.95-38.08-40.439C505.561,141.12,523.023,125.701,541.121,125.701z
M557.326,159.376c0-12.277-5.189-19.671-15.732-19.671c-9.125,0-16.996,6.768-18.57,19.671H557.326z"/>
<path fill="#F1606D" d="M600.602,152.607c0-32.729,17.785-53.344,42.799-53.344c24.863,0,42.641,20.615,42.641,53.344
c0,32.889-17.777,54.13-42.641,54.13C618.387,206.737,600.602,185.496,600.602,152.607z M678.49,152.607
c0-28.639-14.158-46.731-35.09-46.731c-21.084,0-35.248,18.093-35.248,46.731c0,28.796,14.164,47.521,35.248,47.521
C664.332,200.128,678.49,181.403,678.49,152.607z"/>
<path fill="#53A4D9" d="M699.738,186.125c7.557,8.495,18.412,14.003,30.529,14.003c15.732,0,25.807-8.499,25.807-20.767
c0-12.904-8.494-17.154-18.723-21.717l-15.736-7.082c-8.969-3.936-20.934-10.385-20.934-25.808
c0-14.947,12.904-25.492,30.059-25.492c12.588,0,22.658,5.665,28.949,12.435l-4.244,4.878c-5.982-6.452-14.32-10.7-24.705-10.7
c-13.691,0-22.816,7.239-22.816,18.565c0,11.962,10.385,16.521,17.936,19.985l15.738,6.921
c11.486,5.195,21.713,11.647,21.713,27.539s-13.061,27.851-33.201,27.851c-15.107,0-26.75-6.451-34.932-15.576L699.738,186.125z"
/>
</g>
</g>
</svg>
</a>
</div>
<div class="co-m-global-nav-item">
<a href="https://tectonic.com/" data-category="Global Navigation" data-event"tectonic.com">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" preserveAspectRatio="xMidYMin" height="15px" viewBox="0 0 529.586 110.059" enable-background="new 0 0 529.586 110.059" xml:space="preserve">
<g>
<polygon fill="#FFFFFF" points="70.667,41.251 51.899,32.893 33.136,41.245 51.899,52.086 51.899,73.755 68.522,61.677 "/>
<g>
<polygon fill="#68C28D" points="19.5,33.372 33.136,41.245 51.899,32.893 70.667,41.251 68.522,61.677 51.899,73.755
51.899,89.499 80.599,68.648 84.305,33.373 51.899,18.946 "/>
</g>
<g>
<g>
<path fill="#243A4C" d="M51.899,5.116L5.974,25.564l5.256,50.003l40.668,29.549l40.674-29.549l5.255-50L51.899,5.116z
M80.598,68.65L51.899,89.499V52.086L19.5,33.372l32.399-14.426l32.406,14.427L80.598,68.65z"/>
</g>
</g>
</g>
<g>
<path fill="#243A4C" d="M130.979,32.363h-19.48V18.944h54.757v13.419h-19.371v57.138h-15.906V32.363z"/>
<path fill="#243A4C" d="M170.064,18.944h44.259v13.419H186.08V46.54h24.023v13.311H186.08v16.233h29.327v13.417h-45.342V18.944z"/>
<path fill="#243A4C" d="M248.294,17.647c8.766,0,16.125,4.328,20.885,9.2l-8.766,9.845c-3.571-3.247-6.926-5.303-11.903-5.303
c-9.848,0-17.53,8.549-17.53,22.725c0,14.501,6.816,22.942,17.097,22.942c5.843,0,9.956-2.489,13.419-6.277l8.766,9.633
c-5.844,6.816-13.638,10.387-22.4,10.387c-18.289,0-33.222-12.443-33.222-36.143C214.641,31.28,230.113,17.647,248.294,17.647z"/>
<path fill="#243A4C" d="M290.06,32.363h-19.478V18.944h54.754v13.419h-19.37v57.138H290.06V32.363z"/>
<path fill="#243A4C" d="M321.471,53.899c0-23.052,13.095-36.252,32.032-36.252c19.045,0,32.031,13.308,32.031,36.252
c0,23.048-12.985,36.899-32.031,36.899C334.565,90.799,321.471,76.947,321.471,53.899z M369.193,53.899
c0-14.068-6.061-22.51-15.691-22.51c-9.524,0-15.691,8.441-15.691,22.51c0,14.176,6.167,23.157,15.691,23.157
C363.132,77.057,369.193,68.075,369.193,53.899z"/>
<path fill="#243A4C" d="M450.25,18.944h16.017v70.557H450.25V18.944z"/>
<path fill="#243A4C" d="M503.799,17.647c8.765,0,16.123,4.328,20.884,9.2l-8.765,9.845c-3.571-3.247-6.925-5.303-11.905-5.303
c-9.846,0-17.529,8.549-17.529,22.725c0,14.501,6.817,22.942,17.098,22.942c5.843,0,9.954-2.489,13.417-6.277l8.767,9.633
c-5.845,6.816-13.636,10.387-22.401,10.387c-18.29,0-33.222-12.443-33.222-36.143C470.143,31.28,485.617,17.647,503.799,17.647z"/>
<polygon fill="#243A4C" points="429.862,18.944 429.862,64.203 406.055,18.944 404.972,18.944 389.713,18.944 389.713,89.501
404.972,89.501 404.972,44.357 428.67,89.501 445.011,89.501 445.011,18.944 "/>
</g>
</svg>
</a>
</div>
<div class="co-m-global-nav-item">
<a href="https://quay.io/" data-category="Global Navigation" data-event"quay.io">
<svg id="Layer_1" preserveAspectRatio="xMidYMin" height="15px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 348.09 97.57">
<defs><style>.cls-1{fill:#003764;}.cls-2{fill:#40b4e5;}</style></defs><title>quay</title><path class="cls-1" d="M179.31,95.32a20.89,20.89,0,0,1-5.09,1.61,36.5,36.5,0,0,1-7.24.65q-11.15,0-18.82-5.14A31.66,31.66,0,0,1,136.73,79,29.79,29.79,0,0,1,126.6,74.9a27.88,27.88,0,0,1-7.78-7.56,35.26,35.26,0,0,1-4.94-10.67,49.31,49.31,0,0,1-1.72-13.46,46.86,46.86,0,0,1,2.3-15.28A31.62,31.62,0,0,1,121,16.67a27.84,27.84,0,0,1,10-7,35.81,35.81,0,0,1,25.85,0,27.57,27.57,0,0,1,10,7A32.21,32.21,0,0,1,173.34,28a46.52,46.52,0,0,1,2.31,15.17q0,14.16-6,23.27a28.08,28.08,0,0,1-16.19,12,12.93,12.93,0,0,0,6.65,5.09A26.38,26.38,0,0,0,168.8,85a22.8,22.8,0,0,0,4.24-.38,23.47,23.47,0,0,0,3.49-.91Zm-51-52.1q0,11.26,4.19,17.48a13.5,13.5,0,0,0,22.74,0q4.18-6.22,4.18-17.48,0-10.51-4.19-16.41a13.9,13.9,0,0,0-22.74,0Q128.36,32.7,128.36,43.21Z"/><path class="cls-1" d="M182.72,8.56h15.87V47.7q0,10.3,3.11,14.37t9,4.07q5.9,0,9.11-4.08t3.21-14.37V8.54h15.23V46.08q0,17.59-7,25.63t-20.54,8q-13.62,0-20.81-8t-7.19-25.63V8.56Z"/><path class="cls-1" d="M280.33,61.83H259L254.7,78.46H238.61L260.47,8.53h19l21.9,69.92H284.62ZM277.1,49.5l-1.61-6.43q-1.5-5.25-2.9-11.15T269.8,20.54h-0.43q-1.28,5.58-2.62,11.42t-2.84,11.1L262.2,49.5H277.1Z"/><path class="cls-1" d="M311.21,53.56l-21.14-45H307l6.23,16.08q1.5,4,2.84,7.67T318.93,40h0.43q1.5-4.07,2.95-7.78t2.95-7.67l6.32-16.09h16.52L327,53.56V78.44H311.22V53.56Z"/><polygon class="cls-2" points="75.13 0 95.99 44.12 75.13 88.23 57.38 88.23 78.23 44.12 57.38 0 75.13 0"/><polygon class="cls-1" points="57.38 88.23 36.52 44.12 57.38 0 75.13 0 54.28 44.12 75.13 88.23 57.38 88.23"/><polygon class="cls-2" points="47.99 19.85 38.61 0 20.86 0 39.12 38.63 47.99 19.85"/><polygon class="cls-2" points="39.12 49.6 20.86 88.23 38.61 88.23 47.99 68.38 39.12 49.6"/><polygon class="cls-1" points="20.86 88.23 0 44.12 20.86 0 38.61 0 17.75 44.12 38.61 88.23 20.86 88.23"/>
</svg>
</a>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 co-m-global-nav-right co-m-text-light">
Running the World's Containers
</div>
</div>
<!-- /Global Nav -->
{% endif %}
<nav class="navbar navbar-default header-bar co-m-navbar co-fx-box-shadow" role="navigation"></nav> <nav class="navbar navbar-default header-bar co-m-navbar co-fx-box-shadow" role="navigation"></nav>
{% if not has_billing and license_expiring %} {% if not has_billing and license_expiring %}