@@ -57,39 +73,44 @@ class TableElement extends React.Component {
);
} else {
buttonToggle = (
-
- {buttonToggle}
-
-
-
-
-
+
+
+
+ {buttonToggle}
+
+
+
+
+
+
+
+
+
{metadata}
);
diff --git a/caravel/assets/javascripts/SqlLab/main.css b/caravel/assets/javascripts/SqlLab/main.css
index 0f637781746c..f130a162b43b 100644
--- a/caravel/assets/javascripts/SqlLab/main.css
+++ b/caravel/assets/javascripts/SqlLab/main.css
@@ -141,15 +141,12 @@ div.Workspace {
max-height: 600px;
box-shadow: rgba(0, 0, 0, 0.8) 5px 5px 25px
}
-.SqlLab {
- font-size: 12px;
-}
.SqlLab pre {
padding: 0px !important;
margin: 0px;
border: none;
- font-size: 11px;
- line-height: 125%;
+ font-size: 12px;
+ line-height: @line-height-base;
background-color: transparent !important;
}
@@ -238,14 +235,6 @@ div.tablePopover:hover {
.ace_content {
background-color: #f4f4f4;
}
-.ws-el > .ws-el-controls {
- opacity: 0;
- transition: visibility 0s, opacity 0.3s linear;
-}
-.ws-el:hover > .ws-el-controls {
- opacity: 1;
- transition: visibility 0s, opacity 0.3s linear;
-}
.SouthPane .tab-content {
padding-top: 10px;
diff --git a/caravel/assets/stylesheets/less/cosmo/variables.less b/caravel/assets/stylesheets/less/cosmo/variables.less
index 56ac8416fa1b..a90a65362e10 100644
--- a/caravel/assets/stylesheets/less/cosmo/variables.less
+++ b/caravel/assets/stylesheets/less/cosmo/variables.less
@@ -48,7 +48,7 @@
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
-@font-size-base: 15px;
+@font-size-base: 14px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
diff --git a/caravel/templates/caravel/welcome.html b/caravel/templates/caravel/welcome.html
index 80c8c05eaae4..bdc8f92a46b1 100644
--- a/caravel/templates/caravel/welcome.html
+++ b/caravel/templates/caravel/welcome.html
@@ -34,7 +34,7 @@
{{ _("Dashboards") }}