Changes in / [6edc367:55470f9] in OpenWorkouts-current

Location:

ow

Files:

• static/apple-touch-icon.png (modified) (previous)
• static/css/main.css (modified) (3 diffs)
• static/favicon-16x16.png (modified) (previous)
• static/favicon-32x32.png (modified) (previous)
• static/favicon.ico (deleted)
• static/less/modules/header.less (modified) (3 diffs)
• static/media/img/icon-logout.svg (deleted)
• static/media/img/icon-user.svg (deleted)
• static/media/img/logo-openworkouts.png (deleted)
• static/mstile-150x150.png (deleted)
• static/pyramid-16x16.png (added)
• static/pyramid.png (added)
• static/safari-pinned-tab.svg (modified) (1 diff)
• templates/base.pt (modified) (2 diffs)
• templates/base_anonymous.pt (modified) (1 diff)
• templates/openworkouts.pt (deleted)
• views/root.py (modified) (1 diff)

ow/static/css/main.css

@@ -664 +664 @@
   color: #EE4056;
 }
-@media (max-width: 800px) {
-  .logo a {
-    content: "";
-    display: inline-block;
-    width: 34px;
-    height: 34px;
-    background-image: url('/static/media/img/logo-openworkouts.png');
-    background-size: 100%;
-    background-repeat: no-repeat;
-  }
-  .logo a span {
-    display: none !important;
-  }
-}
 .logo-open {
   display: block;
@@ -698 +684 @@
   flex-direction: row;
   justify-content: space-between;
-  align-items: center;
 }
 .nav-site li {
@@ -715 +700 @@
 .nav-site .is-active a {
   color: #151515;
-}
-.icon-dashboard::before,
-.icon-profile::before,
-.icon-logout::before {
-  content: "";
-  display: inline-block;
-}
-.icon-dashboard span,
-.icon-profile span,
-.icon-logout span {
-  display: none;
-}
-@media (min-width: 800px) {
-  .icon-dashboard::before,
-  .icon-profile::before,
-  .icon-logout::before {
-    display: none;
-  }
-  .icon-dashboard span,
-  .icon-profile span,
-  .icon-logout span {
-    display: inline-block;
-  }
-}
-.icon-dashboard:hover,
-.icon-profile:hover,
-.icon-logout:hover {
-  opacity: 0.5;
-}
-.icon-dashboard::before {
-  content: "☰";
-  font-size: 30px;
-  font-size: 1.875rem;
-  line-height: 0em;
-  position: relative;
-  top: 3px;
-  margin: 0;
-}
-.icon-profile {
-  padding: 1em 1.25em !important;
-}
-.icon-profile::before {
-  position: relative;
-  top: 3px;
-  width: 20px;
-  height: 20px;
-  background-image: url('/static/media/img/icon-user.svg');
-  background-size: 100%;
-  margin: 0;
-}
-.icon-logout {
-  padding: 1em 1.25em !important;
-}
-.icon-logout::before {
-  position: relative;
-  top: 3px;
-  width: 20px;
-  height: 20px;
-  background-image: url('/static/media/img/icon-logout.svg');
-  background-size: 100%;
-  margin: 0;
 }
 /* Add workout button with submenu -------------------------------------------*/

ow/static/less/modules/header.less

@@ -26 +26 @@
         }
     }
-    a {
-        @media (max-width: @screen-m){
-            content: "";
-            display: inline-block;
-            width: 34px;
-            height: 34px;
-            background-image: url('/static/media/img/logo-openworkouts.png');
-            background-size: 100%;
-            background-repeat: no-repeat;
-            span {
-                display: none !important;
-            }
-        }
-    }
 }
 .logo-open {
@@ -61 +47 @@
         flex-direction: row;
         justify-content: space-between;
-        align-items: center;
     }
     li{
@@ -82 +67 @@
     }
 }
-
-.icon-dashboard,
-.icon-profile,
-.icon-logout {
-    &::before {
-        content: "";
-        display: inline-block;
-    }
-    span {
-        display: none;
-    }
-    @media (min-width: @screen-m){
-        &::before {
-            display: none;
-        }
-        span{
-            display: inline-block;
-        }
-    }
-    &:hover {
-        opacity: .5;
-    }
-}
-
-.icon-dashboard {
-    &::before {
-        content: "☰";
-        .font-size(30);
-        line-height: 0em;
-        position: relative;
-        top: 3px;
-        margin: 0;
-    }
-}
-
-.icon-profile {
-    padding: 1em 1.25em !important;
-    &::before {
-        position: relative;
-        top: 3px;
-        width: 20px;
-        height: 20px;
-        background-image: url('/static/media/img/icon-user.svg');
-        background-size: 100%;
-        margin: 0;
-    }
-}
-
-
-.icon-logout {
-    padding: 1em 1.25em !important;
-    &::before {
-        position: relative;
-        top: 3px;
-        width: 20px;
-        height: 20px;
-        background-image: url('/static/media/img/icon-logout.svg');
-        background-size: 100%;
-        margin: 0;
-    }
-}
-
-
 
 /* Add workout button with submenu -------------------------------------------*/

ow/static/safari-pinned-tab.svg

@@ -10 +10 @@
 <g transform="translate(0.000000,500.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
