Зуев Егор / wiki.dev

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
7b65ba49 1 parent 732f3a99

Improved code pasting experience. Fixes #6

Inline Side-by-side
Showing 5 changed files with 39 additions and 7 deletions
...@@ -7,10 +7,6 @@ h1 { ...@@ -7,10 +7,6 @@ h1 {
7 line-height: 1.22222222em; 7 line-height: 1.22222222em;
8 margin-top: 0.48888889em; 8 margin-top: 0.48888889em;
9 margin-bottom: 0.48888889em; 9 margin-bottom: 0.48888889em;
10 - //padding-bottom: 0.3333em;
11 - //border-bottom: 1px solid #EAEAEA;
12 - //margin-left: -$-xxl;
13 - //margin-right: -$-xxl;
14 } 10 }
15 h2 { 11 h2 {
16 font-size: 2.8275em; 12 font-size: 2.8275em;
...@@ -111,6 +107,13 @@ sup, .superscript { ...@@ -111,6 +107,13 @@ sup, .superscript {
111 pre { 107 pre {
112 font-family: monospace; 108 font-family: monospace;
113 white-space:pre; 109 white-space:pre;
110 + font-size: 0.8em;
111 + overflow: hidden;
112 + border-radius: 4px;
113 + box-shadow: 0 1px 2px 0px rgba(10, 10, 10, 0.06);
114 + border: 1px solid rgba(221, 221, 221, 0.66);
115 + background-color: #fdf6e3;
116 + padding: 0.5em;
114 } 117 }
115 118
116 blockquote { 119 blockquote {
......
...@@ -146,6 +146,7 @@ header { ...@@ -146,6 +146,7 @@ header {
146 margin-top: $-xxl; 146 margin-top: $-xxl;
147 margin-left: 0; 147 margin-left: 0;
148 max-width: 240px; 148 max-width: 240px;
149 + display: none;
149 } 150 }
150 151
151 .page-nav-list { 152 .page-nav-list {
......
...@@ -10,7 +10,11 @@ ...@@ -10,7 +10,11 @@
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="edit-area"> 12 <div class="edit-area">
13 - @include('form/textarea', ['name' => 'html']) 13 + <textarea id="html" name="html" rows="5"
14 + @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
15 + @if($errors->has('html'))
16 + <div class="text-neg text-small">{{ $errors->first('html') }}</div>
17 + @endif
14 </div> 18 </div>
15 <div class="margin-top large"> 19 <div class="margin-top large">
16 <a onclick="window.history.back();" class="button muted">Cancel</a> 20 <a onclick="window.history.back();" class="button muted">Cancel</a>
...@@ -37,8 +41,9 @@ ...@@ -37,8 +41,9 @@
37 statusbar: false, 41 statusbar: false,
38 menubar: false, 42 menubar: false,
39 height: 700, 43 height: 700,
40 - plugins: "image table textcolor paste link imagetools fullscreen", 44 + extended_valid_elements: 'pre[*]',
41 - toolbar: "undo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen", 45 + plugins: "image table textcolor paste link imagetools fullscreen code",
46 + toolbar: "code undo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen",
42 content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}", 47 content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
43 file_browser_callback: function(field_name, url, type, win) { 48 file_browser_callback: function(field_name, url, type, win) {
44 ImageManager.show(function(image) { 49 ImageManager.show(function(image) {
......
...@@ -6,4 +6,15 @@ ...@@ -6,4 +6,15 @@
6 @include('pages/page-display') 6 @include('pages/page-display')
7 </div> 7 </div>
8 8
9 + <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css">
10 + <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
11 + <script>
12 + window.onload = function() {
13 + var aCodes = document.getElementsByTagName('pre');
14 + for (var i=0; i < aCodes.length; i++) {
15 + hljs.highlightBlock(aCodes[i]);
16 + }
17 + };
18 + </script>
19 +
9 @stop 20 @stop
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
62 header.smoothScrollTo(); 62 header.smoothScrollTo();
63 }) 63 })
64 }); 64 });
65 + $('.side-nav').fadeIn();
65 } else { 66 } else {
66 $('.side-nav').hide(); 67 $('.side-nav').hide();
67 } 68 }
...@@ -93,4 +94,15 @@ ...@@ -93,4 +94,15 @@
93 //$('[data-toggle="popover"]').popover() 94 //$('[data-toggle="popover"]').popover()
94 }); 95 });
95 </script> 96 </script>
97 +
98 + <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css">
99 + <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
100 + <script>
101 + window.onload = function() {
102 + var aCodes = document.getElementsByTagName('pre');
103 + for (var i=0; i < aCodes.length; i++) {
104 + hljs.highlightBlock(aCodes[i]);
105 + }
106 + };
107 + </script>
96 @stop 108 @stop
......