Changeset 0b6c6fc in OpenWorkouts-current for ow/static

Timestamp:

Feb 6, 2019, 11:57:10 AM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

eed2019

Parents:

ded7d95 (diff), cf12619 (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 'feature/ui'

Location:

ow/static

Files:

• css/main.css (modified) (6 diffs)
• less/modules/workout.less (modified) (1 diff)
• less/pages/profile.less (modified) (4 diffs)

ow/static/css/main.css

@@ -663 +663 @@
   border-radius: 4px;
   padding: 0;
+  width: auto;
+  background-color: white;
 }
 .workout-options li {
@@ -1009 +1011 @@
   font-size: 13px;
   font-size: 0.8125rem;
+  margin-right: 2em;
 }
 .user-profile-account {
   background-color: #fbfbfb;
+  border-bottom: 1px solid #e1e1e1;
   padding: 2em  1em;
 }
@@ -1018 +1022 @@
     padding: 2em 6em;
   }
+}
+.user-profile-account > div {
+  display: flex;
+  align-items: center;
 }
 .user-profile-account img {
@@ -1025 +1033 @@
   border-radius: 50%;
   margin-bottom: 0.5em;
+  margin-right: 1em;
 }
 .user-profile-account h2 {
@@ -1030 +1039 @@
   font-size: 21px;
   font-size: 1.3125rem;
+  font-weight: 400;
 }
 .user-profile-account p {
@@ -1050 +1060 @@
   font-size: 14px;
   font-size: 0.875rem;
+  background-color: white;
+  padding: 0.5em 0.75em;
+  border-radius: 4px;
+  border: 1px solid #e1e1e1;
 }
 .profile-data li {
-  margin-bottom: 0.25em;
+  display: flex;
+  justify-content: space-between;
+  color: #959595;
+}
+.profile-data li:not(:last-child) {
+  margin-bottom: 0.5em;
+  padding-bottom: 0.5em;
+  border-bottom: 1px solid #e1e1e1;
+}
+.profile-data li span {
+  font-weight: bold;
+  color: #151515;
 }
 .profile-bio {
-  margin: 1em 0;
+  margin: 0.5em 0;
+  font-size: 14px;
+  font-size: 0.875rem;
 }
 .month-stats,
 .latest-workouts {
-  max-width: 40vw;
-  margin: 0 auto;
+  max-width: 700px;
+}
+.center {
+  text-align: center;
+}
+.month-stats {
+  margin-bottom: 4em;
 }
 .latest-workouts h4 {

ow/static/less/modules/workout.less

@@ -122 +122 @@
     border-radius: 4px;
     padding: 0;
+    width: auto;
+    background-color: white;
     li{
         display: inline-block;

ow/static/less/pages/profile.less

@@ -2 +2 @@
     .workout-options {
         .font-size(13);
+                margin-right: 2em;
     }
 }
@@ -7 +8 @@
 .user-profile-account {
         background-color: @color-main-xtralight;
+        border-bottom: 1px solid @color-main-light;
     padding: 2em  1em;
     @media (min-width: @screen-s){
         padding: 2em 6em;
+    }
+    >div {
+        display: flex;
+        align-items: center;
     }
     img {
@@ -17 +23 @@
         border-radius: 50%;
         margin-bottom: .5em;
+        margin-right: 1em;
     }
         h2 {
                 margin: 0 0 .15em 0;
                 .font-size(21);
+                font-weight: 400;
         }
         p{
@@ -40 +48 @@
         padding: 0;
         .font-size(14);
+        background-color: white;
+        padding: .5em .75em;
+        border-radius: 4px;
+        border: 1px solid @color-main-light;
         li {
-                margin-bottom: .25em;
+                display: flex;
+                justify-content: space-between;
+                color: @color-main-medium;
+                &:not(:last-child) {
+                        margin-bottom: .5em;
+                        padding-bottom: .5em;
+                        border-bottom: 1px solid @color-main-light;
+                }
+                span {
+                        font-weight: bold;
+                        color: @color-main;
+                }
         }
 }
 
 .profile-bio {
-        margin: 1em 0;
+        margin: .5em 0;
+        .font-size(14);
 }
 
 .month-stats,
 .latest-workouts {
-        max-width: 40vw;
-        margin: 0 auto;
+        max-width: 700px
+}
+
+.center {
+        text-align: center;
+}
+
+.month-stats {
+        margin-bottom: 4em;
 }