Changeset 978575d in OpenWorkouts-current

Timestamp:

Feb 6, 2019, 1:49:51 PM (5 years ago)

Author:

Segundo Fdez <segun.2@…>

Branches:

current, feature/docs, master

Children:

01674ff

Parents:

a3c3baa

Message:

update map on workout detail

Location:

ow

Files:

• static/css/leaflet-elevation.css (deleted)
• static/css/main.css (modified) (3 diffs)
• static/less/main.less (modified) (1 diff)
• static/less/modules/workout.less (modified) (1 diff)
• static/less/variables.less (modified) (1 diff)
• static/less/vendors/leaflet-elevation.less (added)
• templates/base.pt (modified) (1 diff)
• templates/workout.pt (modified) (1 diff)

ow/static/css/main.css

@@ -345 +345 @@
 [hidden] {
   display: none;
+}
+/* Leaflet-elevation openworkouts theme */
+/* background color */
+.openworkouts-theme.leaflet-control.elevation .background {
+  background-color: transparent;
+}
+/* Axis x and y*/
+.openworkouts-theme.leaflet-control.elevation .axis line,
+.openworkouts-theme.leaflet-control.elevation .axis path {
+  stroke: #959595;
+}
+/* selected drag area*/
+.openworkouts-theme.leaflet-control.elevation .mouse-drag {
+  fill: rgba(21, 21, 21, 0.1);
+}
+/* Icon to show when the chart is collapse */
+/*
+.openworkouts-theme.leaflet-control.elevation .elevation-toggle-icon {
+    background: url(images/elevation-steelblue.png) no-repeat center center;
+}
+*/
+/* Graph color area background */
+.openworkouts-theme.leaflet-control.elevation .area {
+  fill: #f8b5be;
+  stroke: transparent;
+}
+/* vertical line to know where are you */
+.openworkouts-theme.leaflet-control.elevation .mouse-focus-line {
+  stroke: #151515;
+}
+/* graph color line area */
+/*.leaflet-control.elevation .area {
+    fill: #f8b5be;
+}
+*/
+/* box with parameters */
+.mouse-focus-label {
+  opacity: 0.8;
+}
+.mouse-focus-label-text {
+  font-size: 13px;
+  font-size: 0.8125rem;
+  font-family: 'Open Sans', sans-serif;
+  font-weight: 100 !important;
+}
+/*.mouse-focus-label-y {}*/
+/* Color line on map */
+.leaflet-interactive {
+  stroke: #151515;
+  opacity: 0.6;
+  stroke-width: 6px;
+  stroke-linecap: round;
+}
+/* indicator on map line*/
+.openworkouts-theme.height-focus.line {
+  stroke: #151515;
+  display: none;
+  /*fill: #4682b4;*/
+}
+/* txt on map */
+.openworkouts-theme.height-focus-label {
+  display: none;
+}
+/* indicator on map circle */
+.openworkouts-theme.height-focus.circle-lower {
+  fill: #151515;
+  stroke: #EE4056;
+  stroke-width: 10px;
 }
 .hidden,
@@ -794 +862 @@
   color: #959595;
   margin-bottom: 0.25em;
+  /* color for future features */
 }
 .workout-detail-info ul span.min,
@@ -802 +871 @@
   padding: 0.5em 0.85em;
   border-radius: 3px;
-}
-.workout-detail-info ul span.max {
-  background-color: #EE4056;
-}
-.workout-detail-info ul span.min {
-  background-color: #1395CA;
-  margin-right: 0.5em;
-}
-.workout-detail-info ul span.avg {
-  background-color: #17C898;
-  margin-right: 0.5em;
+  background-color: #e1e1e1;
+  color: #959595;
 }
 .workout-detail-info li {
-  margin-bottom: 2em;
+  margin-bottom: 1em;
   margin-right: 1em;
   color: #959595;

ow/static/less/main.less

@@ -4 +4 @@
 // Normalize
 @import "vendors/normalize.less";
+@import "vendors/leaflet-elevation.less";
+
 
 // Variables

ow/static/less/modules/workout.less

@@ -256 +256 @@
                 padding: .5em .85em;
                 border-radius: 3px;
+                background-color: @color-main-light;
+                color: @color-main-medium;
             }
-            &.max {
-                background-color: @color-app;
-            }
-            &.min {
-                background-color: #1395CA;
-                margin-right: .5em;
-            }
-
-            &.avg {
-                background-color: #17C898;
-                margin-right: .5em;
-            }
+
+            /* color for future features */
+            // &.max {
+            //     background-color: @color-app;
+            // }
+            // &.min {
+            //     background-color: #1395CA;
+            //     margin-right: .5em;
+            // }
+
+            // &.avg {
+            //     background-color: #17C898;
+            //     margin-right: .5em;
+            // }
         }
     }
     li {
-        margin-bottom: 2em;
+        margin-bottom: 1em;
         margin-right: 1em;
         color: @color-main-medium;

ow/static/less/variables.less

@@ -9 +9 @@
 @color-app-medium: lighten(@color-app, 15%);
 @color-app-light: lighten(@color-app, 25%);
+
+@color-app-important: #F60002;
 
 

ow/templates/base.pt

@@ -32 +32 @@
     </title>
 
+    <metal:css metal:define-slot="css"></metal:css>
+
     <link rel="stylesheet"
           href="${request.static_url('ow:static/css/main.css')}" />
-
-    <link rel="stylesheet"
-          href="${request.static_url('ow:static/css/forms.css')}" />
-
-    <link rel="stylesheet"
-          href="${request.static_url('ow:static/css/openworkouts.css')}" />
-
-    <metal:css metal:define-slot="css"></metal:css>
 
     <metal:header-js metal:define-slot="header-js"></metal:header-js>

ow/templates/workout.pt

@@ -18 +18 @@
     <link rel="stylesheet" tal:condition="context.has_gpx"
           href="${request.static_url('ow:static/components/leaflet-elevation/leaflet-elevation.css')}" />
-    <link rel="stylesheet"
-          href="${request.static_url('ow:static/css/leaflet-elevation.css')}" />
   </metal:css>