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

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
d990c3ce 1 parent 713827f9

Cleaned and organised many css/js files

Inline Side-by-side
Showing 31 changed files with 584 additions and 586 deletions
...@@ -15,5 +15,5 @@ elixir(function(mix) { ...@@ -15,5 +15,5 @@ elixir(function(mix) {
15 mix.sass('styles.scss'); 15 mix.sass('styles.scss');
16 mix.scripts('image-manager.js', 'public/js/image-manager.js'); 16 mix.scripts('image-manager.js', 'public/js/image-manager.js');
17 mix.scripts('book-dashboard.js', 'public/js/book-dashboard.js'); 17 mix.scripts('book-dashboard.js', 'public/js/book-dashboard.js');
18 - mix.scripts('jquery-extensions.js', 'public/js/jquery-extensions.js'); 18 + mix.scripts(['jquery-extensions.js', 'global.js'], 'public/js/common.js');
19 }); 19 });
......
1 +$(function () {
2 +
3 + $('.notification').click(function () {
4 + $(this).fadeOut(100);
5 + });
6 +
7 + // Dropdown toggles
8 + $('[data-dropdown]').dropDown();
9 +
10 +});
...\ No newline at end of file ...\ No newline at end of file
1 1
2 +// Smooth scrolling
2 jQuery.fn.smoothScrollTo = function() { 3 jQuery.fn.smoothScrollTo = function() {
3 if(this.length === 0) return; 4 if(this.length === 0) return;
4 $('body').animate({ 5 $('body').animate({
...@@ -6,12 +7,15 @@ jQuery.fn.smoothScrollTo = function() { ...@@ -6,12 +7,15 @@ jQuery.fn.smoothScrollTo = function() {
6 }, 800); // Adjust to change animations speed (ms) 7 }, 800); // Adjust to change animations speed (ms)
7 return this; 8 return this;
8 }; 9 };
10 +
11 +// Making contains text expression not worry about casing
9 $.expr[":"].contains = $.expr.createPseudo(function(arg) { 12 $.expr[":"].contains = $.expr.createPseudo(function(arg) {
10 return function( elem ) { 13 return function( elem ) {
11 return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0; 14 return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
12 }; 15 };
13 }); 16 });
14 17
18 +// Show a success message after the element it's called upon.
15 jQuery.fn.showSuccess = function (message) { 19 jQuery.fn.showSuccess = function (message) {
16 var elem = $(this); 20 var elem = $(this);
17 var success = $('<div class="text-pos" style="display:none;"><i class="zmdi zmdi-check-circle"></i>' + message + '</div>'); 21 var success = $('<div class="text-pos" style="display:none;"><i class="zmdi zmdi-check-circle"></i>' + message + '</div>');
...@@ -25,6 +29,7 @@ jQuery.fn.showSuccess = function (message) { ...@@ -25,6 +29,7 @@ jQuery.fn.showSuccess = function (message) {
25 }); 29 });
26 }; 30 };
27 31
32 +// Show a failure messages from laravel. Searches for the name of the inputs.
28 jQuery.fn.showFailure = function (messageMap) { 33 jQuery.fn.showFailure = function (messageMap) {
29 var elem = $(this); 34 var elem = $(this);
30 $.each(messageMap, function (key, messages) { 35 $.each(messageMap, function (key, messages) {
...@@ -42,6 +47,20 @@ jQuery.fn.showFailure = function (messageMap) { ...@@ -42,6 +47,20 @@ jQuery.fn.showFailure = function (messageMap) {
42 47
43 }; 48 };
44 49
50 +// Submit the form that the called upon element sits in.
45 jQuery.fn.submitForm = function() { 51 jQuery.fn.submitForm = function() {
46 $(this).closest('form').submit(); 52 $(this).closest('form').submit();
47 }; 53 };
54 +
55 +// Dropdown menu display
56 +jQuery.fn.dropDown = function() {
57 + var container = $(this),
58 + menu = container.find('ul');
59 + container.find('[data-dropdown-toggle]').on('click', function() {
60 + menu.show().addClass('anim menuIn');
61 + container.mouseleave(function() {
62 + menu.hide();
63 + menu.removeClass('anim menuIn');
64 + });
65 + });
66 +};
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -90,6 +90,12 @@ input[type="text"], input[type="number"], input[type="email"], input[type="searc ...@@ -90,6 +90,12 @@ input[type="text"], input[type="number"], input[type="email"], input[type="searc
90 } 90 }
91 } 91 }
92 92
93 +.page-title input {
94 + display: block;
95 + width: 100%;
96 + font-size: 1.4em;
97 +}
98 +
93 .description-input textarea { 99 .description-input textarea {
94 @extend .inline-input-style; 100 @extend .inline-input-style;
95 font-size: $fs-m; 101 font-size: $fs-m;
......
1 1
2 +/** Flexbox styling rules **/
3 +body.flexbox {
4 + display: flex;
5 + flex-direction: column;
6 + align-items: stretch;
7 + height: 100%;
8 + min-height: 100%;
9 + max-height: 100%;
10 + overflow: hidden;
11 + #content {
12 + flex: 1;
13 + display: flex;
14 + }
15 +}
16 +
17 +.flex-fill {
18 + display: flex;
19 + align-items: stretch;
20 + .flex, &.flex {
21 + flex: 1;
22 + }
23 +}
24 +
2 /** Rules for all columns */ 25 /** Rules for all columns */
3 div[class^="col-"] img { 26 div[class^="col-"] img {
4 max-width: 100%; 27 max-width: 100%;
...@@ -13,6 +36,20 @@ div[class^="col-"] img { ...@@ -13,6 +36,20 @@ div[class^="col-"] img {
13 &.fluid { 36 &.fluid {
14 max-width: 100%; 37 max-width: 100%;
15 } 38 }
39 + &.small {
40 + max-width: 840px;
41 + }
42 +}
43 +
44 +.center-box {
45 + margin: 15vh auto 0 auto;
46 + padding: $-m $-xxl $-xl*2 $-xxl;
47 + max-width: 346px;
48 + &.login {
49 + background-color: #EEE;
50 + box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
51 + border: 1px solid #DDD;
52 + }
16 } 53 }
17 54
18 .row { 55 .row {
...@@ -29,6 +66,7 @@ div[class^="col-"] img { ...@@ -29,6 +66,7 @@ div[class^="col-"] img {
29 66
30 .block { 67 .block {
31 display: block; 68 display: block;
69 + position: relative;
32 } 70 }
33 71
34 .inline { 72 .inline {
......
1 +/**
2 + * Includes the main navigation header and the faded toolbar.
3 + */
4 +
5 +header {
6 + display: block;
7 + z-index: 2;
8 + top: 0;
9 + background-color: $primary-dark;
10 + color: #fff;
11 + .padded {
12 + padding: $-m;
13 + }
14 + border-bottom: 1px solid #DDD;
15 + //margin-bottom: $-l;
16 + .links {
17 + display: inline-block;
18 + vertical-align: top;
19 + margin-right: $-xl;
20 + }
21 + .links a {
22 + display: inline-block;
23 + padding: $-l;
24 + color: #FFF;
25 + &:last-child {
26 + padding-right: 0;
27 + }
28 + }
29 + .avatar, .user-name {
30 + display: inline-block;
31 + }
32 + .avatar {
33 + margin-top: (45px/2);
34 + width: 30px;
35 + height: 30px;
36 + }
37 + .user-name {
38 + vertical-align: top;
39 + padding-top: 25.5px;
40 + padding-left: $-m;
41 + display: inline-block;
42 + cursor: pointer;
43 + i {
44 + padding-left: $-xs;
45 + }
46 + }
47 +}
48 +
49 +form.search-box {
50 + margin-top: $-l *0.9;
51 + display: inline-block;
52 + position: relative;
53 + text-align: left;
54 + input {
55 + background-color: transparent;
56 + border-radius: 0;
57 + border: none;
58 + border-bottom: 2px solid #EEE;
59 + color: #EEE;
60 + padding-right: $-l;
61 + outline: 0;
62 + }
63 + button {
64 + vertical-align: top;
65 + margin-left: -$-l;
66 + color: #FFF;
67 + top: 0;
68 + right: 0;
69 + display: inline-block;
70 + position: absolute;
71 + &:hover {
72 + color: #FFF;
73 + }
74 + }
75 +}
76 +
77 +.logo {
78 + display: inline-block;
79 + font-size: 1.8em;
80 + color: #fff;
81 + font-weight: 400;
82 + padding: $-l $-l $-l 0;
83 + vertical-align: top;
84 + line-height: 1;
85 + &:hover {
86 + color: #FFF;
87 + text-decoration: none;
88 + }
89 +}
90 +
91 +.dropdown-container {
92 + display: inline-block;
93 + vertical-align: top;
94 + position: relative;
95 +}
96 +
97 +.dropdown-container ul {
98 + display: none;
99 + position: absolute;
100 + z-index: 999;
101 + top: 0;
102 + left: 0;
103 + margin: $-m 0;
104 + background-color: #FFFFFF;
105 + list-style: none;
106 + box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
107 + border-radius: 1px;
108 + border: 1px solid #EEE;
109 + min-width: 180px;
110 + padding: $-xs 0;
111 + color: #555;
112 + a {
113 + display: block;
114 + padding: $-xs $-m;
115 + color: #555;
116 + &:hover {
117 + text-decoration: none;
118 + background-color: #EEE;
119 + }
120 + i {
121 + margin-right: $-m;
122 + padding-right: 0;
123 + display: inline;
124 + width: 22px;
125 + }
126 + }
127 + li.border-bottom {
128 + border-bottom: 1px solid #DDD;
129 + }
130 +}
131 +
132 +.breadcrumbs span.sep {
133 + color: #aaa;
134 + padding: 0 $-xs;
135 +}
136 +
137 +.faded {
138 + a, button, span {
139 + color: #666;
140 + }
141 + .text-button {
142 + opacity: 0.5;
143 + transition: all ease-in-out 120ms;
144 + &:hover {
145 + opacity: 1;
146 + text-decoration: none;
147 + }
148 + }
149 +}
150 +
151 +.faded-small {
152 + color: #000;
153 + font-size: 0.9em;
154 + background-color: rgba(21, 101, 192, 0.15);
155 +}
156 +
157 +.breadcrumbs .text-button, .action-buttons .text-button {
158 + display: inline-block;
159 + padding: $-s;
160 + &:last-child {
161 + padding-right: 0;
162 + }
163 +}
164 +.action-buttons {
165 + text-align: right;
166 + &.text-left {
167 + text-align: left;
168 + .text-button {
169 + padding-right: $-m;
170 + padding-left: 0;
171 + }
172 + }
173 +}
174 +
175 +.setting-nav {
176 + text-align: center;
177 + a {
178 + padding: $-m;
179 + display: inline-block;
180 + color: #666;
181 + &.selected {
182 + border-bottom: 2px solid $primary;
183 + }
184 + }
185 +}
...\ No newline at end of file ...\ No newline at end of file
1 +.overlay {
2 + background-color: rgba(0, 0, 0, 0.2);
3 + position: fixed;
4 + display: none;
5 + z-index: 95536;
6 + width: 100%;
7 + height: 100%;
8 + min-width: 100%;
9 + min-height: 100%;
10 + top: 0;
11 + left: 0;
12 + right: 0;
13 + bottom: 0;
14 +}
15 +
1 .image-manager-body { 16 .image-manager-body {
2 background-color: #FFF; 17 background-color: #FFF;
3 max-height: 90%; 18 max-height: 90%;
4 width: 90%; 19 width: 90%;
5 height: 90%; 20 height: 90%;
6 margin: 2% 5%; 21 margin: 2% 5%;
7 - //border: 2px solid $primary;
8 border-radius: 4px; 22 border-radius: 4px;
9 box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3); 23 box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3);
10 overflow: hidden; 24 overflow: hidden;
...@@ -245,7 +259,7 @@ ...@@ -245,7 +259,7 @@
245 width: 80px; 259 width: 80px;
246 margin-left: -40px; 260 margin-left: -40px;
247 background: rgba(255, 255, 255, 0.9); 261 background: rgba(255, 255, 255, 0.9);
248 - -webkit-transform: scale(1); 262 + transform: scale(1);
249 border-radius: 8px; 263 border-radius: 8px;
250 overflow: hidden; } 264 overflow: hidden; }
251 .dz-preview .dz-progress .dz-upload { 265 .dz-preview .dz-progress .dz-upload {
......
1 +.page-list {
2 + h3 {
3 + margin: $-l 0 $-m 0;
4 + }
5 + a.chapter {
6 + color: $color-chapter;
7 + }
8 + .inset-list {
9 + display: block;
10 + overflow: hidden;
11 + // padding-left: $-m;
12 + margin-bottom: $-l;
13 + }
14 + h4 {
15 + display: block;
16 + margin: $-s 0 0 0;
17 + border-left: 5px solid $color-page;
18 + padding: $-xs 0 $-xs $-m;
19 + }
20 + hr {
21 + margin-top: 0;
22 + }
23 + .book-child {
24 + padding-left: $-l;
25 + &.page {
26 + border-left: 5px solid $color-page;
27 + }
28 + &.chapter {
29 + border-left: 5px solid $color-chapter;
30 + }
31 + }
32 +}
33 +.chapter-toggle {
34 + cursor: pointer;
35 + margin: 0 0 $-l 0;
36 + transition: all ease-in-out 180ms;
37 + i {
38 + transition: all ease-in-out 180ms;
39 + transform: rotate(0deg);
40 + transform-origin: 25% 50%;
41 + }
42 + &.open {
43 + margin-bottom: 0;
44 + }
45 + &.open i {
46 + transform: rotate(90deg);
47 + }
48 +}
49 +
50 +.page-nav-list {
51 + $nav-indent: $-s;
52 + margin-left: 2px;
53 + list-style: none;
54 + li {
55 + //border-left: 1px solid rgba(0, 0, 0, 0.1);
56 + padding-left: $-xs;
57 + border-left: 2px solid #888;
58 + margin-bottom: 4px;
59 + }
60 + li a {
61 + color: #555;
62 + }
63 + .nav-H2 {
64 + margin-left: $nav-indent;
65 + font-size: 0.95em;
66 + }
67 + .nav-H3 {
68 + margin-left: $nav-indent*2;
69 + font-size: 0.90em
70 + }
71 + .nav-H4 {
72 + margin-left: $nav-indent*3;
73 + font-size: 0.85em
74 + }
75 + .nav-H5 {
76 + margin-left: $nav-indent*4;
77 + font-size: 0.80em
78 + }
79 + .nav-H6 {
80 + margin-left: $nav-indent*5;
81 + font-size: 0.75em
82 + }
83 +}
84 +
85 +// Sidebar list
86 +.book-tree {
87 + margin-top: $-xl;
88 +}
89 +.book-tree h4 {
90 + padding: $-m $-s 0 $-s;
91 + i {
92 + padding-right: $-s;
93 + }
94 +}
95 +.book-tree .sidebar-page-list {
96 + list-style: none;
97 + margin: 0;
98 + margin-top: $-xs;
99 + border-left: 5px solid $color-book;
100 + li a {
101 + display: block;
102 + border-bottom: none;
103 + padding-left: $-s;
104 + padding: $-xs 0 $-xs $-s;
105 + &:hover {
106 + background-color: rgba(255, 255, 255, 0.2);
107 + text-decoration: none;
108 + }
109 + }
110 + li, a {
111 + display: block;
112 + }
113 + a.bold {
114 + color: #EEE !important;
115 + }
116 + ul {
117 + list-style: none;
118 + margin: 0;
119 + }
120 + .book {
121 + color: $color-book !important;
122 + &.selected {
123 + background-color: rgba($color-book, 0.29);
124 + }
125 + }
126 + .chapter {
127 + color: $color-chapter !important;
128 + &.selected {
129 + background-color: rgba($color-chapter, 0.12);
130 + }
131 + }
132 + .list-item-chapter {
133 + border-left: 5px solid $color-chapter;
134 + margin: 10px 10px;
135 + display: block;
136 + }
137 + .list-item-page {
138 + border-bottom: none;
139 + }
140 + .page {
141 + color: $color-page !important;
142 + border-left: 5px solid $color-page;
143 + margin: 10px 10px;
144 + border-bottom: none;
145 + &.selected {
146 + background-color: rgba($color-page, 0.1);
147 + }
148 + }
149 +}
150 +
151 +// Sortable Lists
152 +.sortable-page-list, .sortable-page-list ul {
153 + list-style: none;
154 +}
155 +.sortable-page-list {
156 + margin-left: 0;
157 + box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.1);
158 + ul {
159 + margin-bottom: 0;
160 + margin-top: 0;
161 + box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.1);
162 + }
163 + li {
164 + border: 1px solid #DDD;
165 + padding: $-xs $-s;
166 + margin-top: -1px;
167 + min-height: 38px;
168 + &.text-chapter {
169 + border-left: 2px solid $color-chapter;
170 + }
171 + &.text-page {
172 + border-left: 2px solid $color-page;
173 + }
174 + }
175 + li:first-child {
176 + margin-top: $-xs;
177 + }
178 +}
179 +.sortable-page-list li.placeholder {
180 + position: relative;
181 +}
182 +.sortable-page-list li.placeholder:before {
183 + position: absolute;
184 +}
185 +
186 +
187 +.activity-list-item {
188 + padding: $-s 0;
189 + color: #888;
190 + border-bottom: 1px solid #EEE;
191 + font-size: 0.9em;
192 + .left {
193 + float: left;
194 + }
195 + .left + .right {
196 + margin-left: 30px + $-s;
197 + }
198 +}
...\ No newline at end of file ...\ No newline at end of file
1 +.page-editor {
2 + display: flex;
3 + flex-direction: column;
4 + align-items: stretch;
5 + .faded-small {
6 + height: auto;
7 + }
8 + .edit-area {
9 + flex: 1;
10 + flex-direction: column;
11 + }
12 +}
13 +
14 +.page-style.editor {
15 + padding: 0 !important;
16 +}
17 +
18 +.page-content {
19 + max-width: 840px;
20 + img {
21 + max-width: 100%;
22 + height:auto;
23 + }
24 +}
25 +
26 +// Link hooks & popovers
27 +a.link-hook {
28 + position: absolute;
29 + display: inline-block;
30 + top: $-xs;
31 + left: -$-l;
32 + padding-bottom: 30px;
33 + font-size: 20px;
34 + line-height: 20px;
35 + color: #BBB;
36 + opacity: 0;
37 + transform: translate3d(10px, 0, 0);
38 + transition: all ease-in-out 240ms;
39 + background-color: transparent;
40 + &:hover {
41 + color: $primary;
42 + }
43 +}
44 +h1, h2, h3, h4, h5, h6 {
45 + &:hover a.link-hook {
46 + opacity: 1;
47 + transform: translate3d(0, 0, 0);
48 + }
49 +}
50 +
51 +// Side Navigation
52 +.side-nav {
53 + position: fixed;
54 + padding-left: $-m;
55 + opacity: 0.8;
56 + margin-top: $-xxl;
57 + margin-left: 0;
58 + max-width: 240px;
59 + display: none;
60 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -12,6 +12,9 @@ $m: 800px; ...@@ -12,6 +12,9 @@ $m: 800px;
12 $s: 600px; 12 $s: 600px;
13 $xs: 400px; 13 $xs: 400px;
14 $xxs: 360px; 14 $xxs: 360px;
15 +$screen-md: 992px;
16 +$screen-lg: 1200px;
17 +$screen-sm: 768px;
15 18
16 // Spacing (Margins+Padding) 19 // Spacing (Margins+Padding)
17 $-xxxl: 64px; 20 $-xxxl: 64px;
......
...@@ -11,437 +11,9 @@ ...@@ -11,437 +11,9 @@
11 @import "animations"; 11 @import "animations";
12 @import "tinymce"; 12 @import "tinymce";
13 @import "image-manager"; 13 @import "image-manager";
14 - 14 +@import "header";
15 -header { 15 +@import "lists";
16 - display: block; 16 +@import "pages";
17 - z-index: 2;
18 - top: 0;
19 - background-color: $primary-dark;
20 - color: #fff;
21 - .padded {
22 - padding: $-m;
23 - }
24 - border-bottom: 1px solid #DDD;
25 - //margin-bottom: $-l;
26 - .links {
27 - display: inline-block;
28 - vertical-align: top;
29 - margin-right: $-xl;
30 - }
31 - .links a {
32 - display: inline-block;
33 - padding: $-l;
34 - color: #FFF;
35 - &:last-child {
36 - padding-right: 0;
37 - }
38 - }
39 - .avatar, .user-name {
40 - display: inline-block;
41 - }
42 - .avatar {
43 - margin-top: (45px/2);
44 - width: 30px;
45 - height: 30px;
46 - }
47 - .user-name {
48 - vertical-align: top;
49 - padding-top: 25.5px;
50 - padding-left: $-m;
51 - display: inline-block;
52 - cursor: pointer;
53 - i {
54 - padding-left: $-xs;
55 - }
56 - }
57 -}
58 -
59 -form.search-box {
60 - margin-top: $-l *0.9;
61 - display: inline-block;
62 - position: relative;
63 - input {
64 - background-color: transparent;
65 - border-radius: 0;
66 - border: none;
67 - border-bottom: 2px solid #EEE;
68 - color: #EEE;
69 - padding-right: $-l;
70 - outline: 0;
71 - }
72 - a {
73 - vertical-align: top;
74 - margin-left: -$-l;
75 - color: #FFF;
76 - top: 0;
77 - display: inline-block;
78 - position: absolute;
79 - }
80 -}
81 -
82 -#content {
83 - display: block;
84 - position: relative;
85 -}
86 -
87 -body.flexbox {
88 - display: flex;
89 - flex-direction: column;
90 - align-items: stretch;
91 - height: 100%;
92 - min-height: 100%;
93 - max-height: 100%;
94 - overflow: hidden;
95 - #content {
96 - flex: 1;
97 - display: flex;
98 - }
99 -}
100 -
101 -.flex-fill {
102 - display: flex;
103 - align-items: stretch;
104 - .flex, &.flex {
105 - flex: 1;
106 - }
107 -}
108 -
109 -.page-editor {
110 - display: flex;
111 - flex-direction: column;
112 - align-items: stretch;
113 - .faded-small {
114 - height: auto;
115 - }
116 - .edit-area {
117 - flex: 1;
118 - flex-direction: column;
119 - }
120 -}
121 -
122 -.logo {
123 - display: inline-block;
124 - font-size: 1.8em;
125 - color: #fff;
126 - font-weight: 400;
127 - padding: $-l $-l $-l 0;
128 - vertical-align: top;
129 - line-height: 1;
130 - &:hover {
131 - color: #FFF;
132 - text-decoration: none;
133 - }
134 -}
135 -
136 -.page-title input {
137 - display: block;
138 - width: 100%;
139 - font-size: 1.4em;
140 -}
141 -
142 -.page-style {
143 - padding: $-s $-xxl $-xxl $-xxl;
144 - margin-bottom: $-xxl;
145 - max-width: 100%;
146 -}
147 -
148 -.page-style.editor {
149 - padding: 0 !important;
150 -}
151 -
152 -.page-content {
153 - @extend .page-style;
154 - min-height: 70vh;
155 - max-width: 840px;
156 - margin-left: auto;
157 - margin-right: auto;
158 - &.right {
159 - float: right;
160 - }
161 - &.left {
162 - float: left;
163 - }
164 - img {
165 - max-width: 100%;
166 - height:auto;
167 - }
168 -}
169 -
170 -.page-list {
171 - h3 {
172 - margin: $-l 0 $-m 0;
173 - }
174 - a.chapter {
175 - color: $color-chapter;
176 - }
177 - .inset-list {
178 - display: block;
179 - overflow: hidden;
180 - // padding-left: $-m;
181 - margin-bottom: $-l;
182 - }
183 - h4 {
184 - display: block;
185 - margin: $-s 0 0 0;
186 - border-left: 5px solid $color-page;
187 - padding: $-xs 0 $-xs $-m;
188 - }
189 - hr {
190 - margin-top: 0;
191 - }
192 - .book-child {
193 - padding-left: $-l;
194 - &.page {
195 - border-left: 5px solid $color-page;
196 - }
197 - &.chapter {
198 - border-left: 5px solid $color-chapter;
199 - }
200 - }
201 -}
202 -.chapter-toggle {
203 - cursor: pointer;
204 - margin: 0 0 $-l 0;
205 - transition: all ease-in-out 180ms;
206 - i {
207 - transition: all ease-in-out 180ms;
208 - transform: rotate(0deg);
209 - transform-origin: 25% 50%;
210 - }
211 - &.open {
212 - margin-bottom: 0;
213 - }
214 - &.open i {
215 - transform: rotate(90deg);
216 - }
217 -}
218 -
219 -.side-nav {
220 - position: fixed;
221 - padding-left: $-m;
222 - opacity: 0.8;
223 - margin-top: $-xxl;
224 - margin-left: 0;
225 - max-width: 240px;
226 - display: none;
227 -}
228 -
229 -.page-nav-list {
230 - $nav-indent: $-s;
231 - margin-left: 2px;
232 - list-style: none;
233 - li {
234 - //border-left: 1px solid rgba(0, 0, 0, 0.1);
235 - padding-left: $-xs;
236 - border-left: 2px solid #888;
237 - margin-bottom: 4px;
238 - }
239 - li a {
240 - color: #555;
241 - }
242 - .nav-H2 {
243 - margin-left: $nav-indent;
244 - font-size: 0.95em;
245 - }
246 - .nav-H3 {
247 - margin-left: $nav-indent*2;
248 - font-size: 0.90em
249 - }
250 - .nav-H4 {
251 - margin-left: $nav-indent*3;
252 - font-size: 0.85em
253 - }
254 - .nav-H5 {
255 - margin-left: $nav-indent*4;
256 - font-size: 0.80em
257 - }
258 - .nav-H6 {
259 - margin-left: $nav-indent*5;
260 - font-size: 0.75em
261 - }
262 -}
263 -
264 -
265 -
266 -.overlay {
267 - background-color: rgba(0, 0, 0, 0.2);
268 - position: fixed;
269 - display: none;
270 - z-index: 95536;
271 - width: 100%;
272 - height: 100%;
273 - min-width: 100%;
274 - min-height: 100%;
275 - top: 0;
276 - left: 0;
277 - right: 0;
278 - bottom: 0;
279 -}
280 -
281 -// Link hooks & popovers
282 -a.link-hook {
283 - position: absolute;
284 - display: inline-block;
285 - top: $-xs;
286 - left: -$-l;
287 - padding-bottom: 30px;
288 - font-size: 20px;
289 - line-height: 20px;
290 - color: #BBB;
291 - opacity: 0;
292 - transform: translate3d(10px, 0, 0);
293 - transition: all ease-in-out 240ms;
294 - background-color: transparent;
295 - &:hover {
296 - color: $primary;
297 - }
298 -}
299 -h1, h2, h3, h4, h5, h6 {
300 - &:hover a.link-hook {
301 - opacity: 1;
302 - transform: translate3d(0, 0, 0);
303 - }
304 -}
305 -
306 -.breadcrumbs span.sep {
307 - color: #aaa;
308 - padding: 0 $-xs;
309 -}
310 -
311 -.faded {
312 - a, button, span {
313 - color: #666;
314 - }
315 - .text-button {
316 - opacity: 0.5;
317 - transition: all ease-in-out 120ms;
318 - &:hover {
319 - opacity: 1;
320 - text-decoration: none;
321 - }
322 - }
323 -}
324 -
325 -.faded-small {
326 - color: #000;
327 - font-size: 0.9em;
328 - background-color: rgba(21, 101, 192, 0.15);
329 -}
330 -
331 -.breadcrumbs .text-button, .action-buttons .text-button {
332 - display: inline-block;
333 - padding: $-s;
334 - &:last-child {
335 - padding-right: 0;
336 - }
337 -}
338 -.action-buttons {
339 - text-align: right;
340 - &.text-left {
341 - text-align: left;
342 - .text-button {
343 - padding-right: $-m;
344 - padding-left: 0;
345 - }
346 - }
347 -}
348 -
349 -.book-tree {
350 - margin-top: $-xl;
351 -}
352 -.book-tree h4 {
353 - padding: $-m $-s 0 $-s;
354 - i {
355 - padding-right: $-s;
356 - }
357 -}
358 -
359 -
360 -// Sidebar list
361 -.book-tree .sidebar-page-list {
362 - list-style: none;
363 - margin: 0;
364 - margin-top: $-xs;
365 - border-left: 5px solid $color-book;
366 - li a {
367 - display: block;
368 - border-bottom: none;
369 - padding-left: $-s;
370 - padding: $-xs 0 $-xs $-s;
371 - &:hover {
372 - background-color: rgba(255, 255, 255, 0.2);
373 - text-decoration: none;
374 - }
375 - }
376 - li, a {
377 - display: block;
378 - }
379 - a.bold {
380 - color: #EEE !important;
381 - }
382 - ul {
383 - list-style: none;
384 - margin: 0;
385 - }
386 - .book {
387 - color: $color-book !important;
388 - &.selected {
389 - background-color: rgba($color-book, 0.29);
390 - }
391 - }
392 - .chapter {
393 - color: $color-chapter !important;
394 - &.selected {
395 - background-color: rgba($color-chapter, 0.12);
396 - }
397 - }
398 - .list-item-chapter {
399 - border-left: 5px solid $color-chapter;
400 - margin: 10px 10px;
401 - display: block;
402 - }
403 - .list-item-page {
404 - border-bottom: none;
405 - }
406 - .page {
407 - color: $color-page !important;
408 - border-left: 5px solid $color-page;
409 - margin: 10px 10px;
410 - border-bottom: none;
411 - &.selected {
412 - background-color: rgba($color-page, 0.1);
413 - }
414 - }
415 -}
416 -
417 -// Sortable Lists
418 -.sortable-page-list, .sortable-page-list ul {
419 - list-style: none;
420 -}
421 -.sortable-page-list {
422 - margin-left: 0;
423 - box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.1);
424 - ul {
425 - margin-bottom: 0;
426 - margin-top: 0;
427 - box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.1);
428 - }
429 - li {
430 - border: 1px solid #DDD;
431 - padding: $-xs $-s;
432 - margin-top: -1px;
433 - min-height: 38px;
434 - &.text-chapter {
435 - border-left: 2px solid $color-chapter;
436 - }
437 - &.text-page {
438 - border-left: 2px solid $color-page;
439 - }
440 - }
441 - li:first-child {
442 - margin-top: $-xs;
443 - }
444 -}
445 17
446 // Jquery Sortable Styles 18 // Jquery Sortable Styles
447 .dragged { 19 .dragged {
...@@ -449,46 +21,16 @@ h1, h2, h3, h4, h5, h6 { ...@@ -449,46 +21,16 @@ h1, h2, h3, h4, h5, h6 {
449 opacity: 0.5; 21 opacity: 0.5;
450 z-index: 2000; 22 z-index: 2000;
451 } 23 }
452 -
453 body.dragging, body.dragging * { 24 body.dragging, body.dragging * {
454 cursor: move !important; 25 cursor: move !important;
455 } 26 }
456 27
457 -.sortable-page-list li.placeholder { 28 +// User Avatar Images
458 - position: relative;
459 -}
460 -.sortable-page-list li.placeholder:before {
461 - position: absolute;
462 -}
463 -
464 -.center-box {
465 - margin: 15vh auto 0 auto;
466 - padding: $-m $-xxl $-xl*2 $-xxl;
467 - max-width: 346px;
468 - &.login {
469 - background-color: #EEE;
470 - box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
471 - border: 1px solid #DDD;
472 - }
473 -}
474 -
475 -.activity-list-item {
476 - padding: $-s 0;
477 - color: #888;
478 - border-bottom: 1px solid #EEE;
479 - font-size: 0.9em;
480 - .left {
481 - float: left;
482 - }
483 - .left + .right {
484 - margin-left: 30px + $-s;
485 - }
486 -}
487 -
488 .avatar { 29 .avatar {
489 border-radius: 100%; 30 border-radius: 100%;
490 } 31 }
491 32
33 +// System wide notifications
492 .notification { 34 .notification {
493 position: fixed; 35 position: fixed;
494 top: 0; 36 top: 0;
...@@ -498,7 +40,7 @@ body.dragging, body.dragging * { ...@@ -498,7 +40,7 @@ body.dragging, body.dragging * {
498 background-color: #EEE; 40 background-color: #EEE;
499 border-radius: 3px; 41 border-radius: 3px;
500 box-shadow: $bs-med; 42 box-shadow: $bs-med;
501 - z-index: 99999999; 43 + z-index: 999999;
502 display: table; 44 display: table;
503 cursor: pointer; 45 cursor: pointer;
504 max-width: 480px; 46 max-width: 480px;
...@@ -522,59 +64,7 @@ body.dragging, body.dragging * { ...@@ -522,59 +64,7 @@ body.dragging, body.dragging * {
522 } 64 }
523 } 65 }
524 66
525 -.setting-nav { 67 +// Search results
526 - text-align: center;
527 - a {
528 - padding: $-m;
529 - display: inline-block;
530 - //color: #666;
531 - &.selected {
532 - //color: $primary;
533 - border-bottom: 2px solid $primary;
534 - }
535 - }
536 -}
537 -
538 -.dropdown-container {
539 - display: inline-block;
540 - vertical-align: top;
541 - position: relative;
542 -}
543 -ul.dropdown {
544 - display: none;
545 - position: absolute;
546 - z-index: 999;
547 - top: 0;
548 - left: 0;
549 - margin: $-m 0;
550 - background-color: #FFFFFF;
551 - list-style: none;
552 - box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
553 - border-radius: 1px;
554 - border: 1px solid #EEE;
555 - min-width: 180px;
556 - padding: $-xs 0;
557 - color: #555;
558 - a {
559 - display: block;
560 - padding: $-xs $-m;
561 - color: #555;
562 - &:hover {
563 - text-decoration: none;
564 - background-color: #EEE;
565 - }
566 - i {
567 - margin-right: $-m;
568 - padding-right: 0;
569 - display: inline;
570 - width: 22px;
571 - }
572 - }
573 - li.border-bottom {
574 - border-bottom: 1px solid #DDD;
575 - }
576 -}
577 -
578 .search-results > h3 a { 68 .search-results > h3 a {
579 font-size: 0.66em; 69 font-size: 0.66em;
580 color: $primary; 70 color: $primary;
......
...@@ -14,10 +14,9 @@ ...@@ -14,10 +14,9 @@
14 14
15 <!-- Scripts --> 15 <!-- Scripts -->
16 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> 16 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
17 - <script src="/js/jquery-extensions.js"></script>
18 - <script src="/bower/bootstrap/dist/js/bootstrap.js"></script>
19 <script src="/bower/jquery-sortable/source/js/jquery-sortable.js"></script> 17 <script src="/bower/jquery-sortable/source/js/jquery-sortable.js"></script>
20 <script src="/bower/dropzone/dist/min/dropzone.min.js"></script> 18 <script src="/bower/dropzone/dist/min/dropzone.min.js"></script>
19 + <script src="/js/common.js"></script>
21 <script src="/bower/vue/dist/vue.min.js"></script> 20 <script src="/bower/vue/dist/vue.min.js"></script>
22 <script src="/bower/vue-resource/dist/vue-resource.min.js"></script> 21 <script src="/bower/vue-resource/dist/vue-resource.min.js"></script>
23 22
...@@ -40,16 +39,16 @@ ...@@ -40,16 +39,16 @@
40 <header id="header"> 39 <header id="header">
41 <div class="container"> 40 <div class="container">
42 <div class="row"> 41 <div class="row">
43 - <div class="col-md-3"> 42 + <div class="col-md-4">
44 <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a> 43 <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a>
45 </div> 44 </div>
46 - <div class="col-md-3 text-right"> 45 + <div class="col-md-4 text-center">
47 <form action="/search/all" method="GET" class="search-box"> 46 <form action="/search/all" method="GET" class="search-box">
48 <input type="text" name="term" tabindex="2" value="{{ isset($searchTerm) ? $searchTerm : '' }}"> 47 <input type="text" name="term" tabindex="2" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
49 - <a onclick="$(this).closest('form').submit();"><i class="zmdi zmdi-search"></i></a> 48 + <button class="text-button"><i class="zmdi zmdi-search"></i></button>
50 </form> 49 </form>
51 </div> 50 </div>
52 - <div class="col-md-6"> 51 + <div class="col-md-4">
53 <div class="float right"> 52 <div class="float right">
54 <div class="links text-center"> 53 <div class="links text-center">
55 <a href="/books"><i class="zmdi zmdi-book"></i>Books</a> 54 <a href="/books"><i class="zmdi zmdi-book"></i>Books</a>
...@@ -63,7 +62,7 @@ ...@@ -63,7 +62,7 @@
63 <span class="user-name" data-dropdown-toggle> 62 <span class="user-name" data-dropdown-toggle>
64 {{ $currentUser->name }} <i class="zmdi zmdi-caret-down"></i> 63 {{ $currentUser->name }} <i class="zmdi zmdi-caret-down"></i>
65 </span> 64 </span>
66 - <ul class="dropdown"> 65 + <ul>
67 <li> 66 <li>
68 <a href="/users/{{$currentUser->id}}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-lg"></i>Edit Profile</a> 67 <a href="/users/{{$currentUser->id}}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-lg"></i>Edit Profile</a>
69 </li> 68 </li>
...@@ -80,32 +79,10 @@ ...@@ -80,32 +79,10 @@
80 </div> 79 </div>
81 </header> 80 </header>
82 81
83 - <section id="content"> 82 + <section id="content" class="block">
84 @yield('content') 83 @yield('content')
85 </section> 84 </section>
86 85
87 @yield('bottom') 86 @yield('bottom')
88 - <script>
89 - $(function() {
90 -
91 - $('.notification').click(function() {
92 - $(this).fadeOut(100);
93 - });
94 -
95 - // Dropdown toggles
96 - $('[data-dropdown-toggle]').click(function() {
97 - var toggleButton = $(this);
98 - var container = toggleButton.closest('[data-dropdown]');
99 - var dropdown = container.find('.dropdown');
100 - dropdown.show().addClass('anim menuIn');
101 -
102 - container.mouseleave(function() {
103 - dropdown.hide();
104 - dropdown.removeClass('anim menuIn');
105 - });
106 - });
107 -
108 - });
109 - </script>
110 </body> 87 </body>
111 </html> 88 </html>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 -<div class="page-content"> 5 +<div class="container small">
6 <h1>Create New Book</h1> 6 <h1>Create New Book</h1>
7 <form action="/books" method="POST"> 7 <form action="/books" method="POST">
8 @include('books/form') 8 @include('books/form')
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Delete Book</h1> 6 <h1>Delete Book</h1>
7 <p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p> 7 <p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p>
8 <p class="text-neg">Are you sure you want to delete this book?</p> 8 <p class="text-neg">Are you sure you want to delete this book?</p>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Edit Book</h1> 6 <h1>Edit Book</h1>
7 <form action="/books/{{$book->slug}}" method="POST"> 7 <form action="/books/{{$book->slug}}" method="POST">
8 <input type="hidden" name="_method" value="PUT"> 8 <input type="hidden" name="_method" value="PUT">
......
...@@ -24,10 +24,7 @@ ...@@ -24,10 +24,7 @@
24 <h1>Books</h1> 24 <h1>Books</h1>
25 @if(count($books) > 0) 25 @if(count($books) > 0)
26 @foreach($books as $book) 26 @foreach($books as $book)
27 - <div class="book"> 27 + @include('books/list-item', ['book' => $book])
28 - <h3><a href="{{$book->getUrl()}}">{{$book->name}}</a></h3>
29 - <p class="text-muted">{{$book->description}}</p>
30 - </div>
31 <hr> 28 <hr>
32 @endforeach 29 @endforeach
33 @else 30 @else
......
1 +<div class="book">
2 + <h3 class="text-book"><a class="text-book" href="{{$book->getUrl()}}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></h3>
3 + <p class="text-muted">{{$book->description}}</p>
4 +</div>
...\ No newline at end of file ...\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Create New Chapter</h1> 6 <h1>Create New Chapter</h1>
7 <form action="{{$book->getUrl()}}/chapter/create" method="POST"> 7 <form action="{{$book->getUrl()}}/chapter/create" method="POST">
8 @include('chapters/form') 8 @include('chapters/form')
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Delete Chapter</h1> 6 <h1>Delete Chapter</h1>
7 <p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed 7 <p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed
8 and added directly to the book.</p> 8 and added directly to the book.</p>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Edit Chapter</h1> 6 <h1>Edit Chapter</h1>
7 <form action="{{$chapter->getUrl()}}" method="POST"> 7 <form action="{{$chapter->getUrl()}}" method="POST">
8 <input type="hidden" name="_method" value="PUT"> 8 <input type="hidden" name="_method" value="PUT">
......
...@@ -30,11 +30,7 @@ ...@@ -30,11 +30,7 @@
30 30
31 <div class="container"> 31 <div class="container">
32 <div class="row"> 32 <div class="row">
33 - <div class="col-md-3"> 33 + <div class="col-md-8">
34 - @include('pages/sidebar-tree-list', ['book' => $book])
35 - </div>
36 - <div class="col-md-9">
37 - <div class="page-content">
38 <h1>{{ $chapter->name }}</h1> 34 <h1>{{ $chapter->name }}</h1>
39 <p class="text-muted">{{ $chapter->description }}</p> 35 <p class="text-muted">{{ $chapter->description }}</p>
40 36
...@@ -73,6 +69,8 @@ ...@@ -73,6 +69,8 @@
73 </p> 69 </p>
74 </div> 70 </div>
75 </div> 71 </div>
72 + <div class="col-md-3 col-md-offset-1">
73 + @include('pages/sidebar-tree-list', ['book' => $book])
76 </div> 74 </div>
77 </div> 75 </div>
78 76
......
...@@ -9,10 +9,7 @@ ...@@ -9,10 +9,7 @@
9 <h2>Books</h2> 9 <h2>Books</h2>
10 @if(count($books) > 0) 10 @if(count($books) > 0)
11 @foreach($books as $book) 11 @foreach($books as $book)
12 - <div class="book"> 12 + @include('books/list-item', ['book' => $book])
13 - <h3><a href="{{$book->getUrl()}}">{{$book->name}}</a></h3>
14 - <p class="text-muted">{{$book->description}}</p>
15 - </div>
16 <hr> 13 <hr>
17 @endforeach 14 @endforeach
18 @else 15 @else
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Delete Page</h1> 6 <h1>Delete Page</h1>
7 <p class="text-neg">Are you sure you want to delete this page?</p> 7 <p class="text-neg">Are you sure you want to delete this page?</p>
8 8
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </div> 17 </div>
18 18
19 19
20 - <div class="page-content"> 20 + <div class="container small">
21 <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1> 21 <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
22 22
23 @if(count($page->revisions) > 0) 23 @if(count($page->revisions) > 0)
......
...@@ -35,14 +35,6 @@ ...@@ -35,14 +35,6 @@
35 35
36 <div class="container"> 36 <div class="container">
37 <div class="row"> 37 <div class="row">
38 - <div class="col-md-3">
39 - @include('pages/sidebar-tree-list', ['book' => $book])
40 - <div class="side-nav faded">
41 - <h4>Page Navigation</h4>
42 - <ul class="page-nav-list">
43 - </ul>
44 - </div>
45 - </div>
46 <div class="col-md-9"> 38 <div class="col-md-9">
47 <div class="page-content anim fadeIn"> 39 <div class="page-content anim fadeIn">
48 @include('pages/page-display') 40 @include('pages/page-display')
...@@ -54,6 +46,14 @@ ...@@ -54,6 +46,14 @@
54 </p> 46 </p>
55 </div> 47 </div>
56 </div> 48 </div>
49 + <div class="col-md-3">
50 + @include('pages/sidebar-tree-list', ['book' => $book])
51 + <div class="side-nav faded">
52 + <h4>Page Navigation</h4>
53 + <ul class="page-nav-list">
54 + </ul>
55 + </div>
56 + </div>
57 </div> 57 </div>
58 </div> 58 </div>
59 59
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1> 6 <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
7 7
8 <ul class="sortable-page-list" id="sort-list"> 8 <ul class="sortable-page-list" id="sort-list">
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
4 4
5 @include('settings/navbar', ['selected' => 'settings']) 5 @include('settings/navbar', ['selected' => 'settings'])
6 6
7 - <div class="page-content"> 7 +<div class="container small">
8 +
8 <h1>Settings</h1> 9 <h1>Settings</h1>
9 10
10 <form action="/settings" method="POST"> 11 <form action="/settings" method="POST">
...@@ -23,6 +24,6 @@ ...@@ -23,6 +24,6 @@
23 </div> 24 </div>
24 </form> 25 </form>
25 26
26 - </div> 27 +</div>
27 28
28 @stop 29 @stop
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 3
4 @section('content') 4 @section('content')
5 5
6 - <div class="page-content"> 6 + <div class="container small">
7 <h1>Create User</h1> 7 <h1>Create User</h1>
8 8
9 <form action="/users/create" method="post"> 9 <form action="/users/create" method="post">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 + <div class="container small">
6 <h1>Delete User</h1> 6 <h1>Delete User</h1>
7 <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p> 7 <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
8 <p class="text-neg">Are you sure you want to delete this user?</p> 8 <p class="text-neg">Are you sure you want to delete this user?</p>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 18
19 19
20 20
21 - <div class="page-content"> 21 + <div class="container small">
22 22
23 <div class="row"> 23 <div class="row">
24 <div class="col-md-6"> 24 <div class="col-md-6">
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
5 5
6 @include('settings/navbar', ['selected' => 'users']) 6 @include('settings/navbar', ['selected' => 'users'])
7 7
8 - <div class="page-content"> 8 +
9 + <div class="container small">
9 <h1>Users</h1> 10 <h1>Users</h1>
10 @if($currentUser->can('user-create')) 11 @if($currentUser->can('user-create'))
11 <p> 12 <p>
......