Commit a1ae9609 authored by Juorder Gonzalez's avatar Juorder Gonzalez Committed by Juorder Antonio

Merge pull request #256 from ZBoxApp/manager_beta_v2

enable again get config via parse rest api
parents 36198fff 33db3a3a
...@@ -46,14 +46,15 @@ const notFoundParams = { ...@@ -46,14 +46,15 @@ const notFoundParams = {
function preRenderSetup(callwhendone) { function preRenderSetup(callwhendone) {
const d1 = Client.getClientConfig( const d1 = Client.getClientConfig(
(data) => { (data) => {
const config = data.result || data;
if (!data) { if (!config) {
return; return;
} }
global.window.manager_config = data; global.window.manager_config = config;
if (data.debug) { if (config.debug) {
global.window.Client = Client; global.window.Client = Client;
global.window.Utils = Utils; global.window.Utils = Utils;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
} }
.inmodal .color-line { .inmodal .color-line {
border-radius: 4px 4px 0 0; border-top-left-radius: 4px;
} }
.modal-content { .modal-content {
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
.new-fields-list { .new-fields-list {
.listed-field { .listed-field {
margin: 8px 0 0 10px; margin-left: 10px;
margin-top: 8px;
input { input {
margin-right: 5px; margin-right: 5px;
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
> li { > li {
> a { > a {
border-radius: 4px 0 0 4px; border-top-left-radius: 4px;
margin-right: -1px; margin-right: -1px;
} }
} }
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
> li { > li {
> a { > a {
border-radius: 0 4px 4px 0; border-bottom-right-radius: 4px;
margin-left: -1px; margin-left: -1px;
} }
} }
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
margin-top: -1px; margin-top: -1px;
> a { > a {
border-radius: 0 0 4px 4px; border-bottom-left-radius: 4px;
} }
} }
} }
...@@ -120,7 +120,8 @@ ...@@ -120,7 +120,8 @@
.tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a,
.tabs-left > .nav-tabs .active > a:hover, .tabs-left > .nav-tabs .active > a:hover,
.tabs-left > .nav-tabs .active > a:focus { .tabs-left > .nav-tabs .active > a:focus {
border-color: $border-color transparent $border-color $border-color; border-color: $border-color;
border-right-color: transparent;
} }
.tabs-right > .nav-tabs > li > a:hover, .tabs-right > .nav-tabs > li > a:hover,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment