Skip to content
Snippets Groups Projects
Commit cc4b3161 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge branch 'master' into orgless

parents d7b3c9a3 d1d4133f
No related branches found
No related tags found
No related merge requests found
:root {
--canvas-bg-color: #fff;
--canvas-offset: 61px;
}
.Canvas {
position: absolute;
top: var(--canvas-offset);
margin-bottom: calc(var(--canvas-offset) * -1);
padding-bottom: var(--canvas-offset);
right: 0;
height: 100%;
overflow-y: scroll;
overflow-x: hidden;
background-color: var(--canvas-bg-color);
}
.Canvas--new .card-inner {
height: 200px;
}
.Canvas--new .Card {
padding-top: 1em;
}
.Canvas--new .Card-heading {
display: none;
}
@media screen and (--breakpoint-min-lg) {
.Canvas--new .card-inner {
height: auto;
}
}
:root {
--workspace-bg-color: #F4F6F8;
--workspace-border-color: #d9d9d9;
--workspace-offset: 61px;
}
.Workspace {
position: absolute;
left: 0;
top: var(--workspace-offset);
padding-bottom: var(--workspace-offset);
margin-bottom: calc(var(--workspace-offset) * -1);
overflow-y: scroll;
bottom: 0;
background-color: var(--workspace-bg-color);
border-left: 1px solid var(--workspace-border-color);
border-right: 1px solid var(--workspace-border-color);
z-index: 2;
box-shadow: 1px 0 2px rgba(0, 0, 0, .12);
}
@media screen and (--breakpoint-min-md) {
.Workspace {
box-shadow: none;
}
}
<div class="Workspace col-sm-11 col col-md-3 col-lg-3">
<div ng-transclude></div>
</div>
'use strict';
angular.module('corvus.components')
.directive('cvWorkspace', function () {
function link (scope, element, attrs) {
}
return {
restrict: 'E',
templateUrl: '/app/components/workspace/workspace.html',
transclude: true,
scope: {},
link: link
};
});
......@@ -59,7 +59,8 @@
setup-url
"\n\n"))
;; Attempt to browse URL on user's system; this will just fail silently if we can't do it
(browse-url setup-url)))
;(browse-url setup-url)
))
(defn init
......
(ns metabase.driver.mongo.util
"`*mongo-connection*`, `with-mongo-connection`, and other functions shared between several Mongo driver namespaces."
(:require [clojure.tools.logging :as log]
(:require [clojure.string :as s]
[clojure.tools.logging :as log]
[colorize.core :as color]
[monger.core :as mg]
[metabase.driver :as driver]))
......@@ -11,12 +12,12 @@
dbname]}
(str "mongodb://"
user
(when pass
(assert user "Can't have a password without a user!")
(when-not (s/blank? pass)
(assert (not (s/blank? user)) "Can't have a password without a user!")
(str ":" pass))
(when user "@")
(when-not (s/blank? user) "@")
host
(when port
(when-not (s/blank? (str port))
(str ":" port))
"/"
dbname))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment