Changeset 6993c72 in OpenWorkouts-current for ow/static/less/pages/profile.less

Timestamp:

Feb 4, 2019, 1:10:40 PM (5 years ago)

Author:

Segundo Fdez <segun.2@…>

Branches:

current, feature/docs, master

Children:

d52ba50

Parents:

bf01534 (diff), 3357e47 (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 'master' into feature/ui

# Conflicts:
# ow/templates/profile.pt

File:

• ow/static/less/pages/profile.less (modified) (3 diffs)

ow/static/less/pages/profile.less

@@ -1 +1 @@
 .user-profile {
-    img {
-        width: 140px;
-        height: 140px;
-        object-fit: cover;
-        border-radius: 50%;
-        margin-bottom: .5em;
-    }
     .workout-options {
         .font-size(13);
@@ -17 +10 @@
     @media (min-width: @screen-s){
         padding: 2em 6em;
+    }
+    img {
+        width: 140px;
+        height: 140px;
+        object-fit: cover;
+        border-radius: 50%;
+        margin-bottom: .5em;
     }
         h2 {
@@ -30 +30 @@
                 }
         }
-        .workouts {
-                .font-size(18);
-                font-weight: bold;
-        }
+}
+.total-workouts {
+        .font-size(13);
+        font-weight: bold;
 }