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

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
9dc1b35e 1 parent 2dc1180a

Made settings ui a little less jumpy

Inline Side-by-side
Showing 3 changed files with 10 additions and 5 deletions
...@@ -15,7 +15,7 @@ module.exports = function (ngApp, events) { ...@@ -15,7 +15,7 @@ module.exports = function (ngApp, events) {
15 */ 15 */
16 ngApp.directive('toggleSwitch', function () { 16 ngApp.directive('toggleSwitch', function () {
17 return { 17 return {
18 - restrict: 'E', 18 + restrict: 'A',
19 template: toggleSwitchTemplate, 19 template: toggleSwitchTemplate,
20 scope: true, 20 scope: true,
21 link: function (scope, element, attrs) { 21 link: function (scope, element, attrs) {
......
...@@ -248,4 +248,9 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] { ...@@ -248,4 +248,9 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] {
248 248
249 .image-picker img { 249 .image-picker img {
250 background-color: #BBB; 250 background-color: #BBB;
251 +}
252 +
253 +div[toggle-switch] {
254 + height: 18px;
255 + width: 150px;
251 } 256 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
21 </div> 21 </div>
22 <div class="form-group"> 22 <div class="form-group">
23 <label>Allow public viewing?</label> 23 <label>Allow public viewing?</label>
24 - <toggle-switch name="setting-app-public" value="{{ setting('app-public') }}"></toggle-switch> 24 + <div toggle-switch name="setting-app-public" value="{{ setting('app-public') }}"></div>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 <label>Enable higher security image uploads?</label> 27 <label>Enable higher security image uploads?</label>
28 <p class="small">For performance reasons, all images are public by default, This option adds a random, hard-to-guess characters in front of image names. Ensure directory indexes are not enabled to prevent easy access.</p> 28 <p class="small">For performance reasons, all images are public by default, This option adds a random, hard-to-guess characters in front of image names. Ensure directory indexes are not enabled to prevent easy access.</p>
29 - <toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></toggle-switch> 29 + <div toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></div>
30 </div> 30 </div>
31 <div class="form-group"> 31 <div class="form-group">
32 <label for="setting-app-editor">Page editor</label> 32 <label for="setting-app-editor">Page editor</label>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <div class="col-md-6"> 61 <div class="col-md-6">
62 <div class="form-group"> 62 <div class="form-group">
63 <label for="setting-registration-enabled">Allow registration?</label> 63 <label for="setting-registration-enabled">Allow registration?</label>
64 - <toggle-switch name="setting-registration-enabled" value="{{ setting('registration-enabled') }}"></toggle-switch> 64 + <div toggle-switch name="setting-registration-enabled" value="{{ setting('registration-enabled') }}"></div>
65 </div> 65 </div>
66 <div class="form-group"> 66 <div class="form-group">
67 <label for="setting-registration-role">Default user role after registration</label> 67 <label for="setting-registration-role">Default user role after registration</label>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 <div class="form-group"> 78 <div class="form-group">
79 <label for="setting-registration-confirmation">Require email confirmation?</label> 79 <label for="setting-registration-confirmation">Require email confirmation?</label>
80 <p class="small">If domain restriction is used then email confirmation will be required and the below value will be ignored.</p> 80 <p class="small">If domain restriction is used then email confirmation will be required and the below value will be ignored.</p>
81 - <toggle-switch name="setting-registration-confirmation" value="{{ setting('registration-confirmation') }}"></toggle-switch> 81 + <div toggle-switch name="setting-registration-confirmation" value="{{ setting('registration-confirmation') }}"></div>
82 </div> 82 </div>
83 </div> 83 </div>
84 <div class="col-md-6"> 84 <div class="col-md-6">
......