diff --git a/assets/stylesheets/editor-3/_codemirror.scss b/assets/stylesheets/editor-3/_codemirror.scss index a591874bc7..c58fbb0c56 100644 --- a/assets/stylesheets/editor-3/_codemirror.scss +++ b/assets/stylesheets/editor-3/_codemirror.scss @@ -47,7 +47,8 @@ color: $cError; } -.CodeMirror-error a { +.CodeMirror-error a, +.CodeMirror-warning a { color: $cWhite; } @@ -57,22 +58,20 @@ .CodeMirror-warning { display: flex; + align-items: self-start; + justify-content: flex-start; + margin: 0 0 24px; padding: $baseSize 16px; - border-top: 1px solid #3A484E; - background-color: #FDFFB2; - color: #2B3D43; + background-color: #27333A; + color: #FEB714; line-height: 16px; text-align: left; - margin: 0 0 24px 0; - border-radius: $halfBaseSize; - align-items: self-start; - justify-content: flex-start; } .CodeMirror-warning-icon__wrapper { + display: block; width: 16px; height: 16px; - display: block; margin-right: 8px; } diff --git a/assets/stylesheets/sessions/_variables.scss b/assets/stylesheets/sessions/_variables.scss index bbe1a511dc..56b0944ff2 100644 --- a/assets/stylesheets/sessions/_variables.scss +++ b/assets/stylesheets/sessions/_variables.scss @@ -19,4 +19,3 @@ $body-background: #FFF; $cPrincipal: #397DBA; $cSecondary: #2B6191; $cError: #DD4B39; -$cWarning: #FEFEDD; diff --git a/lib/assets/javascripts/builder/components/code-mirror/code-mirror-warning.tpl b/lib/assets/javascripts/builder/components/code-mirror/code-mirror-warning.tpl index 0875114505..b636f32652 100644 --- a/lib/assets/javascripts/builder/components/code-mirror/code-mirror-warning.tpl +++ b/lib/assets/javascripts/builder/components/code-mirror/code-mirror-warning.tpl @@ -12,5 +12,5 @@ -
<%= _t('editor.data.code-mirror.quota-data-services-warning') %>. <%= _t('editor.data.code-mirror.quota-data-services-warning-link') %>
+
<%= _t('editor.data.code-mirror.quota-data-services-warning') %> <%= _t('editor.data.code-mirror.quota-data-services-warning-link') %>
\ No newline at end of file diff --git a/lib/assets/javascripts/builder/components/code-mirror/code-mirror.tpl b/lib/assets/javascripts/builder/components/code-mirror/code-mirror.tpl index b270b03924..041079e581 100755 --- a/lib/assets/javascripts/builder/components/code-mirror/code-mirror.tpl +++ b/lib/assets/javascripts/builder/components/code-mirror/code-mirror.tpl @@ -2,9 +2,7 @@ -
- Warning Text -
+
<% if (tips) { %>
diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json index e1ce3cbf2b..3bfb816194 100644 --- a/lib/assets/javascripts/locale/en.json +++ b/lib/assets/javascripts/locale/en.json @@ -2395,8 +2395,8 @@ }, "code-mirror": { "tip": "CMD + S to apply your query. CTRL + Space to autocomplete.", - "quota-data-services-warning": "You're about to execute a Data Services function that will consume several credits. Therefore, we discourage its usage here", - "quota-data-services-warning-link": "You can read more about the Data Services API in our guides" + "quota-data-services-warning": "You're about to execute a Data Services function that will consume several credits. Therefore, we discourage its usage here.", + "quota-data-services-warning-link": "You can read more about the Data Services API in our guides." }, "notifier": { "sql-alter-loading": "Modifying tableā€¦", diff --git a/package.json b/package.json index 7dde91a7e7..a6fe415745 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.117-wds", + "version": "1.0.0-assets.117-wds-2", "description": "CARTO UI frontend", "repository": { "type": "git",