Merge branch 'use-dart-sass' of git://github.com/timoschwarzer/BookStack into timoschwarzer-use-dart-sass
This commit is contained in:
		
						commit
						d5de28c444
					
				
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
				
			
			@ -13,9 +13,9 @@
 | 
			
		|||
    "css-loader": "^3.4.2",
 | 
			
		||||
    "livereload": "^0.9.1",
 | 
			
		||||
    "mini-css-extract-plugin": "^0.9.0",
 | 
			
		||||
    "node-sass": "^4.13.1",
 | 
			
		||||
    "npm-run-all": "^4.1.5",
 | 
			
		||||
    "sass-loader": "^8.0.2",
 | 
			
		||||
    "sass": "^1.26.9",
 | 
			
		||||
    "style-loader": "^1.1.3",
 | 
			
		||||
    "webpack": "^4.42.1",
 | 
			
		||||
    "webpack-cli": "^3.3.11"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,5 +28,5 @@
 | 
			
		|||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@include spacing('margin', 'm')
 | 
			
		||||
@include spacing('padding', 'p')
 | 
			
		||||
@include spacing('margin', 'm');
 | 
			
		||||
@include spacing('padding', 'p');
 | 
			
		||||
		Loading…
	
		Reference in New Issue