Replace PNG/text with SVG that includes name in proper typography (#1…

…1018)
apache · Sep 18, 2020 · f16f474 · f16f474
1 parent 1539bd0
commit f16f474
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 31 deletions.
diff --git a/airflow/www/static/css/main.css b/airflow/www/static/css/main.css
@@ -48,8 +48,8 @@ div.container {
   padding-right: 15px;
 }
 
-a.navbar-brand span {
-  color: #fff;
+.navbar-brand {
+  padding: 7px 15px;
 }
 
 .modal-backdrop {
@@ -61,10 +61,6 @@ a.navbar-brand span {
   z-index: 5;
 }
 
-a.navbar-brand {
-  cursor: default;
-}
-
 td > span.glyphicon {
   padding-left: 3px;
   padding-top: 3px;

diff --git a/airflow/www/templates/appbuilder/navbar.html b/airflow/www/templates/appbuilder/navbar.html
@@ -21,29 +21,35 @@
 {% set languages = appbuilder.languages %}
 
 <div class="navbar navbar-inverse navbar-fixed-top {{menu.extra_classes}}" role="navigation" style="background-color: {{ navbar_color }};">
-   <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" rel="home" href="{{appbuilder.get_url_for_index}}" style="cursor: pointer;">
-              <img style="float: left; width:35px; margin-top: -7px;"
-                   src="{{ url_for("static", filename="pin_100.png") }}"
-                   title="{{ current_user.username }}">
-              <span>
-                Airflow
-              </span>
-          </a>
-        </div>
-        <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                {% include 'appbuilder/navbar_menu.html' %}
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-                {% include 'appbuilder/navbar_right.html' %}
-            </ul>
-        </div>
-   </div>
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" rel="home" href="{{appbuilder.get_url_for_index}}">
+        <svg width="94" height="36" viewBox="0 0 94 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <path d="M38.9349 24.0977C38.8442 24.0977 38.765 24.0636 38.6969 23.9957C38.629 23.9276 38.5949 23.8484 38.5949 23.7577C38.5949 23.6669 38.6006 23.6048 38.612 23.5707L42.8273 12.5738C42.9178 12.3245 43.0992 12.1999 43.3712 12.1999H44.5269C44.7988 12.1999 44.98 12.3245 45.0708 12.5738L49.269 23.5707L49.3029 23.7577C49.3029 23.8484 49.269 23.9276 49.2009 23.9957C49.133 24.0636 49.0536 24.0977 48.9631 24.0977H48.0962C47.9715 24.0977 47.8753 24.0693 47.8072 24.0128C47.7393 23.9447 47.6938 23.8768 47.6712 23.8087L46.7364 21.3952H41.1616L40.2266 23.8087C40.204 23.8768 40.153 23.9447 40.0738 24.0128C40.0057 24.0693 39.915 24.0977 39.8018 24.0977H38.9349ZM46.2435 19.9334L43.949 13.8995L41.6545 19.9334H46.2435ZM51.1544 13.6106C51.041 13.6106 50.9447 13.5766 50.8653 13.5086C50.7972 13.4293 50.7633 13.333 50.7633 13.2197V12.3018C50.7633 12.1885 50.7972 12.0922 50.8653 12.0129C50.9447 11.9336 51.041 11.8939 51.1544 11.8939H52.2251C52.3384 11.8939 52.4347 11.9336 52.5139 12.0129C52.5933 12.0922 52.633 12.1885 52.633 12.3018V13.2197C52.633 13.333 52.5933 13.4293 52.5139 13.5086C52.4347 13.5766 52.3384 13.6106 52.2251 13.6106H51.1544ZM51.2903 24.0977C51.177 24.0977 51.0807 24.0636 51.0013 23.9957C50.9332 23.9163 50.8993 23.82 50.8993 23.7066V15.6502C50.8993 15.5369 50.9332 15.4462 51.0013 15.3783C51.0807 15.299 51.177 15.2593 51.2903 15.2593H52.106C52.2193 15.2593 52.3101 15.299 52.3779 15.3783C52.4574 15.4462 52.4971 15.5369 52.4971 15.6502V23.7066C52.4971 23.82 52.4574 23.9163 52.3779 23.9957C52.3101 24.0636 52.2193 24.0977 52.106 24.0977H51.2903ZM55.4067 24.0977C55.2933 24.0977 55.1971 24.0636 55.1176 23.9957C55.0498 23.9163 55.0158 23.82 55.0158 23.7066V15.6672C55.0158 15.5539 55.0498 15.4576 55.1176 15.3783C55.1971 15.299 55.2933 15.2593 55.4067 15.2593H56.1886C56.3017 15.2593 56.3982 15.299 56.4774 15.3783C56.5568 15.4576 56.5965 15.5539 56.5965 15.6672V16.4151C57.061 15.6446 57.8543 15.2593 58.976 15.2593H59.6388C59.7522 15.2593 59.8429 15.299 59.9108 15.3783C59.9902 15.4462 60.0297 15.5369 60.0297 15.6502V16.3471C60.0297 16.4604 59.9902 16.5511 59.9108 16.619C59.8429 16.687 59.7522 16.721 59.6388 16.721H58.6191C58.0071 16.721 57.5255 16.9023 57.1744 17.2649C56.823 17.6163 56.6473 18.0978 56.6473 18.7096V23.7066C56.6473 23.82 56.6078 23.9163 56.5284 23.9957C56.449 24.0636 56.3528 24.0977 56.2394 24.0977H55.4067ZM62.7472 24.0977C62.634 24.0977 62.5376 24.0636 62.4584 23.9957C62.3903 23.9163 62.3563 23.82 62.3563 23.7066V16.619H60.9116C60.7982 16.619 60.702 16.585 60.6228 16.5171C60.5547 16.4377 60.5207 16.3414 60.5207 16.2281V15.6502C60.5207 15.5369 60.5547 15.4462 60.6228 15.3783C60.702 15.299 60.7982 15.2593 60.9116 15.2593H62.3563V14.4094C62.3563 12.4832 63.3308 11.52 65.2797 11.52H66.2316C66.3449 11.52 66.4356 11.5597 66.5035 11.639C66.5829 11.707 66.6226 11.7976 66.6226 11.9109V12.4888C66.6226 12.6021 66.5829 12.6984 66.5035 12.7778C66.4356 12.8457 66.3449 12.8797 66.2316 12.8797H65.3139C64.8039 12.8797 64.447 13.0157 64.2429 13.2877C64.0391 13.5483 63.937 13.9505 63.937 14.4944V15.2593H67.5743V11.9109C67.5743 11.7976 67.6084 11.707 67.6763 11.639C67.7557 11.5597 67.852 11.52 67.9653 11.52H68.747C68.8604 11.52 68.9511 11.5597 69.019 11.639C69.0984 11.707 69.1381 11.7976 69.1381 11.9109V23.7066C69.1381 23.82 69.0984 23.9163 69.019 23.9957C68.9511 24.0636 68.8604 24.0977 68.747 24.0977H67.9653C67.852 24.0977 67.7557 24.0636 67.6763 23.9957C67.6084 23.9163 67.5743 23.82 67.5743 23.7066V16.619H63.937V23.7066C63.937 23.82 63.8973 23.9163 63.8181 23.9957C63.75 24.0636 63.6595 24.0977 63.5462 24.0977H62.7472ZM75.2842 24.2676C74.0378 24.2676 73.0691 23.9163 72.3779 23.2138C71.698 22.5112 71.3353 21.5765 71.2901 20.4093L71.273 19.6786L71.2901 18.9477C71.3353 17.7917 71.7036 16.8627 72.3948 16.1601C73.086 15.4462 74.0491 15.0893 75.2842 15.0893C76.5193 15.0893 77.4825 15.4462 78.1737 16.1601C78.8649 16.8627 79.2331 17.7917 79.2786 18.9477C79.2899 19.0723 79.2954 19.3159 79.2954 19.6786C79.2954 20.041 79.2899 20.2846 79.2786 20.4093C79.2331 21.5765 78.8649 22.5112 78.1737 23.2138C77.4938 23.9163 76.5306 24.2676 75.2842 24.2676ZM75.2842 22.9589C75.998 22.9589 76.559 22.7322 76.967 22.279C77.3862 21.8258 77.6129 21.1741 77.6469 20.3243C77.6582 20.2109 77.6637 19.9958 77.6637 19.6786C77.6637 19.3611 77.6582 19.146 77.6469 19.0326C77.6129 18.1828 77.3862 17.5311 76.967 17.078C76.559 16.6247 75.998 16.3981 75.2842 16.3981C74.5704 16.3981 74.0039 16.6247 73.5846 17.078C73.1654 17.5311 72.9444 18.1828 72.9218 19.0326L72.9047 19.6786L72.9218 20.3243C72.9444 21.1741 73.1654 21.8258 73.5846 22.279C74.0039 22.7322 74.5704 22.9589 75.2842 22.9589ZM83.5371 24.0977C83.3898 24.0977 83.2764 24.0636 83.197 23.9957C83.1178 23.9276 83.0497 23.82 82.9932 23.6727L80.5795 15.7862L80.5456 15.6162C80.5456 15.5142 80.5795 15.4293 80.6476 15.3613C80.7268 15.2933 80.8118 15.2593 80.9025 15.2593H81.6503C81.7636 15.2593 81.8543 15.2933 81.9222 15.3613C82.0016 15.4179 82.0526 15.4803 82.0753 15.5482L83.9619 21.956L85.9844 15.6162C86.0073 15.5256 86.0581 15.4462 86.1375 15.3783C86.2169 15.299 86.3245 15.2593 86.4605 15.2593H87.0383C87.1743 15.2593 87.2819 15.299 87.3613 15.3783C87.4407 15.4462 87.4915 15.5256 87.5143 15.6162L89.5369 21.956L91.4235 15.5482C91.4349 15.4916 91.4745 15.4293 91.5424 15.3613C91.6218 15.2933 91.7181 15.2593 91.8315 15.2593H92.5963C92.687 15.2593 92.7662 15.2933 92.8343 15.3613C92.9022 15.4293 92.9361 15.5142 92.9361 15.6162L92.9022 15.7862L90.5056 23.6727C90.4491 23.82 90.381 23.9276 90.3018 23.9957C90.2224 24.0636 90.1035 24.0977 89.9449 24.0977H89.2818C88.9759 24.0977 88.7889 23.956 88.7211 23.6727L86.7493 17.5879L84.7777 23.6727C84.6872 23.956 84.4945 24.0977 84.1999 24.0977H83.5371Z" fill="#fff"/>
+          <path d="M0.861099 35.3873L17.7729 18.0515C17.8788 17.9429 17.8991 17.775 17.8108 17.6516C16.782 16.2156 14.8848 15.9667 14.1814 15.002C12.0981 12.1441 11.5695 10.5266 10.6743 10.6269C10.6117 10.6339 10.556 10.6676 10.512 10.7126L4.4026 16.9752C0.887961 20.5779 0.383943 28.5103 0.291509 35.1524C0.287333 35.4525 0.651482 35.6021 0.861099 35.3873Z" fill="#017cee"/>
+          <path d="M35.4734 34.9588L18.1375 18.047C18.0289 17.941 17.861 17.9207 17.7377 18.0091C16.3017 19.0378 16.0528 20.9351 15.088 21.6384C12.2302 23.7217 10.6126 24.2504 10.7129 25.1456C10.72 25.2082 10.7536 25.2639 10.7987 25.3077L17.0613 31.4172C20.664 34.9319 28.5964 35.4359 35.2385 35.5282C35.5386 35.5326 35.6882 35.1684 35.4734 34.9588Z" fill="#00ad46"/>
+          <path fill-rule="evenodd" clip-rule="evenodd" d="M17.0612 31.4173C15.0932 29.4975 14.1801 25.6994 17.953 17.8671C11.8213 20.6074 9.67257 24.2094 10.7296 25.2407L17.0612 31.4173Z" fill="#04d659"/>
+          <path d="M35.0445 0.346896L18.1327 17.6827C18.0268 17.7913 18.0065 17.9592 18.0948 18.0825C19.1236 19.5186 21.0209 19.7674 21.724 20.7322C23.8075 23.59 24.3362 25.2075 25.2313 25.1074C25.2938 25.1004 25.3496 25.0666 25.3936 25.0216L31.5029 18.759C35.0177 15.1562 35.5217 7.22392 35.6141 0.58175C35.6182 0.281597 35.2541 0.132024 35.0445 0.346896Z" fill="#00c7d4"/>
+          <path fill-rule="evenodd" clip-rule="evenodd" d="M31.5031 18.759C29.5832 20.7269 25.7851 21.6401 17.9528 17.8671C20.693 23.9988 24.2951 26.1477 25.3263 25.0905L31.5031 18.759Z" fill="#11e1ee"/>
+          <path d="M0.432658 0.775339L17.7685 17.6871C17.8771 17.793 18.045 17.8134 18.1683 17.725C19.6043 16.6963 19.8532 14.799 20.8179 14.0957C23.6759 12.0123 25.2934 11.4837 25.193 10.5885C25.186 10.526 25.1523 10.4702 25.1074 10.4263L18.8447 4.31685C15.242 0.802203 7.30967 0.298184 0.667512 0.205751C0.367359 0.201573 0.217786 0.565722 0.432658 0.775339Z" fill="#e43921"/>
+          <path fill-rule="evenodd" clip-rule="evenodd" d="M18.8446 4.31675C20.8125 6.23662 21.7257 10.0346 17.9528 17.8669C24.0844 15.1267 26.2333 11.5246 25.1761 10.4934L18.8446 4.31675Z" fill="#ff7557"/>
+          <path fill-rule="evenodd" clip-rule="evenodd" d="M4.4028 16.9752C6.32267 15.0072 10.1207 14.0942 17.953 17.867C15.2128 11.7354 11.6107 9.58661 10.5795 10.6437L4.4028 16.9752Z" fill="#0cb6ff"/>
+          <path d="M17.9649 18.6209C18.3825 18.6157 18.7169 18.273 18.7117 17.8553C18.7065 17.4377 18.3638 17.1034 17.9462 17.1085C17.5285 17.1137 17.1942 17.4564 17.1994 17.8741C17.2045 18.2917 17.5473 18.626 17.9649 18.6209Z" fill="#4a4848"/>
+        </svg>
+      </a>
+    </div>
+    <div class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        {% include 'appbuilder/navbar_menu.html' %}
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        {% include 'appbuilder/navbar_right.html' %}
+      </ul>
+    </div>
+  </div>
 </div>