Changeset 6993c72 in OpenWorkouts-current for ow/static/css/main.css

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/css/main.css (modified) (3 diffs)

ow/static/css/main.css

@@ -1006 +1006 @@
 <a class="login-remember" href="#">Forgot your password?</a>
 */
-.user-profile img {
+.user-profile .workout-options {
+  font-size: 13px;
+  font-size: 0.8125rem;
+}
+.user-profile-account {
+  background-color: #fbfbfb;
+  padding: 2em  1em;
+}
+@media (min-width: 480px) {
+  .user-profile-account {
+    padding: 2em 6em;
+  }
+}
+.user-profile-account img {
   width: 140px;
   height: 140px;
@@ -1013 +1026 @@
   margin-bottom: 0.5em;
 }
-.user-profile .workout-options {
-  font-size: 13px;
-  font-size: 0.8125rem;
-}
-.user-profile-account {
-  background-color: #fbfbfb;
-  padding: 2em  1em;
-}
-@media (min-width: 480px) {
-  .user-profile-account {
-    padding: 2em 6em;
-  }
-}
 .user-profile-account h2 {
   margin: 0 0 0.15em 0;
@@ -1040 +1040 @@
   color: #959595;
 }
-.user-profile-account .workouts {
-  font-size: 18px;
-  font-size: 1.125rem;
+.total-workouts {
+  font-size: 13px;
+  font-size: 0.8125rem;
   font-weight: bold;
 }