Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-20 03:10:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bump jQuery, fix emoji CSS

Browse Source
This commit is contained in:
Adam Hollett
2016-11-09 09:02:51 -05:00
parent 4e42b08f3c
commit fd98f82a07
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_layouts/default.html
+2 -3
View File
@@ -18,7 +18,6 @@
<link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}"> <link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
<link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-32x.png' | prepend: site.baseurl }}" sizes="32x32"> <link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-32x.png' | prepend: site.baseurl }}" sizes="32x32">
<link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-64x.png' | prepend: site.baseurl }}" sizes="64x64"> <link rel="icon" type="image/png" href="{{ '/images/icons/water-drop-64x.png' | prepend: site.baseurl }}" sizes="64x64">
<link rel="icon" href="{{ '/images/icons/water-drop.svg' | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace: 'index.html','' | prepend: site.baseurl | prepend: site.url }}"> <link rel="canonical" href="{{ page.url | replace: 'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" /> <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
@@ -34,11 +33,11 @@
<meta name="twitter:title" content="{{ page.title | default: site.title }}"> <meta name="twitter:title" content="{{ page.title | default: site.title }}">
<meta name="twitter:description" content="{{ page.description | default: site.description }}"> <meta name="twitter:description" content="{{ page.description | default: site.description }}">
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script> <script src="{{ '/js/vendor/jquery-3.1.1.slim.min.js' | prepend: site.baseurl }}"></script>
</head> </head>
<body> <body>
{% include sidebar.html %} {% include sidebar.html %}
<div class="content__overlay"></div> <div class="content__overlay"></div>
_sass/modules/_buttons.scss
+3 -2
View File
@@ -63,6 +63,7 @@
==============================================================================*/ ==============================================================================*/
.menu-button { .menu-button {
display: inline-block; display: inline-block;
font-size: $small-font-size;
background: none; background: none;
border: none; border: none;
margin: $spacing-unit / 2 0 $spacing-unit / 2 ($spacing-unit / 4 * -1); margin: $spacing-unit / 2 0 $spacing-unit / 2 ($spacing-unit / 4 * -1);
@@ -75,8 +76,8 @@
svg { svg {
margin-right: $spacing-unit / 4; margin-right: $spacing-unit / 4;
width: $base-font-size * 1.2; width: $base-font-size;
height: $base-font-size * 1.2; height: $base-font-size;
vertical-align: middle; vertical-align: middle;
} }
_sass/modules/_home-banner.scss
+1 -1
View File
@@ -9,7 +9,7 @@
font-size: 4em; font-size: 4em;
&:after { &:after {
content: '💧'; content: '\01F4A7'; // Water droplet emoji
vertical-align: middle; vertical-align: middle;
} }
_sass/modules/_layout.scss
+1 -1
View File
@@ -78,7 +78,7 @@ body {
border-bottom: 1px solid $color-blue-4; border-bottom: 1px solid $color-blue-4;
&:after { &:after {
content: '💧'; content: '\01F4A7'; // Water droplet emoji
vertical-align: middle; vertical-align: middle;
} }
js/vendor/jquery-3.1.1.slim.min.js
Vendored
+4
View File
File diff suppressed because one or more lines are too long