diff --git a/app/assets/fonts/icons/icons.eot b/app/assets/fonts/icons/icons.eot index 43425d5..0c54d29 100755 Binary files a/app/assets/fonts/icons/icons.eot and b/app/assets/fonts/icons/icons.eot differ diff --git a/app/assets/fonts/icons/icons.svg b/app/assets/fonts/icons/icons.svg index 088b6d9..a11605f 100755 --- a/app/assets/fonts/icons/icons.svg +++ b/app/assets/fonts/icons/icons.svg @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/app/assets/fonts/icons/icons.ttf b/app/assets/fonts/icons/icons.ttf index 48b44f2..b11289d 100755 Binary files a/app/assets/fonts/icons/icons.ttf and b/app/assets/fonts/icons/icons.ttf differ diff --git a/app/assets/fonts/icons/icons.woff b/app/assets/fonts/icons/icons.woff index cdd99dd..0f72152 100755 Binary files a/app/assets/fonts/icons/icons.woff and b/app/assets/fonts/icons/icons.woff differ diff --git a/app/assets/fonts/icons/icons.woff2 b/app/assets/fonts/icons/icons.woff2 old mode 100755 new mode 100644 index 529fc35..00a71ac Binary files a/app/assets/fonts/icons/icons.woff2 and b/app/assets/fonts/icons/icons.woff2 differ diff --git a/app/assets/fonts/icons/selection.json b/app/assets/fonts/icons/selection.json index 99d0161..e772be1 100755 --- a/app/assets/fonts/icons/selection.json +++ b/app/assets/fonts/icons/selection.json @@ -1,6 +1,64 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M967.111 170.667h-170.667v-56.889c0-31.417-25.472-56.889-56.889-56.889h-455.111c-31.417 0-56.889 25.472-56.889 56.889v56.889h-170.667c-31.417 0-56.889 25.472-56.889 56.889v113.778c0 91.445 60.612 227.556 227.556 227.556h23.833c36.555 83.636 112.114 146.334 203.723 164.958v119.486h-56.889c-62.834 0-113.778 50.944-113.778 113.778h455.111c0-62.834-50.944-113.778-113.778-113.778h-56.889v-119.486c91.607-18.624 167.166-81.323 203.723-164.958h23.833c166.944 0 227.556-136.11 227.556-227.556v-113.778c0-31.417-25.472-56.889-56.889-56.889zM227.556 455.111c-103.89 0-113.333-87.388-113.778-113.778v-56.889h113.778v170.667zM682.667 490.612l-14.306 32.695c-27.221 62.249-88.583 102.471-156.361 102.471s-129.166-40.222-156.361-102.473l-14.306-32.693v-319.945h341.333v319.945zM910.222 341.333c0 19.001-5.5 113.778-113.778 113.778v-170.667h113.778v56.889z", + "M797.723 570.139c0.86 0 0.972-0.306-1.278-1.25v1.111c0.473 0.084 0.944 0.139 1.278 0.139z", + "M226.277 570.139c0.334 0 0.805-0.055 1.278-0.139v-1.111c-2.251 0.944-2.139 1.25-1.278 1.25z" + ], + "attrs": [ + {}, + {}, + {} + ], + "isMulticolor": false, + "tags": [ + "trophy" + ], + "grid": 18 + }, + "attrs": [ + {}, + {}, + {} + ], + "properties": { + "id": 37, + "order": 79, + "prevSize": 18, + "code": 59648, + "name": "trophy" + }, + "setIdx": 0, + "setId": 4, + "iconIdx": 36 + }, + { + "icon": { + "paths": [ + "M615.893 553.515c11.477 0 20.992 5.675 29.269 16.896 8.192 11.307 12.544 25.088 12.544 41.6 0 16.427-4.352 30.336-12.544 41.515-8.235 11.307-17.792 16.896-29.269 16.896-11.861 0-22.272-5.589-30.507-16.896-8.192-11.179-12.544-25.088-12.544-41.515 0-16.512 4.352-30.293 12.544-41.6 8.192-11.264 18.603-16.896 30.507-16.896M762.667 401.664c31.829 34.603 48 76.587 48 125.995 0 31.915-3.669 60.715-11.051 86.315-7.467 25.472-16.811 46.251-27.904 62.251-11.264 16.043-25.088 30.080-41.557 42.197-16.469 12.203-31.616 20.992-45.44 26.581-13.867 5.632-29.653 9.941-47.403 13.056-17.792 3.029-30.976 4.736-40.235 5.248-9.088 0.384-18.688 0.597-29.227 0.597-2.347 0-10.368 0.171-23.339 0.64-12.843 0.555-23.893 0.683-32.512 0.683s-19.669-0.128-32.512-0.683c-12.971-0.469-20.992-0.64-23.339-0.64-10.496 0-20.139-0.213-29.227-0.597-9.301-0.512-22.443-2.219-40.235-5.248-18.048-3.072-33.536-7.424-47.403-13.056-13.824-5.589-29.013-14.379-45.397-26.581-16.512-12.117-30.336-26.155-41.6-42.197-11.136-16-20.437-36.779-27.904-62.251-7.381-25.6-11.051-54.4-11.051-86.315 0-49.408 16.171-91.435 48-125.995-3.499-1.749-3.627-19.072-0.341-51.925 2.688-32.896 9.685-63.232 21.12-90.965 39.851 4.224 89.173 26.837 148.096 67.456 19.883-5.077 46.976-7.808 81.792-7.808 36.352 0 63.616 2.731 81.835 7.851 26.837-18.133 52.48-32.896 77.013-44.117 24.917-11.136 42.88-17.749 54.144-19.499l16.896-3.84c11.52 27.691 18.517 58.027 21.163 90.965 3.243 32.811 3.115 50.133-0.384 51.883M513.28 735.317c72.021 0 126.037-8.619 163.029-25.899 36.48-17.237 55.125-52.821 55.125-106.496 0-31.147-11.648-57.173-35.072-77.995-11.861-11.221-26.155-18.133-42.197-20.736-16-2.603-40.491-2.603-73.387 0-32.811 2.645-55.381 3.84-67.499 3.84-16.427 0-34.133-0.768-56.277-2.517-22.187-1.707-39.595-2.773-52.181-3.328-12.544-0.384-25.984 1.152-40.875 4.608-14.72 3.499-26.837 9.557-36.395 18.133-22.229 20.011-33.707 45.952-33.707 77.995 0 53.675 18.176 89.259 54.613 106.496 36.267 17.28 90.155 25.899 162.219 25.899h2.603M409.429 553.515c11.435 0 20.992 5.675 29.227 16.896 8.192 11.307 12.544 25.088 12.544 41.6 0 16.427-4.352 30.336-12.544 41.515-8.192 11.307-17.792 16.896-29.227 16.896-11.904 0-22.272-5.589-30.549-16.896-8.192-11.179-12.544-25.088-12.544-41.515 0-16.512 4.352-30.293 12.544-41.6 8.235-11.264 18.603-16.896 30.549-16.896" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "social-github" + ], + "grid": 24 + }, + "attrs": [], + "properties": { + "id": 111, + "order": 78, + "prevSize": 24, + "name": "social-github", + "code": 59649 + }, + "setIdx": 1, + "setId": 3, + "iconIdx": 110 + }, { "icon": { "paths": [ @@ -22,7 +80,7 @@ "code": 57349, "name": "link" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 5 }, @@ -47,7 +105,7 @@ "code": 57350, "name": "bell" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 6 }, @@ -72,7 +130,7 @@ "code": 57351, "name": "lock" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 7 }, @@ -97,7 +155,7 @@ "code": 57352, "name": "unlock" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 8 }, @@ -122,7 +180,7 @@ "code": 57360, "name": "image" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 10 }, @@ -147,7 +205,7 @@ "code": 57364, "name": "clock" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 14 }, @@ -172,7 +230,7 @@ "code": 57365, "name": "watch" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 15 }, @@ -197,7 +255,7 @@ "code": 57379, "name": "cog" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 23 }, @@ -222,7 +280,7 @@ "code": 57380, "name": "heart" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 24 }, @@ -247,7 +305,7 @@ "code": 57401, "name": "reply" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 39 }, @@ -272,7 +330,7 @@ "code": 57408, "name": "circle-plus" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 40 }, @@ -297,7 +355,7 @@ "code": 57409, "name": "circle-minus" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 41 }, @@ -322,7 +380,7 @@ "code": 57412, "name": "square-plus" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 44 }, @@ -347,7 +405,7 @@ "code": 57413, "name": "square-minus" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 45 }, @@ -372,7 +430,7 @@ "code": 57414, "name": "square-check" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 46 }, @@ -397,7 +455,7 @@ "code": 57415, "name": "square-cross" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 47 }, @@ -422,7 +480,7 @@ "code": 57424, "name": "skip-back" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 50 }, @@ -447,7 +505,7 @@ "code": 57425, "name": "rewind" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 51 }, @@ -472,7 +530,7 @@ "code": 57429, "name": "fast-forward" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 55 }, @@ -497,7 +555,7 @@ "code": 57430, "name": "skip-forward" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 56 }, @@ -522,7 +580,7 @@ "code": 57432, "name": "repeat" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 58 }, @@ -547,7 +605,7 @@ "code": 57440, "name": "umbrella" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 60 }, @@ -572,7 +630,7 @@ "code": 57441, "name": "moon" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 61 }, @@ -597,7 +655,7 @@ "code": 57442, "name": "thermometer" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 62 }, @@ -622,7 +680,7 @@ "code": 57443, "name": "drop" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 63 }, @@ -647,7 +705,7 @@ "code": 57444, "name": "sun" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 64 }, @@ -672,7 +730,7 @@ "code": 57445, "name": "cloud" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 65 }, @@ -697,7 +755,7 @@ "code": 57456, "name": "location" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 70 }, @@ -722,7 +780,7 @@ "code": 57457, "name": "location-2" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 71 }, @@ -747,7 +805,7 @@ "code": 57458, "name": "map" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 72 }, @@ -772,7 +830,7 @@ "code": 57460, "name": "head" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 74 }, @@ -797,7 +855,7 @@ "code": 57472, "name": "reload" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 80 }, @@ -822,7 +880,7 @@ "code": 57473, "name": "share" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 81 }, @@ -847,7 +905,7 @@ "code": 57491, "name": "star" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 93 }, @@ -872,7 +930,7 @@ "code": 57492, "name": "arrow-left" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 94 }, @@ -897,7 +955,7 @@ "code": 57493, "name": "arrow-right" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 95 }, @@ -922,7 +980,7 @@ "code": 57494, "name": "arrow-up" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 96 }, @@ -947,10 +1005,35 @@ "code": 57495, "name": "arrow-down" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 97 }, + { + "icon": { + "paths": [ + "M693.333 650.333q17.333 0 30 12.667l120.667 120.667q12.667 12.667 12.667 30.333 0 17.333-12.667 30t-30 12.667q-17.667 0-30.333-12.667l-120.667-120.667q-12.333-12.333-12.333-30.333 0-17.667 12.5-30.167t30.167-12.5zM331 650.333q17.667 0 30.167 12.5t12.5 30.167-12.667 30.333l-120.667 120.667q-12.667 12.667-30 12.667-17.667 0-30.167-12.5t-12.5-30.167q0-18 12.333-30.333l120.667-120.667q12.667-12.667 30.333-12.667zM85.333 469.333h170.667q17.667 0 30.167 12.5t12.5 30.167-12.5 30.167-30.167 12.5h-170.667q-17.667 0-30.167-12.5t-12.5-30.167 12.5-30.167 30.167-12.5zM512 725.333q17.667 0 30.167 12.5t12.5 30.167v170.667q0 17.667-12.5 30.167t-30.167 12.5-30.167-12.5-12.5-30.167v-170.667q0-17.667 12.5-30.167t30.167-12.5zM210.333 167.333q17.333 0 30 12.667l120.667 120.667q12.667 12.667 12.667 30 0 17.667-12.5 30.167t-30.167 12.5q-18 0-30.333-12.333l-120.667-120.667q-12.333-12.333-12.333-30.333 0-17.667 12.5-30.167t30.167-12.5zM768 469.333h170.667q17.667 0 30.167 12.5t12.5 30.167-12.5 30.167-30.167 12.5h-170.667q-17.667 0-30.167-12.5t-12.5-30.167 12.5-30.167 30.167-12.5zM512 42.667q17.667 0 30.167 12.5t12.5 30.167v170.667q0 17.667-12.5 30.167t-30.167 12.5-30.167-12.5-12.5-30.167v-170.667q0-17.667 12.5-30.167t30.167-12.5zM814 167.333q17.333 0 30 12.667t12.667 30q0 17.667-12.667 30.333l-120.667 120.667q-12.333 12.333-30 12.333-18.333 0-30.5-12.167t-12.167-30.5q0-17.667 12.333-30l120.667-120.667q12.667-12.667 30.333-12.667z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "loader" + ], + "defaultCode": 57605, + "grid": 24 + }, + "attrs": [], + "properties": { + "id": 106, + "order": 76, + "prevSize": 24, + "name": "loader", + "code": 57605 + }, + "setIdx": 2, + "setId": 2, + "iconIdx": 105 + }, { "icon": { "paths": [ @@ -972,10 +1055,110 @@ "code": 57609, "name": "trash" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 109 }, + { + "icon": { + "paths": [ + "M512 85.333q17.667 0 30.167 12.5t12.5 30.167v341.333h341.333q17.667 0 30.167 12.5t12.5 30.167-12.5 30.167-30.167 12.5h-341.333v341.333q0 17.667-12.5 30.167t-30.167 12.5-30.167-12.5-12.5-30.167v-341.333h-341.333q-17.667 0-30.167-12.5t-12.5-30.167 12.5-30.167 30.167-12.5h341.333v-341.333q0-17.667 12.5-30.167t30.167-12.5z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "plus" + ], + "defaultCode": 57620, + "grid": 24 + }, + "attrs": [], + "properties": { + "id": 115, + "order": 74, + "prevSize": 24, + "name": "plus", + "code": 57620 + }, + "setIdx": 2, + "setId": 2, + "iconIdx": 114 + }, + { + "icon": { + "paths": [ + "M128 469.333h768q17.667 0 30.167 12.5t12.5 30.167-12.5 30.167-30.167 12.5h-768q-17.667 0-30.167-12.5t-12.5-30.167 12.5-30.167 30.167-12.5z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "minus" + ], + "defaultCode": 57621, + "grid": 24 + }, + "attrs": [], + "properties": { + "id": 116, + "order": 75, + "prevSize": 24, + "name": "minus", + "code": 57621 + }, + "setIdx": 2, + "setId": 2, + "iconIdx": 115 + }, + { + "icon": { + "paths": [ + "M896 213.333q18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-512 512q-12.333 12.333-30.333 12.333t-30.333-12.333l-256-256q-12.333-12.333-12.333-30.333 0-18.333 12.167-30.5t30.5-12.167q18 0 30.333 12.333l225.667 226 481.667-482q12.333-12.333 30.333-12.333z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "check" + ], + "defaultCode": 57622, + "grid": 24 + }, + "attrs": [], + "properties": { + "id": 117, + "order": 72, + "prevSize": 24, + "name": "check", + "code": 57622 + }, + "setIdx": 2, + "setId": 2, + "iconIdx": 116 + }, + { + "icon": { + "paths": [ + "M810.667 170.667q18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-268.667 268.333 268.667 268.333q12.333 12.333 12.333 30.333 0 18.333-12.167 30.5t-30.5 12.167q-18 0-30.333-12.333l-268.333-268.667-268.333 268.667q-12.333 12.333-30.333 12.333-18.333 0-30.5-12.167t-12.167-30.5q0-18 12.333-30.333l268.667-268.333-268.667-268.333q-12.333-12.333-12.333-30.333 0-18.333 12.167-30.5t30.5-12.167q18 0 30.333 12.333l268.333 268.667 268.333-268.667q12.333-12.333 30.333-12.333z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "cross" + ], + "defaultCode": 57623, + "grid": 24 + }, + "attrs": [], + "properties": { + "id": 118, + "order": 73, + "prevSize": 24, + "name": "cross", + "code": 57623 + }, + "setIdx": 2, + "setId": 2, + "iconIdx": 117 + }, { "icon": { "paths": [ @@ -997,14 +1180,14 @@ "code": 57641, "name": "ellipsis" }, - "setIdx": 0, + "setIdx": 2, "setId": 2, "iconIdx": 129 } ], "height": 1024, "metadata": { - "name": "icomoon" + "name": "icons" }, "preferences": { "showGlyphs": true, @@ -1015,21 +1198,31 @@ "fontPref": { "prefix": "icon-", "metadata": { - "fontFamily": "icomoon" + "fontFamily": "icons", + "majorVersion": 1, + "minorVersion": 0 }, "metrics": { "emSize": 1024, "baseline": 6.25, "whitespace": 50 }, - "embed": false + "embed": false, + "ie7": true, + "noie8": false, + "cssVars": true, + "showSelector": true, + "showMetrics": true, + "showMetadata": false, + "showVersion": true }, "imagePref": { "prefix": "icon-", "png": true, "useClassSelector": true, "color": 0, - "bgColor": 16777215 + "bgColor": 16777215, + "classSelector": ".icon" }, "historySize": 100 } diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 49f5460..430e646 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -59,7 +59,7 @@ body { .footer { font-size: 0.4em; font-weight: 700; - margin-top: $base-spacing; + margin-top: 3em; opacity: 0.3; text-align: center; transition: opacity $base-duration $base-timing; @@ -67,6 +67,11 @@ body { &:hover { opacity: 0.7; } + + .icon-social-github { + font-size: 150%; + vertical-align: text-top; + } } .github-ribbon { diff --git a/app/assets/stylesheets/base/_icons.scss b/app/assets/stylesheets/base/_icons.scss index aa7b86c..ac21f88 100644 --- a/app/assets/stylesheets/base/_icons.scss +++ b/app/assets/stylesheets/base/_icons.scss @@ -14,163 +14,333 @@ -moz-osx-font-smoothing: grayscale; } +$icon-trophy: "\e900"; +$icon-social-github: "\e901"; +$icon-link: "\e005"; +$icon-bell: "\e006"; +$icon-lock: "\e007"; +$icon-unlock: "\e008"; +$icon-image: "\e010"; +$icon-clock: "\e014"; +$icon-watch: "\e015"; +$icon-cog: "\e023"; +$icon-heart: "\e024"; +$icon-reply: "\e039"; +$icon-circle-plus: "\e040"; +$icon-circle-minus: "\e041"; +$icon-square-plus: "\e044"; +$icon-square-minus: "\e045"; +$icon-square-check: "\e046"; +$icon-square-cross: "\e047"; +$icon-skip-back: "\e050"; +$icon-rewind: "\e051"; +$icon-fast-forward: "\e055"; +$icon-skip-forward: "\e056"; +$icon-repeat: "\e058"; +$icon-umbrella: "\e060"; +$icon-moon: "\e061"; +$icon-thermometer: "\e062"; +$icon-drop: "\e063"; +$icon-sun: "\e064"; +$icon-cloud: "\e065"; +$icon-location: "\e070"; +$icon-location-2: "\e071"; +$icon-map: "\e072"; +$icon-head: "\e074"; +$icon-reload: "\e080"; +$icon-share: "\e081"; +$icon-star: "\e093"; +$icon-arrow-left: "\e094"; +$icon-arrow-right: "\e095"; +$icon-arrow-up: "\e096"; +$icon-arrow-down: "\e097"; +$icon-loader: "\e105"; +$icon-trash: "\e109"; +$icon-plus: "\e114"; +$icon-minus: "\e115"; +$icon-check: "\e116"; +$icon-cross: "\e117"; +$icon-ellipsis: "\e129"; + +.icon-trophy { + &::before { + content: $icon-trophy; + } +} + +.icon-social-github { + &::before { + content: $icon-social-github; + } +} + +.icon-link { + &::before { + content: $icon-link; + } +} + +.icon-bell { + &::before { + content: $icon-bell; + } +} + +.icon-lock { + &::before { + content: $icon-lock; + } +} + +.icon-unlock { + &::before { + content: $icon-unlock; + } +} + +.icon-image { + &::before { + content: $icon-image; + } +} -.icon-link::before { - content: '\e005'; +.icon-clock { + &::before { + content: $icon-clock; + } } -.icon-bell::before { - content: '\e006'; +.icon-watch { + &::before { + content: $icon-watch; + } } -.icon-lock::before { - content: '\e007'; +.icon-cog { + &::before { + content: $icon-cog; + } } -.icon-unlock::before { - content: '\e008'; +.icon-heart { + &::before { + content: $icon-heart; + } } -.icon-image::before { - content: '\e010'; +.icon-reply { + &::before { + content: $icon-reply; + } } -.icon-clock::before { - content: '\e014'; +.icon-circle-plus { + &::before { + content: $icon-circle-plus; + } } -.icon-watch::before { - content: '\e015'; +.icon-circle-minus { + &::before { + content: $icon-circle-minus; + } } -.icon-cog::before { - content: '\e023'; +.icon-square-plus { + &::before { + content: $icon-square-plus; + } } -.icon-heart::before { - content: '\e024'; +.icon-square-minus { + &::before { + content: $icon-square-minus; + } } -.icon-reply::before { - content: '\e039'; +.icon-square-check { + &::before { + content: $icon-square-check; + } } -.icon-circle-plus::before { - content: '\e040'; +.icon-square-cross { + &::before { + content: $icon-square-cross; + } } -.icon-circle-minus::before { - content: '\e041'; +.icon-skip-back { + &::before { + content: $icon-skip-back; + } } -.icon-square-plus::before { - content: '\e044'; +.icon-rewind { + &::before { + content: $icon-rewind; + } } -.icon-square-minus::before { - content: '\e045'; +.icon-fast-forward { + &::before { + content: $icon-fast-forward; + } } -.icon-square-check::before { - content: '\e046'; +.icon-skip-forward { + &::before { + content: $icon-skip-forward; + } } -.icon-square-cross::before { - content: '\e047'; +.icon-repeat { + &::before { + content: $icon-repeat; + } } -.icon-skip-back::before { - content: '\e050'; +.icon-umbrella { + &::before { + content: $icon-umbrella; + } } -.icon-rewind::before { - content: '\e051'; +.icon-moon { + &::before { + content: $icon-moon; + } } -.icon-fast-forward::before { - content: '\e055'; +.icon-thermometer { + &::before { + content: $icon-thermometer; + } } -.icon-skip-forward::before { - content: '\e056'; +.icon-drop { + &::before { + content: $icon-drop; + } } -.icon-repeat::before { - content: '\e058'; +.icon-sun { + &::before { + content: $icon-sun; + } } -.icon-umbrella::before { - content: '\e060'; +.icon-cloud { + &::before { + content: $icon-cloud; + } } -.icon-moon::before { - content: '\e061'; +.icon-location { + &::before { + content: $icon-location; + } } -.icon-thermometer::before { - content: '\e062'; +.icon-location-2 { + &::before { + content: $icon-location-2; + } } -.icon-drop::before { - content: '\e063'; +.icon-map { + &::before { + content: $icon-map; + } } -.icon-sun::before { - content: '\e064'; +.icon-head { + &::before { + content: $icon-head; + } } -.icon-cloud::before { - content: '\e065'; +.icon-reload { + &::before { + content: $icon-reload; + } } -.icon-location::before { - content: '\e070'; +.icon-share { + &::before { + content: $icon-share; + } } -.icon-location-2::before { - content: '\e071'; +.icon-star { + &::before { + content: $icon-star; + } } -.icon-map::before { - content: '\e072'; +.icon-arrow-left { + &::before { + content: $icon-arrow-left; + } } -.icon-head::before { - content: '\e074'; +.icon-arrow-right { + &::before { + content: $icon-arrow-right; + } } -.icon-reload::before { - content: '\e080'; +.icon-arrow-up { + &::before { + content: $icon-arrow-up; + } } -.icon-share::before { - content: '\e081'; +.icon-arrow-down { + &::before { + content: $icon-arrow-down; + } } -.icon-star::before { - content: '\e093'; +.icon-loader { + &::before { + content: $icon-loader; + } } -.icon-arrow-left::before { - content: '\e094'; +.icon-trash { + &::before { + content: $icon-trash; + } } -.icon-arrow-right::before { - content: '\e095'; +.icon-plus { + &::before { + content: $icon-plus; + } } -.icon-arrow-up::before { - content: '\e096'; +.icon-minus { + &::before { + content: $icon-minus; + } } -.icon-arrow-down::before { - content: '\e097'; +.icon-check { + &::before { + content: $icon-check; + } } -.icon-trash::before { - content: '\e109'; +.icon-cross { + &::before { + content: $icon-cross; + } } -.icon-ellipsis::before { - content: '\e129'; +.icon-ellipsis { + &::before { + content: $icon-ellipsis; + } } + diff --git a/app/assets/stylesheets/base/_variables.scss b/app/assets/stylesheets/base/_variables.scss index fba6e99..e0c908d 100644 --- a/app/assets/stylesheets/base/_variables.scss +++ b/app/assets/stylesheets/base/_variables.scss @@ -4,7 +4,7 @@ $heading-font-family: $base-font-family; // Font Sizes // $base-font-size: 1em; -$base-font-size: 5vw; +$base-font-size: 4vw; // Line height $base-line-height: 1.2; @@ -44,5 +44,5 @@ $form-box-shadow: inset 0 1px 3px rgba($black, .06); $form-box-shadow-focus: $form-box-shadow, 0 0 5px adjust-color($action-color, $lightness: -5%, $alpha: -.3); // Animations -$base-duration: 150ms; +$base-duration: 250ms; $base-timing: ease; diff --git a/app/assets/stylesheets/components/_stats.scss b/app/assets/stylesheets/components/_stats.scss index eff2992..a683006 100644 --- a/app/assets/stylesheets/components/_stats.scss +++ b/app/assets/stylesheets/components/_stats.scss @@ -53,3 +53,8 @@ float: left; } } + +.static_pages-home .upcoming .game { + width: auto; + margin: 0 0.25em 0.5em; +} diff --git a/app/assets/stylesheets/views/_base.scss b/app/assets/stylesheets/views/_base.scss index 44c9d76..cb16558 100644 --- a/app/assets/stylesheets/views/_base.scss +++ b/app/assets/stylesheets/views/_base.scss @@ -1 +1,2 @@ @import "game"; +@import "games-index"; diff --git a/app/assets/stylesheets/views/_game.scss b/app/assets/stylesheets/views/_game.scss index d226006..5a94048 100644 --- a/app/assets/stylesheets/views/_game.scss +++ b/app/assets/stylesheets/views/_game.scss @@ -4,10 +4,16 @@ } .back { + @include transition(padding 0.2s ease-in-out); color: $base-font-color; font-size: 1.4em; - margin-top: 0.22em; + margin: 0.22em 0 0 -10px; + padding: 0 0 0 10px; position: absolute; + + &:hover { + padding: 0 10px 0 0; + } } .main .bot { diff --git a/app/assets/stylesheets/views/_games-index.scss b/app/assets/stylesheets/views/_games-index.scss new file mode 100644 index 0000000..3293c58 --- /dev/null +++ b/app/assets/stylesheets/views/_games-index.scss @@ -0,0 +1,78 @@ +$spacing: 3%; +$shadow: 0.15em; + +.archive, +.upcoming { + .game { + box-shadow: -$shadow $shadow 0 rgba($gray-dark, 0.2); + color: $base-font-color; + display: block; + margin: 0 0 1em; + transition: all $base-duration $base-timing; + + &:active, + &:focus, + &:hover { + @include transform(scale(1.05)); + box-shadow: -$shadow / 2 $shadow / 2 0 rgba($gray-dark, 0.1); + } + + li { + line-height: 1.6em; + } + + span { + margin-right: 0.2em; + } + } +} + +.upcoming { + .game { + &:active, + &:focus, + &:hover { + background: $blue; + color: $white; + } + } +} + +.games-list { + &.archive { + .game { + background: rgba($white, 0.6); + position: relative; + + &:active, + &:focus, + &:hover { + background: $white; + } + } + + li { + &:nth-child(odd) a { + margin-left: 0; + } + + &:nth-child(even) a { + margin-right: 0; + } + } + } + + .game { + float: left; + margin: $spacing; + width: 50% - $spacing; + + li { + line-height: 1.6em; + } + + span { + margin-right: 0.2em; + } + } +} diff --git a/app/views/application/_stats.erb b/app/views/application/_stats.erb index 30efc6a..b518455 100644 --- a/app/views/application/_stats.erb +++ b/app/views/application/_stats.erb @@ -1,3 +1,37 @@ +