diff --git a/_includes/css/responsive.css b/_includes/css/responsive.css index 39dd8f5c0..64524f36b 100644 --- a/_includes/css/responsive.css +++ b/_includes/css/responsive.css @@ -146,25 +146,17 @@ font-size: 10px; } .license-rules:not(.license-rules-sidebar) li { + padding-left: 14px; margin-right: 5px; font-size: 10px; -webkit-text-size-adjust: none; } - .license-rules:not(.license-rules-sidebar) li span { - background-size: 44px; + .license-rules:not(.license-rules-sidebar) .license-marker { width: 10px; - height: 10px; + font-size: 10px; + left: 0; top: 1px; - position: relative; - } - .license-rules:not(.license-rules-sidebar) .license-conditions span { - background-position: -34px 0; - } - .license-rules:not(.license-rules-sidebar) .license-permissions span { - background-position: -24px 0px; - } - .license-rules:not(.license-rules-sidebar) .license-limitations span { - background-position: -14px 0; + position: absolute; } .hint--large::after{ diff --git a/_includes/license-overview.html b/_includes/license-overview.html index 320c4142a..c810fe2f0 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -33,7 +33,7 @@
Open source licenses grant to the public permissions to do things with licensed works which copyright or other "intellectual property" laws might otherwise disallow.
+Open source licenses grant to the public permissions to do things with licensed works which copyright or other "intellectual property" laws might otherwise disallow.
-Most open source licenses' grants of permissions are subject to compliance with conditions.
+Most open source licenses' grants of permissions are subject to compliance with ⓘ conditions.
-Most open source licenses also have limitations that usually disclaim warranty and liability, and sometimes expressly exclude patents or trademarks from licenses' grants.
+Most open source licenses also have ✕ limitations that usually disclaim warranty and liability, and sometimes expressly exclude patents or trademarks from licenses' grants.
{% for type in types %} ### {% if type == "permissions" %}Permissions{% elsif type == "conditions" %}Conditions{% else %}Limitations{% endif %} @@ -85,8 +85,8 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% else %} {% assign lite = "" %} {% endif %} - - + + {% if type == "permissions" %}✓{% elsif type == "conditions" %}ⓘ{% else %}✕{% endif %} {{ rule_obj.description }} diff --git a/assets/css/application.scss b/assets/css/application.scss index 835aa041a..cfc9fb580 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -300,6 +300,8 @@ strong { } .license-rules li { + position: relative; + padding-left: 18px; margin-right: 15px; margin-bottom: 5px; } @@ -308,17 +310,39 @@ strong { color: #444; } -.license-sprite { - background-image: url(../img/license-sprite.png); - background-repeat: no-repeat; +.source-marker { + display: inline-block; + width: 16px; + text-align: center; + margin-right: 4px; + font-size: 0.875rem; + line-height: 1; +} + +.license-marker { display: inline-block; + width: 12px; + text-align: center; + font-weight: 700; + line-height: 1; +} + +.license-rules li .license-marker { + position: absolute; + left: 0; + top: 0.1em; } +.license-types td .license-marker { display: block; margin: 0 auto; } +.license-types td .license-marker, +.license-types dd .license-marker { font-size: 0.8125rem; } -.sidebar .source span { background-position: 0 0; width: 16px; height: 12px; } -.license-limitations span { background-position: -16px 0; width: 12px; height: 12px; } -.license-permissions span { background-position: -28px 0; width: 12px; height: 12px; } -.license-conditions span { background-position: -40px 0; width: 12px; height: 12px; } -.lite span { opacity: 0.5; } +.license-permissions .license-marker { color: #298625; } +.license-conditions .license-marker { color: #0d648a; } +.license-limitations .license-marker { color: #812a28; } + +.license-permissions .lite .license-marker { color: rgba(41, 134, 37, 0.5); } +.license-conditions .lite .license-marker { color: rgba(13, 100, 138, 0.5); } +.license-limitations .lite .license-marker { color: rgba(129, 42, 40, 0.5); } .license-rules-sidebar li { float: none; @@ -492,6 +516,7 @@ strong { // Selecting all the tooltip bodies to increase their font-size [class*="hint--"][aria-label]:after { font-size: 0.80rem; + font-weight: 400; text-shadow: none; } @@ -554,13 +579,6 @@ strong { background-size: 72px 182px; } - .license-sprite { - background-image: url(../img/license-sprite@2x.png); - -webkit-background-size: 52px 12px; - -moz-background-size: 52px 12px; - background-size: 52px 12px; - } - } {% include css/responsive.css %} diff --git a/assets/img/license-sprite.png b/assets/img/license-sprite.png deleted file mode 100644 index 656e4ac3a..000000000 Binary files a/assets/img/license-sprite.png and /dev/null differ diff --git a/assets/img/license-sprite@2x.png b/assets/img/license-sprite@2x.png deleted file mode 100644 index 063370e07..000000000 Binary files a/assets/img/license-sprite@2x.png and /dev/null differ