Changeset 0fa21cd in OpenWorkouts-current

Timestamp:

Feb 15, 2019, 11:38:15 AM (5 years ago)

Author:

Segundo Fdez <segun.2@…>

Branches:

current, feature/docs, master

Children:

f556d1e

Parents:

f0e64eb (diff), 5cf7630 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'hotfix/#50'

Location:

ow/static

Files:

• css/main.css (modified) (10 diffs)
• less/modules/workout.less (modified) (5 diffs)
• less/pages/login.less (modified) (1 diff)
• less/pages/profile.less (modified) (2 diffs)

ow/static/css/main.css

@@ -855 +855 @@
 .workout-content {
   padding: 2em  1em;
+  display: flex;
+  flex-direction: column;
 }
 @media (min-width: 480px) {
@@ -864 +866 @@
   .workout-content {
     display: flex;
+    flex-direction: row;
     justify-content: space-between;
   }
@@ -871 +874 @@
   margin-right: 2em;
   width: 100%;
+  order: 2;
   /* provisional layout, replace this with grid layout system based on final content */
 }
@@ -876 +880 @@
   font-weight: 300;
   margin: 0 0 1.5em;
+}
+@media (min-width: 800px) {
+  .workout-list {
+    order: 1;
+  }
 }
 /* Module resume on dashboard workouts */
@@ -939 +948 @@
 .workout-info {
   display: flex;
-  align-items: center;
+  flex-flow: row wrap;
   margin: 0.25em 0;
 }
 .workout-info li {
   color: #959595;
+  margin-bottom: 0.25em;
 }
 .workout-info li:after {
@@ -998 +1008 @@
 .workout-aside {
   width: 100%;
+  order: 1;
 }
 @media (min-width: 800px) {
   .workout-aside {
+    order: 2;
     max-width: 300px;
     padding-left: 1.5em;
@@ -1028 +1040 @@
   font-size: 0.8125rem;
   color: #555555;
+}
+.aside-profile a {
+  text-decoration: none;
+  color: #151515;
+}
+.aside-profile a:hover {
+  color: #959595;
 }
 /* Workout detail */
@@ -1267 +1286 @@
 .login-content {
   background-image: url("../media/img/back-01.jpg");
+  background-position: center;
   background-size: cover;
   display: flex;
@@ -1342 +1362 @@
   }
 }
-.user-profile-account > div {
-  display: flex;
-  align-items: center;
+@media (min-width: 800px) {
+  .user-profile-account > div {
+    display: flex;
+    align-items: center;
+  }
 }
 .user-profile-account img {
-  width: 140px;
-  height: 140px;
+  width: 64px;
+  height: 64px;
   object-fit: cover;
   border-radius: 50%;
   margin-bottom: 0.5em;
   margin-right: 1em;
+}
+@media (min-width: 800px) {
+  .user-profile-account img {
+    width: 140px;
+    height: 140px;
+  }
 }
 .user-profile-account h2 {
@@ -1365 +1393 @@
   font-size: 0.875rem;
   margin: 0;
+}
+.user-profile-account p a {
+  color: #EE4056;
+  text-decoration: none;
+}
+.user-profile-account p a:hover {
+  color: #151515;
 }
 .user-profile-account p span {

ow/static/less/modules/workout.less

@@ -1 +1 @@
 .workout-content {
     padding: 2em  1em;
+    display: flex;
+    flex-direction: column;
     @media (min-width: @screen-s){
         padding: 2em 6em;
     }
-     @media (min-width: @screen-m){
+    @media (min-width: @screen-m){
         display: flex;
+        flex-direction: row;
         justify-content:space-between;
     }
@@ -17 +20 @@
         font-weight: 300;
         margin: 0 0 1.5em;
+    }
+    order: 2;
+    @media (min-width: @screen-m){
+        order: 1;
     }
     /* provisional layout, replace this with grid layout system based on final content */
@@ -87 +94 @@
 .workout-info {
     display: flex;
-    align-items:center;
+    flex-flow: row wrap;
+    //align-items:center;
     margin: .25em 0;
     li{
         color: @color-main-medium;
+        margin-bottom: .25em;
         &:after{
             content: "|";
-            margin:0 .5em;
+            margin: 0 .5em;
         }
         &:last-child{
@@ -156 +165 @@
 .workout-aside{
     width: 100%;
-    @media (min-width: @screen-m){
+    order: 1;
+    @media (min-width: @screen-m){
+        order: 2;
         max-width: 300px;
         padding-left: 1.5em;
@@ -184 +195 @@
         .font-size(13);
         color: @color-main-dark;
+    }
+    a {
+        text-decoration: none;
+        color: @color-main;
+        &:hover {
+            color: @color-main-medium;
+        }
     }
 }

ow/static/less/pages/login.less

@@ -1 +1 @@
 .login-content {
     background-image: url("@{path-img}/back-01.jpg");
+    background-position: center;
     background-size: cover;
     display: flex;

ow/static/less/pages/profile.less

@@ -14 +14 @@
     }
     >div {
-        display: flex;
-        align-items: center;
+            @media (min-width: @screen-m){
+                display: flex;
+                align-items: center;
+            }
     }
     img {
-        width: 140px;
-        height: 140px;
+        width: 64px;
+        height: 64px;
         object-fit: cover;
         border-radius: 50%;
         margin-bottom: .5em;
         margin-right: 1em;
+            @media (min-width: @screen-m){
+                width: 140px;
+                height: 140px;
+            }
     }
         h2 {
@@ -34 +40 @@
                 .font-size(14);
                 margin: 0;
+                a {
+                        color: @color-app;
+                        text-decoration: none;
+                        &:hover {
+                                color: @color-main;
+                        }
+                }
                 span {
                         color: @color-main-medium;