Skip to content
Snippets Groups Projects
Unverified Commit 94900225 authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix image/geojson assets, and consolidate them

parent c84ebc51
Branches
Tags
No related merge requests found
Showing
with 28 additions and 28 deletions
......@@ -199,7 +199,7 @@ export default class SettingsSlackForm extends Component {
Metabase
<RetinaImage
className="mx1"
src="/app/img/slack_emoji.png"
src="app/assets/img/slack_emoji.png"
width={79}
forceOriginalDimensions={false /* broken in React v0.13 */}
/>
......
......@@ -3,7 +3,7 @@
}
.CheckBg {
background-image: url('/app/components/icons/assets/header_rect.svg');
background-image: url('../assets/img/header_rect.svg');
background-repeat: repeat;
}
......
......@@ -243,25 +243,25 @@
.QueryError-image--noRows {
width: 120px;
height: 120px;
background-image: url('/app/img/no_results.svg');
background-image: url('../assets/img/no_results.svg');
}
.QueryError-image--queryError {
width: 120px;
height: 120px;
background-image: url('/app/img/no_understand.svg');
background-image: url('../assets/img/no_understand.svg');
}
.QueryError-image--serverError {
width: 120px;
height: 148px;
background-image: url('/app/img/blown_up.svg');
background-image: url('../assets/img/blown_up.svg');
}
.QueryError-image--timeout {
width: 120px;
height: 120px;
background-image: url('/app/img/stopwatch.svg');
background-image: url('../assets/img/stopwatch.svg');
}
.QueryError-message {
......
......@@ -63,11 +63,11 @@ export default class NewUserOnboardingModal extends Component {
<div className="pl4 pr4 pt4 pb1 border-bottom">
<h2>Just 3 things worth knowing</h2>
<p className="clearfix pt1"><img className="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_tables.png" />All of your data is organized in Tables. Think of them in terms of Excel spreadsheets with columns and rows.</p>
<p className="clearfix pt1"><img className="float-left mr2" width="40" height="40" src="app/assets/img/onboarding_illustration_tables.png" />All of your data is organized in Tables. Think of them in terms of Excel spreadsheets with columns and rows.</p>
<p className="clearfix"><img className="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_questions.png" />To get answers, you Ask Questions by picking a table and a few other parameters. You can visualize the answer in many ways, including cool charts.</p>
<p className="clearfix"><img className="float-left mr2" width="40" height="40" src="app/assets/img/onboarding_illustration_questions.png" />To get answers, you Ask Questions by picking a table and a few other parameters. You can visualize the answer in many ways, including cool charts.</p>
<p className="clearfix"><img className="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_dashboards.png" />You (and anyone on your team) can save answers in Dashboards, so you can check them often. It's a great way to quickly see a snapshot of your business.</p>
<p className="clearfix"><img className="float-left mr2" width="40" height="40" src="app/assets/img/onboarding_illustration_dashboards.png" />You (and anyone on your team) can save answers in Dashboards, so you can check them often. It's a great way to quickly see a snapshot of your business.</p>
</div>
<div className="px4 py2 text-grey-2 flex align-center">
{this.renderStep()}
......
......@@ -5,7 +5,7 @@ export default class Smile extends Component {
const styles = {
width: '48px',
height: '48px',
backgroundImage: 'url("app/components/icons/assets/smile.svg")',
backgroundImage: 'url("app/assets/img/smile.svg")',
}
return <div style={styles}></div>
}
......
......@@ -201,7 +201,7 @@ export var ICON_PATHS = {
},
x: 'm11.271709,16 l-3.19744231e-13,4.728291 l4.728291,0 l16,11.271709 l27.271709,2.39808173e-13 l32,4.728291 l20.728291,16 l31.1615012,26.4332102 l26.4332102,31.1615012 l16,20.728291 l5.56678976,31.1615012 l0.838498756,26.4332102 l11.271709,16 z',
"slack": {
img: "/app/img/slack.png"
img: "app/assets/img/slack.png"
}
};
......
......@@ -39,7 +39,7 @@ export default class DashboardsDropdown extends Component {
dashIcon: {
width: '105px',
height: '90px',
backgroundImage: 'url("/app/components/icons/assets/dash_empty_state.svg")',
backgroundImage: 'url("app/assets/img/dash_empty_state.svg")',
backgroundRepeat: 'no-repeat'
}
}
......
......@@ -106,7 +106,7 @@ export default class SharingPane extends Component<*, Props, State> {
<div className={cx("mb4 flex align-center", { disabled: !resource.public_uuid })}>
<RetinaImage
width={98}
src="/app/img/simple_embed.png"
src="app/assets/img/simple_embed.png"
forceOriginalDimensions={false}
/>
<div className="ml2 flex-full">
......@@ -122,7 +122,7 @@ export default class SharingPane extends Component<*, Props, State> {
>
<RetinaImage
width={100}
src="/app/img/secure_embed.png"
src="app/assets/img/secure_embed.png"
forceOriginalDimensions={false}
/>
<div className="ml2 flex-full">
......
......@@ -16,7 +16,7 @@ export default class WhatsAPulse extends Component {
<div className="mx4">
<RetinaImage
width={574}
src="/app/img/pulse_empty_illustration.png"
src="app/assets/img/pulse_empty_illustration.png"
forceOriginalDimensions={false}
/>
</div>
......
......@@ -43,7 +43,7 @@ const referenceSections = {
title: "Metrics are the official numbers that your team cares about",
adminMessage: "Defining common metrics for your team makes it even easier to ask questions",
message: "Metrics will appear here once your admins have created some",
image: "/app/img/metrics-list",
image: "app/assets/img/metrics-list",
adminAction: "Learn how to create metrics",
adminLink: "http://www.metabase.com/docs/latest/administration-guide/06-segments-and-metrics.html"
},
......@@ -63,7 +63,7 @@ const referenceSections = {
title: "Segments are interesting subsets of tables",
adminMessage: "Defining common segments for your team makes it even easier to ask questions",
message: "Segments will appear here once your admins have created some",
image: "/app/img/segments-list",
image: "app/assets/img/segments-list",
adminAction: "Learn how to create segments",
adminLink: "http://www.metabase.com/docs/latest/administration-guide/06-segments-and-metrics.html"
},
......@@ -82,7 +82,7 @@ const referenceSections = {
title: "Metabase is no fun without any data",
adminMessage: "Your databses will appear here once you connect one",
message: "Databases will appear here once your admins have added some",
image: "/app/img/databases-list",
image: "app/assets/img/databases-list",
adminAction: "Connect a database",
adminLink: "/admin/databases/create"
},
......
......@@ -11,7 +11,7 @@ const QUERY_BUILDER_STEPS = [
getPortalTarget: () => qs(".GuiBuilder"),
getModal: (props) =>
<div className="text-centered">
<RetinaImage className="mb2" forceOriginalDimensions={false} src="/app/img/qb_tutorial/question_builder.png" width={186} />
<RetinaImage className="mb2" forceOriginalDimensions={false} src="app/assets/img/qb_tutorial/question_builder.png" width={186} />
<h3>Welcome to the Query Builder!</h3>
<p>The Query Builder lets you assemble questions (or "queries") to ask about your data.</p>
<a className="Button Button--primary" onClick={props.onNext}>Tell me more</a>
......@@ -22,7 +22,7 @@ const QUERY_BUILDER_STEPS = [
getModalTarget: () => qs(".GuiBuilder-data"),
getModal: (props) =>
<div className="text-centered">
<RetinaImage id="QB-TutorialTableImg" className="mb2" forceOriginalDimensions={false} src="/app/img/qb_tutorial/table.png" width={157} />
<RetinaImage id="QB-TutorialTableImg" className="mb2" forceOriginalDimensions={false} src="app/assets/img/qb_tutorial/table.png" width={157} />
<h3>Start by picking the table with the data that you have a question about.</h3>
<p>Go ahead and select the "Orders" table from the dropdown menu.</p>
</div>,
......@@ -48,7 +48,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialFunnelImg"
src="/app/img/qb_tutorial/funnel.png"
src="app/assets/img/qb_tutorial/funnel.png"
width={135}
/>
<h3>Filter your data to get just what you want.</h3>
......@@ -81,7 +81,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialCalculatorImg"
src="/app/img/qb_tutorial/calculator.png"
src="app/assets/img/qb_tutorial/calculator.png"
width={115}
/>
<h3>Here's where you can choose to add or average your data, count the number of rows in the table, or just view the raw data.</h3>
......@@ -103,7 +103,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialBananaImg"
src="/app/img/qb_tutorial/banana.png"
src="app/assets/img/qb_tutorial/banana.png"
width={232}
/>
<h3>Add a grouping to break out your results by category, day, month, and more.</h3>
......@@ -131,7 +131,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialRocketImg"
src="/app/img/qb_tutorial/rocket.png"
src="app/assets/img/qb_tutorial/rocket.png"
width={217}
/>
<h3>Run Your Query.</h3>
......@@ -148,7 +148,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialChartImg"
src="/app/img/qb_tutorial/chart.png"
src="app/assets/img/qb_tutorial/chart.png"
width={160}
/>
<h3>You can view your results as a chart instead of a table.</h3>
......@@ -169,7 +169,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialBoatImg"
src="/app/img/qb_tutorial/boat.png" width={190}
src="app/assets/img/qb_tutorial/boat.png" width={190}
/>
<h3>Well done!</h3>
<p>That's all! If you still have questions, check out our <a className="link" target="_blank" href="http://www.metabase.com/docs/latest/users-guide/start">User's Guide</a>. Have fun exploring your data!</p>
......
......@@ -7,7 +7,7 @@ import L from "leaflet";
import { formatValue } from "metabase/lib/formatting";
const MARKER_ICON = L.icon({
iconUrl: "/app/img/pin.png",
iconUrl: "app/assets/img/pin.png",
iconSize: [28, 32],
iconAnchor: [15, 24],
popupAnchor: [0, -13]
......
......@@ -322,7 +322,7 @@ export default class Visualization extends Component<*, Props, State> {
: isDashboard && noResults ?
<div className={"flex-full px1 pb1 text-centered flex flex-column layout-centered " + (isDashboard ? "text-slate-light" : "text-slate")}>
<Tooltip tooltip="No results!" isEnabled={small}>
<img src="/app/img/no_results.svg" />
<img src="app/assets/img/no_results.svg" />
</Tooltip>
{ !small &&
<span className="h4 text-bold">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment