Merge pull request #427 from PeterDaveHello/fix-indent
Fix indent in views, shouldn't mix tabs with spaces
This commit is contained in:
		
						commit
						450159a462
					
				@ -6,10 +6,10 @@
 | 
				
			|||||||
        <div class="ui-infobar container-fluid unselectable hidden-print">
 | 
					        <div class="ui-infobar container-fluid unselectable hidden-print">
 | 
				
			||||||
            <small>
 | 
					            <small>
 | 
				
			||||||
                <span>
 | 
					                <span>
 | 
				
			||||||
                	<span class="ui-lastchangeuser" style="display: none;"> <i class="ui-user-icon small" data-toggle="tooltip" data-placement="right"></i></span>
 | 
					                    <span class="ui-lastchangeuser" style="display: none;"> <i class="ui-user-icon small" data-toggle="tooltip" data-placement="right"></i></span>
 | 
				
			||||||
                	<span class="ui-no-lastchangeuser"> <i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
 | 
					                    <span class="ui-no-lastchangeuser"> <i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
 | 
				
			||||||
                	 <span class="text-uppercase ui-status-lastchange"></span>
 | 
					                     <span class="text-uppercase ui-status-lastchange"></span>
 | 
				
			||||||
                	<span class="ui-lastchange text-uppercase"></span>
 | 
					                    <span class="ui-lastchange text-uppercase"></span>
 | 
				
			||||||
                </span>
 | 
					                </span>
 | 
				
			||||||
                <span class="ui-permission dropdown pull-right">
 | 
					                <span class="ui-permission dropdown pull-right">
 | 
				
			||||||
                    <a id="permissionLabel" class="ui-permission-label text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
 | 
					                    <a id="permissionLabel" class="ui-permission-label text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
<nav class="navbar navbar-default navbar-fixed-top unselectable hidden-print">
 | 
					<nav class="navbar navbar-default navbar-fixed-top unselectable hidden-print">
 | 
				
			||||||
    <!-- Brand and toggle get grouped for better mobile display -->
 | 
					    <!-- Brand and toggle get grouped for better mobile display -->
 | 
				
			||||||
    <div class="navbar-header">
 | 
					    <div class="navbar-header">
 | 
				
			||||||
		<div class="pull-right" style="margin-top: 17px; color: #777;">
 | 
					        <div class="pull-right" style="margin-top: 17px; color: #777;">
 | 
				
			||||||
            <div class="visible-xs"> </div>
 | 
					            <div class="visible-xs"> </div>
 | 
				
			||||||
            <div class="visible-sm"> </div>
 | 
					            <div class="visible-sm"> </div>
 | 
				
			||||||
            <div class="visible-md"> </div>
 | 
					            <div class="visible-md"> </div>
 | 
				
			||||||
 | 
				
			|||||||
@ -16,18 +16,18 @@
 | 
				
			|||||||
    <% } %>
 | 
					    <% } %>
 | 
				
			||||||
    <title><%= title %></title>
 | 
					    <title><%= title %></title>
 | 
				
			||||||
    <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
 | 
					    <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
 | 
				
			||||||
	<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
 | 
					  <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
 | 
				
			||||||
	<% if(useCDN) { %>
 | 
					  <% if(useCDN) { %>
 | 
				
			||||||
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
 | 
					    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
 | 
				
			||||||
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
 | 
					    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
 | 
				
			||||||
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
 | 
					    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
 | 
				
			||||||
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
 | 
					    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
 | 
				
			||||||
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
 | 
					    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
 | 
				
			||||||
    <%- include build/pretty-header %>
 | 
					    <%- include build/pretty-header %>
 | 
				
			||||||
	<% } else { %>
 | 
					  <% } else { %>
 | 
				
			||||||
    <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
 | 
					    <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
 | 
				
			||||||
    <%- include build/pretty-pack-header %>
 | 
					    <%- include build/pretty-pack-header %>
 | 
				
			||||||
	<% } %>
 | 
					  <% } %>
 | 
				
			||||||
    <%- include shared/polyfill %>
 | 
					    <%- include shared/polyfill %>
 | 
				
			||||||
