Changeset 0fa21cd in OpenWorkouts-current for ow/static/css/main.css
- Timestamp:
- Feb 15, 2019, 11:38:15 AM (5 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ow/static/css/main.css
rf0e64eb r0fa21cd 855 855 .workout-content { 856 856 padding: 2em 1em; 857 display: flex; 858 flex-direction: column; 857 859 } 858 860 @media (min-width: 480px) { … … 864 866 .workout-content { 865 867 display: flex; 868 flex-direction: row; 866 869 justify-content: space-between; 867 870 } … … 871 874 margin-right: 2em; 872 875 width: 100%; 876 order: 2; 873 877 /* provisional layout, replace this with grid layout system based on final content */ 874 878 } … … 876 880 font-weight: 300; 877 881 margin: 0 0 1.5em; 882 } 883 @media (min-width: 800px) { 884 .workout-list { 885 order: 1; 886 } 878 887 } 879 888 /* Module resume on dashboard workouts */ … … 939 948 .workout-info { 940 949 display: flex; 941 align-items: center;950 flex-flow: row wrap; 942 951 margin: 0.25em 0; 943 952 } 944 953 .workout-info li { 945 954 color: #959595; 955 margin-bottom: 0.25em; 946 956 } 947 957 .workout-info li:after { … … 998 1008 .workout-aside { 999 1009 width: 100%; 1010 order: 1; 1000 1011 } 1001 1012 @media (min-width: 800px) { 1002 1013 .workout-aside { 1014 order: 2; 1003 1015 max-width: 300px; 1004 1016 padding-left: 1.5em; … … 1028 1040 font-size: 0.8125rem; 1029 1041 color: #555555; 1042 } 1043 .aside-profile a { 1044 text-decoration: none; 1045 color: #151515; 1046 } 1047 .aside-profile a:hover { 1048 color: #959595; 1030 1049 } 1031 1050 /* Workout detail */ … … 1267 1286 .login-content { 1268 1287 background-image: url("../media/img/back-01.jpg"); 1288 background-position: center; 1269 1289 background-size: cover; 1270 1290 display: flex; … … 1342 1362 } 1343 1363 } 1344 .user-profile-account > div { 1345 display: flex; 1346 align-items: center; 1364 @media (min-width: 800px) { 1365 .user-profile-account > div { 1366 display: flex; 1367 align-items: center; 1368 } 1347 1369 } 1348 1370 .user-profile-account img { 1349 width: 140px;1350 height: 140px;1371 width: 64px; 1372 height: 64px; 1351 1373 object-fit: cover; 1352 1374 border-radius: 50%; 1353 1375 margin-bottom: 0.5em; 1354 1376 margin-right: 1em; 1377 } 1378 @media (min-width: 800px) { 1379 .user-profile-account img { 1380 width: 140px; 1381 height: 140px; 1382 } 1355 1383 } 1356 1384 .user-profile-account h2 { … … 1365 1393 font-size: 0.875rem; 1366 1394 margin: 0; 1395 } 1396 .user-profile-account p a { 1397 color: #EE4056; 1398 text-decoration: none; 1399 } 1400 .user-profile-account p a:hover { 1401 color: #151515; 1367 1402 } 1368 1403 .user-profile-account p span {
Note: See TracChangeset
for help on using the changeset viewer.