-<path d="M2265 4929 c-632 -61 -1220 -365 -1631 -842 -791 -918 -791 -2266 0
--3184 845 -982 2319 -1137 3354 -353 228 173 405 361 562 597 608 915 533
-2107 -184 2940 -470 546 -1157 857 -1881 851 -77 0 -176 -4 -220 -9z m672
--1914 c147 -641 198 -887 247 -1170 l32 -190 18 110 c31 192 102 531 249 1190
-l142 640 338 3 c185 1 337 1 337 -1 0 -11 -632 -2551 -636 -2559 -3 -4 -189
--8 -414 -8 -380 0 -409 1 -414 18 -5 16 -237 1071 -322 1464 -21 97 -42 172
--45 165 -4 -7 -10 -34 -14 -62 -15 -105 -79 -410 -207 -983 l-132 -592 -410 0
--411 0 -314 1258 c-173 691 -316 1265 -319 1275 -4 16 17 17 330 17 l334 0
-167 -767 c170 -778 206 -952 228 -1100 7 -46 14 -82 15 -80 2 2 19 95 38 208
-52 302 112 582 255 1189 l128 545 59 6 c33 3 178 5 324 5 l265 -1 132 -580z"/>
+<path d="M2315 4914 c-496 -53 -893 -204 -1265 -480 -135 -100 -384 -349 -484
+-484 -245 -330 -402 -710 -463 -1119 -24 -160 -24 -512 0 -672 61 -409 218
+-789 463 -1119 100 -135 349 -384 484 -484 330 -245 710 -402 1119 -463 160
+-24 512 -24 672 0 409 61 789 218 1119 463 135 100 384 349 484 484 245 330
+402 710 463 1119 24 160 24 512 0 672 -61 409 -218 789 -463 1119 -100 135
+-349 384 -484 484 -328 243 -710 402 -1111 461 -101 15 -452 27 -534 19z
+m-128 -1229 c62 -270 83 -362 133 -575 77 -327 127 -560 152 -712 12 -76 23
+-136 25 -134 2 2 21 90 43 197 21 107 52 253 69 324 16 72 75 326 130 565 56
+239 103 445 106 458 l5 22 398 0 397 0 68 -257 c37 -142 175 -665 307 -1163
+132 -498 240 -911 240 -917 0 -10 -71 -13 -319 -13 -176 0 -322 3 -324 8 -3 4
+-30 120 -61 257 -32 138 -100 437 -153 665 -52 228 -115 510 -138 625 -24 116
+-46 203 -49 195 -3 -8 -30 -136 -60 -285 -64 -316 -73 -353 -131 -585 -42
+-167 -205 -855 -205 -865 0 -3 -141 -5 -313 -5 l-313 0 -138 572 c-120 500
+-231 1011 -251 1161 -7 51 -25 55 -25 6 0 -17 -18 -119 -39 -227 -47 -233 -89
+-414 -284 -1242 l-62 -265 -322 -3 -322 -2 14 47 c7 27 62 233 120 458 59 226
+119 457 134 515 16 58 99 378 186 713 l159 607 395 -2 396 -3 32 -140z"/>
 </g>
 </svg>

ow/templates/base.pt

@@ -63 +63 @@
               current user now -->
             <ul>
-              <li
+              <li class=""
                   tal:attributes="class 'is-active' if 'dashboard' in renderer_name else ''">
-                <a class="icon-dashboard" href="" i18n:translate=""
+                <a href="" i18n:translate=""
                    tal:attributes="href request.resource_url(request.root)">
-                  <span>Dashboard</span></a>
+                  Dashboard</a>
               </li>
-              <li
+              <li class=""
                   tal:attributes="class 'is-active' if 'profile' in renderer_name else ''">
-                <a class="icon-profile" href="" i18n:translate=""
+                <a href="" i18n:translate=""
                    tal:attributes="href request.resource_url(request.root, current_user, 'profile')">
-                  <span>My profile</span></a>
+                  My profile</a>
               </li>
               <li class="add-workout">
@@ -91 +91 @@
               </li>
               <li>
-                <a class="icon-logout" href="" i18n:translate=""
+                <a href="" i18n:translate=""
                    tal:attributes="href request.resource_url(request.root, 'logout')">
-                  <span>Log out</span>
+                  Log out
                 </a>
               </li>

ow/templates/base_anonymous.pt

@@ -15 +15 @@
     <meta name="author" content="The OpenWorkouts Project">
 
+    <link rel="shortcut icon"
+          href="${request.static_url('ow:static/pyramid-16x16.png')}">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="${request.static_url('ow:static/apple-touch-icon.png')}">
-    <link rel="icon" type="image/png" sizes="32x32" href="${request.static_url('ow:static/favicon-32x32.png')}">
-    <link rel="icon" type="image/png" sizes="16x16" href="${request.static_url('ow:static/favicon-16x16.png')}">
-    <link rel="manifest" href="${request.static_url('ow:static/site.webmanifest')}">
-    <link rel="mask-icon" href="${request.static_url('ow:static/safari-pinned-tab.svg')}" color="#5bbad5">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="theme-color" content="#ffffff">
+    <!--! This should be 182x182px-->
+    <link rel="apple-touch-icon"
+          href="${request.static_url('ow:static/pyramid-16x16.png')}">
 
     <title>OpenWorkouts - tracking your workouts openly</title>

ow/views/root.py

@@ -44 +44 @@
         'form': FormRenderer(form)
     }
-
-@view_config(
-    context=OpenWorkouts,
-    permission='view',
-    name='promo',
-    renderer='ow:templates/openworkouts.pt')
-def promo(context, request):
-    return {}
-