</head>
 | 
					</head>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -38,7 +38,7 @@
 | 
				
			|||||||
                <% if(lastchangeuserprofile) { %>
 | 
					                <% if(lastchangeuserprofile) { %>
 | 
				
			||||||
                    <span class="ui-lastchangeuser"> <i class="ui-user-icon small" style="background-image: url(<%- lastchangeuserprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- lastchangeuserprofile.name %>"></i></span>
 | 
					                    <span class="ui-lastchangeuser"> <i class="ui-user-icon small" style="background-image: url(<%- lastchangeuserprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- lastchangeuserprofile.name %>"></i></span>
 | 
				
			||||||
                <% } else { %>
 | 
					                <% } else { %>
 | 
				
			||||||
                	<span class="ui-no-lastchangeuser"> <i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
 | 
					                  <span class="ui-no-lastchangeuser"> <i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
 | 
				
			||||||
                <% } %>
 | 
					                <% } %>
 | 
				
			||||||
                 <span class="text-uppercase ui-status-lastchange"></span>
 | 
					                 <span class="text-uppercase ui-status-lastchange"></span>
 | 
				
			||||||
                <span class="ui-lastchange text-uppercase" data-createtime="<%- createtime %>" data-updatetime="<%- updatetime %>"></span>
 | 
					                <span class="ui-lastchange text-uppercase" data-createtime="<%- createtime %>" data-updatetime="<%- updatetime %>"></span>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 | 
					<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 | 
				
			||||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 | 
					<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 | 
				
			||||||
<!--[if lt IE 9]>
 | 
					<!--[if lt IE 9]>
 | 
				
			||||||
	<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js" integrity="sha256-3Jy/GbSLrg0o9y5Z5n1uw0qxZECH7C6OQpVBgNFYa0g=" crossorigin="anonymous"></script>
 | 
					    <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js" integrity="sha256-3Jy/GbSLrg0o9y5Z5n1uw0qxZECH7C6OQpVBgNFYa0g=" crossorigin="anonymous"></script>
 | 
				
			||||||
	<script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js" integrity="sha256-g6iAfvZp+nDQ2TdTR/VVKJf3bGro4ub5fvWSWVRi2NE=" crossorigin="anonymous"></script>
 | 
					    <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js" integrity="sha256-g6iAfvZp+nDQ2TdTR/VVKJf3bGro4ub5fvWSWVRi2NE=" crossorigin="anonymous"></script>
 | 
				
			||||||
	<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.5.9/es5-shim.min.js" integrity="sha256-8E4Is26QH0bD52WoQpcB+R/tcWQtpzlCojrybUd7Mxo=" crossorigin="anonymous"></script>
 | 
					    <script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.5.9/es5-shim.min.js" integrity="sha256-8E4Is26QH0bD52WoQpcB+R/tcWQtpzlCojrybUd7Mxo=" crossorigin="anonymous"></script>
 | 
				
			||||||
<![endif]-->
 | 
					<![endif]-->
 | 
				
			||||||
 | 
				
			|||||||
@ -37,13 +37,13 @@
 | 
				
			|||||||
        <link rel="stylesheet" href="<%- url %>/css/slide.css">
 | 
					        <link rel="stylesheet" href="<%- url %>/css/slide.css">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- Printing and PDF exports -->
 | 
					        <!-- Printing and PDF exports -->
 | 
				
			||||||
		<script>
 | 
					        <script>
 | 
				
			||||||
			var link = document.createElement( 'link' );
 | 
					            var link = document.createElement( 'link' );
 | 
				
			||||||
			link.rel = 'stylesheet';
 | 
					            link.rel = 'stylesheet';
 | 
				
			||||||
			link.type = 'text/css';
 | 
					            link.type = 'text/css';
 | 
				
			||||||
            link.href = '<%- url %>/build/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css');
 | 
					            link.href = '<%- url %>/build/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css');
 | 
				
			||||||
			document.getElementsByTagName( 'head' )[0].appendChild( link );
 | 
					            document.getElementsByTagName( 'head' )[0].appendChild( link );
 | 
				
			||||||
		</script>
 | 
					        </script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <%- include shared/polyfill %>
 | 
					        <%- include shared/polyfill %>
 | 
				
			||||||
    </head>
 | 
					    </head>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user