Skip to content

Commit 52a785d

Browse files
committed
Merge pull request #230 from nschonni/npm-warnings
Use grunt-sass to remove Ruby requirement
2 parents 9ad804d + 5bf5676 commit 52a785d

File tree

3 files changed

+21
-31
lines changed

3 files changed

+21
-31
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ module.exports = function(grunt) {
185185
grunt.loadNpmTasks('grunt-contrib-uglify');
186186
grunt.loadNpmTasks('grunt-contrib-jshint');
187187
grunt.loadNpmTasks('grunt-contrib-watch');
188-
grunt.loadNpmTasks('grunt-contrib-sass');
188+
grunt.loadNpmTasks('grunt-sass');
189189
grunt.loadNpmTasks('grunt-contrib-copy');
190190
grunt.loadNpmTasks('grunt-jekyll');
191191
grunt.loadNpmTasks('grunt-contrib-cssmin');

dist/magnific-popup.css

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
text-align: left;
5151
z-index: 1045; }
5252

53-
.mfp-inline-holder .mfp-content,
54-
.mfp-ajax-holder .mfp-content {
53+
.mfp-inline-holder .mfp-content, .mfp-ajax-holder .mfp-content {
5554
width: 100%;
5655
cursor: auto; }
5756

@@ -72,10 +71,7 @@
7271
.mfp-auto-cursor .mfp-content {
7372
cursor: auto; }
7473

75-
.mfp-close,
76-
.mfp-arrow,
77-
.mfp-preloader,
78-
.mfp-counter {
74+
.mfp-close, .mfp-arrow, .mfp-preloader, .mfp-counter {
7975
-webkit-user-select: none;
8076
-moz-user-select: none;
8177
user-select: none; }
@@ -145,8 +141,7 @@ button::-moz-focus-inner {
145141
.mfp-close-btn-in .mfp-close {
146142
color: #333333; }
147143

148-
.mfp-image-holder .mfp-close,
149-
.mfp-iframe-holder .mfp-close {
144+
.mfp-image-holder .mfp-close, .mfp-iframe-holder .mfp-close {
150145
color: white;
151146
right: -6px;
152147
text-align: right;
@@ -175,9 +170,7 @@ button::-moz-focus-inner {
175170
margin-top: -54px; }
176171
.mfp-arrow:hover, .mfp-arrow:focus {
177172
opacity: 1; }
178-
.mfp-arrow:before, .mfp-arrow:after,
179-
.mfp-arrow .mfp-b,
180-
.mfp-arrow .mfp-a {
173+
.mfp-arrow:before, .mfp-arrow:after, .mfp-arrow .mfp-b, .mfp-arrow .mfp-a {
181174
content: '';
182175
display: block;
183176
width: 0;
@@ -188,35 +181,29 @@ button::-moz-focus-inner {
188181
margin-top: 35px;
189182
margin-left: 35px;
190183
border: medium inset transparent; }
191-
.mfp-arrow:after,
192-
.mfp-arrow .mfp-a {
184+
.mfp-arrow:after, .mfp-arrow .mfp-a {
193185
border-top-width: 13px;
194186
border-bottom-width: 13px;
195187
top: 8px; }
196-
.mfp-arrow:before,
197-
.mfp-arrow .mfp-b {
188+
.mfp-arrow:before, .mfp-arrow .mfp-b {
198189
border-top-width: 21px;
199190
border-bottom-width: 21px; }
200191

201192
.mfp-arrow-left {
202193
left: 0; }
203-
.mfp-arrow-left:after,
204-
.mfp-arrow-left .mfp-a {
194+
.mfp-arrow-left:after, .mfp-arrow-left .mfp-a {
205195
border-right: 17px solid white;
206196
margin-left: 31px; }
207-
.mfp-arrow-left:before,
208-
.mfp-arrow-left .mfp-b {
197+
.mfp-arrow-left:before, .mfp-arrow-left .mfp-b {
209198
margin-left: 25px;
210199
border-right: 27px solid #3f3f3f; }
211200

212201
.mfp-arrow-right {
213202
right: 0; }
214-
.mfp-arrow-right:after,
215-
.mfp-arrow-right .mfp-a {
203+
.mfp-arrow-right:after, .mfp-arrow-right .mfp-a {
216204
border-left: 17px solid white;
217205
margin-left: 39px; }
218-
.mfp-arrow-right:before,
219-
.mfp-arrow-right .mfp-b {
206+
.mfp-arrow-right:before, .mfp-arrow-right .mfp-b {
220207
border-left: 27px solid #3f3f3f; }
221208

222209
.mfp-iframe-holder {
@@ -302,8 +289,8 @@ img.mfp-img {
302289

303290
@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
304291
/**
305-
* Remove all paddings around the image on small screen
306-
*/
292+
* Remove all paddings around the image on small screen
293+
*/
307294
.mfp-img-mobile .mfp-image-holder {
308295
padding-left: 0;
309296
padding-right: 0; }
@@ -342,22 +329,21 @@ img.mfp-img {
342329
position: fixed;
343330
text-align: center;
344331
padding: 0; } }
332+
345333
@media all and (max-width: 900px) {
346334
.mfp-arrow {
347335
-webkit-transform: scale(0.75);
348336
transform: scale(0.75); }
349-
350337
.mfp-arrow-left {
351338
-webkit-transform-origin: 0;
352339
transform-origin: 0; }
353-
354340
.mfp-arrow-right {
355341
-webkit-transform-origin: 100%;
356342
transform-origin: 100%; }
357-
358343
.mfp-container {
359344
padding-left: 6px;
360345
padding-right: 6px; } }
346+
361347
.mfp-ie7 .mfp-img {
362348
padding: 0; }
363349
.mfp-ie7 .mfp-bottom-bar {

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "jquery-plugin",
2+
"name": "magnific-popup",
33
"version": "0.0.0-ignored",
44
"engines": {
55
"node": ">= 0.8.0"
@@ -17,6 +17,10 @@
1717
"grunt-contrib-cssmin": "~0.4.1",
1818
"grunt-contrib-copy": "~0.4.0",
1919
"grunt-jekyll": "~0.3.9",
20-
"grunt-contrib-sass": "~0.2.2"
20+
"grunt-sass": "~0.6.1"
21+
},
22+
"repository": {
23+
"type": "git",
24+
"url": "https://github.com/nschonni/Magnific-Popup.git"
2125
}
2226
}

0 commit comments

Comments
 (0)