new styles

whackashoe · Jan 2, 2017 · 42042b2 · 42042b2
1 parent e2f317a
commit 42042b2
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 35 deletions.
diff --git a/app/views/editor.blade.php b/app/views/editor.blade.php
@@ -1,37 +1,37 @@
-@extends('layouts.default')
+@extends ('layouts.default')
 
-@section('title')
-@if(!isset($paste->id))
+@section ('title')
+@if (!isset($paste->id))
 killr.io :: paste code and text, optionally collaborate with friends or strangers
 @else
 killr.io :: {{ $paste->slug }} paste
 @endif
 @stop
 
-@section('description')
-@if(!isset($paste->id))
+@section ('description')
+@if (!isset($paste->id))
 killr.io is the most intuitive, quick to use, and beautiful pasting and collaboration tool available.
 @endif
 @stop
 
-@section('menu_items')
-    @if(isset($paste->ip) && strcmp($paste->ip, Request::getClientIp()) == 0)
+@section ('menu_items')
+    @if (isset($paste->ip) && strcmp($paste->ip, Request::getClientIp()) == 0)
         <button id="views">views {{ $paste->views }}</button>
         <button id="delete">delete</button>
     @endif
     <button id="save">save</button>
-    @if(isset($paste->id) && !empty($paste->id))
+    @if (isset($paste->id) && !empty($paste->id))
         <a href="{{ url($paste->slug . '/raw') }}"><button id="raw">raw</button></a>
     @endif
-    @if(isset($paste->parent_id) && $paste->parent_id != null)
+    @if (isset($paste->parent_id) && $paste->parent_id != null)
         <a href="{{ url($paste->parent->slug) }}"><button id="parent">parent</button></a>
     @endif
-    @if(isset($paste->id) && isset($paste->modsCount) && $paste->modsCount > 0)
+    @if (isset($paste->id) && isset($paste->modsCount) && $paste->modsCount > 0)
         <a href="{{ url($paste->slug . '/mods') }}"><button id="mods">mods ({{ $paste->modsCount }})</button></a>
     @endif
 @stop
 
-@section('content')
+@section ('content')
     <div id="linenumbers"></div>
     <div id="content"><pre><code></code></pre></div>
     <textarea spellcheck="false" autocomplete="off" autofocus="true" id="editor" name="code">{{ $paste->code or '' }}</textarea>
@@ -40,4 +40,4 @@
     <div class="hide" id="overlay"></div>
     <div class="modal hide" id="success-modal"></div>
     <div class="modal hide" id="error-modal"></div>
-@stop
+@stop
diff --git a/app/views/layouts/default.blade.php b/app/views/layouts/default.blade.php
@@ -8,9 +8,9 @@
         <meta name="author" content="IcosaDev">
         <link rel="icon" href="{{ asset('favicon.ico') }}">
 
-        <title>@yield('title')</title>
+        <title>@yield ('title')</title>
 
-        <link href="{{ asset('build/styles.css') }}" rel="stylesheet">
+        <link href="{{ asset('build/styles.css?id=' . mt_rand(0, 100000)) }}" rel="stylesheet">
 
         <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
         <!--[if lt IE 9]>
@@ -32,12 +32,12 @@
         <menu id="mainmenu">
             <div id="linepadder"></div>
             <a href="{{ url('/') }}"><button id="logo">killr.io</button></a>
-            @yield('menu_items')
+            @yield ('menu_items')
             <a href="{{ url('terms') }}"><button id="terms">terms</button></a>
             <a href="{{ url('about') }}"><button id="about">about</button></a>
         </menu>
-        @yield('content')
+        @yield ('content')
 
-        <script src="{{ asset('build/scripts.min.js') }}"></script>
+        <script src="{{ asset('build/scripts.min.js?id=' . mt_rand(0, 100000)) }}"></script>
     </body>
 </html>
diff --git a/app/views/mods.blade.php b/app/views/mods.blade.php
@@ -1,27 +1,27 @@
-@extends('layouts.default')
+@extends ('layouts.default')
 
-@section('title')
+@section ('title')
 killr.io :: {{ $paste->slug }} modification tree
 @stop
 
-@section('description')
+@section ('description')
 view the modification tree for {{ $paste->slug }} 
 @stop
 
-@section('menu_items')
-    @if(isset($paste->parent_slug) && !empty($paste->parent_slug))
+@section ('menu_items')
+    @if (isset($paste->parent_slug) && !empty($paste->parent_slug))
         <a href="{{ url($paste->parent_slug) }}"><button id="parent">parent</button></a>
     @endif
     <a href="{{ url($paste->slug) }}"><button id="back">back</button></a>
 @stop
 
-@section('content')
+@section ('content')
 <div id="modlisting">
     <ul>
-        @forelse($paste->children as $mod)
+        @forelse ($paste->children as $mod)
             <li>
                 <a href="{{ url($mod->slug) }}">{{ $mod->created_at }} ({{ $mod->modsCount }} mods)</a>
-                @if($mod->modsCount > 0)
+                @if ($mod->modsCount > 0)
                     <button class="expand-mods" data-slug="{{ $mod->slug }}">+</button>
                 @endif
             </li>
@@ -30,4 +30,4 @@
         @endforelse
     </ul>
 </div>
-@stop
+@stop
diff --git a/public/css/template.css b/public/css/template.css
@@ -8,7 +8,7 @@ html, body {
     padding:0px;
     margin:0px;
     background-color: #1D1F21;
-    overflow-x:hidden;
+    overflow-x: scroll;
 }
 
 * {
@@ -85,21 +85,32 @@ html, body {
 }
 #linenumbers table {
     width: 100%;
+    border-spacing:0;
+    margin-top:0.5rem;
 }
 #linenumbers tr {
     width:100%;
 }
 #linenumbers tr td {
     text-align: right;
     width:100%;
-    padding-right: 0.5em;
+    padding:0 0.5em 0 0; 
+    margin:0;
+    height: 14px;
+    max-height: 14px;
+    line-height: 14px;
+    border-top: 1px solid transparent;
+    border-bottom:2px solid transparent;
+    color: rgba(255, 255, 255, 0.5);
+    font-size:12px;
+    background-color: #282B2E;
 }
 
 #mainmenu {
     position: fixed;
     top:0px;
     left:0px;
-    width:100%;
+    width:100vw;
     height:2em;
     background-color: #1D1F21;
     color:#fff;
@@ -214,4 +225,4 @@ button:hover {
 
 #modlisting ul li a:hover {
     opacity: 0.8;
-}
+}
diff --git a/public/js/highlight.pack.js b/public/js/highlight.pack.js
diff --git a/public/js/interaction.js b/public/js/interaction.js
@@ -5,8 +5,6 @@
  * create diff page:
  *  killr.io/asdaa/diff/lkjww
  * when modifying existing paste highlight (in linenumbers) modified rows
- * add killr.io/asdaa/raw -- add raw link to header
- * add killr.io/asdaa/md -- markdown rendering ?
  * add total_mods column to db, we need to traverse upwards along tree and increment count when mod is added
  * add killr.io/asdaa/demo -- view raw as actual html
 */
@@ -51,7 +49,7 @@ $(document).ready(function() {
 
         $("#content code").each(function(i, block) {
             hljs.initHighlighting.called = false;
-            hljs.initHighlighting();
+            hljs.highlightBlock(block);
         });
         $('#content, #content pre, #content code, #editor, #linenumbers').css('height', $('#editor')[0].scrollHeight);
         $('#content, #console pre, #content code, #editor').css('width', $('#editor')[0].scrollWidth);