diff --git a/NEWS.md b/NEWS.md index 428e9a1fd40e..1b6723465e34 100644 --- a/NEWS.md +++ b/NEWS.md @@ -50,6 +50,7 @@ cd lib/sql; sudo make all install * Added new fields source, attributions, and license, to metadata modal [#5016](https://github.com/CartoDB/cartodb/pull/5016) * Code related to pecan extracted to separate module [#4999](https://github.com/CartoDB/cartodb/pull/4999) * requires a `npm install` for grunt tasks +* New modals [#5068](https://github.com/CartoDB/cartodb/pull/5068) Bugfixes: * Fixed deletion of layers upon disconnecting synced datasources [#3718](https://github.com/CartoDB/cartodb/pull/3718) diff --git a/app/assets/images/layout/arcgis_disabled.png b/app/assets/images/layout/arcgis_disabled.png deleted file mode 100644 index 266521f4ac9b..000000000000 Binary files a/app/assets/images/layout/arcgis_disabled.png and /dev/null differ diff --git a/app/assets/images/layout/geocoding_result_icon.png b/app/assets/images/layout/geocoding_result_icon.png deleted file mode 100644 index 7917053c4b47..000000000000 Binary files a/app/assets/images/layout/geocoding_result_icon.png and /dev/null differ diff --git a/app/assets/images/layout/georeference_error.png b/app/assets/images/layout/georeference_error.png deleted file mode 100644 index e432e1fcc68f..000000000000 Binary files a/app/assets/images/layout/georeference_error.png and /dev/null differ diff --git a/app/assets/images/layout/georeference_points.png b/app/assets/images/layout/georeference_points.png deleted file mode 100644 index bbe039e358af..000000000000 Binary files a/app/assets/images/layout/georeference_points.png and /dev/null differ diff --git a/app/assets/images/layout/georeference_polygons.png b/app/assets/images/layout/georeference_polygons.png deleted file mode 100644 index 54ac9c353657..000000000000 Binary files a/app/assets/images/layout/georeference_polygons.png and /dev/null differ diff --git a/app/assets/images/layout/georeference_warning.png b/app/assets/images/layout/georeference_warning.png deleted file mode 100644 index 0658c2971dc0..000000000000 Binary files a/app/assets/images/layout/georeference_warning.png and /dev/null differ diff --git a/app/assets/images/layout/list.png b/app/assets/images/layout/list.png deleted file mode 100644 index b46442387323..000000000000 Binary files a/app/assets/images/layout/list.png and /dev/null differ diff --git a/app/assets/images/layout/loader_transparent_small.gif b/app/assets/images/layout/loader_transparent_small.gif deleted file mode 100644 index d964ffe9ef7e..000000000000 Binary files a/app/assets/images/layout/loader_transparent_small.gif and /dev/null differ diff --git a/app/assets/images/layout/map.png b/app/assets/images/layout/map.png deleted file mode 100644 index 7bdae052a0a2..000000000000 Binary files a/app/assets/images/layout/map.png and /dev/null differ diff --git a/app/assets/images/layout/mini-loader.gif b/app/assets/images/layout/mini-loader.gif deleted file mode 100644 index f2a1bc0c6f54..000000000000 Binary files a/app/assets/images/layout/mini-loader.gif and /dev/null differ diff --git a/app/assets/images/layout/plane.png b/app/assets/images/layout/plane.png deleted file mode 100644 index 7ecb210faa4f..000000000000 Binary files a/app/assets/images/layout/plane.png and /dev/null differ diff --git a/app/assets/images/layout/plane_locked.png b/app/assets/images/layout/plane_locked.png deleted file mode 100644 index 1ebced3a7808..000000000000 Binary files a/app/assets/images/layout/plane_locked.png and /dev/null differ diff --git a/app/assets/images/layout/tag.png b/app/assets/images/layout/tag.png deleted file mode 100644 index 3410c5a65d2e..000000000000 Binary files a/app/assets/images/layout/tag.png and /dev/null differ diff --git a/app/assets/images/layout/tag_locked.png b/app/assets/images/layout/tag_locked.png deleted file mode 100644 index d16bb2175faf..000000000000 Binary files a/app/assets/images/layout/tag_locked.png and /dev/null differ diff --git a/app/assets/images/layout/twitter_disabled.png b/app/assets/images/layout/twitter_disabled.png deleted file mode 100644 index 2a369472798f..000000000000 Binary files a/app/assets/images/layout/twitter_disabled.png and /dev/null differ diff --git a/app/assets/images/sprites/common/twitter_import_success.png b/app/assets/images/sprites/common/twitter_import_success.png deleted file mode 100644 index fa16bbe8e28a..000000000000 Binary files a/app/assets/images/sprites/common/twitter_import_success.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/background_loader_error.png b/app/assets/images/sprites/elements/background_loader_error.png deleted file mode 100644 index 49e60c426411..000000000000 Binary files a/app/assets/images/sprites/elements/background_loader_error.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/background_loader_ok.png b/app/assets/images/sprites/elements/background_loader_ok.png deleted file mode 100644 index 74b2b1f4e059..000000000000 Binary files a/app/assets/images/sprites/elements/background_loader_ok.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/calendar.png b/app/assets/images/sprites/elements/calendar.png deleted file mode 100644 index 4dcafe2305e0..000000000000 Binary files a/app/assets/images/sprites/elements/calendar.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/copy_button.png b/app/assets/images/sprites/elements/copy_button.png deleted file mode 100644 index bfd4bf72945d..000000000000 Binary files a/app/assets/images/sprites/elements/copy_button.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/create-tabs-icons.png b/app/assets/images/sprites/elements/create-tabs-icons.png deleted file mode 100644 index ec6837fc8874..000000000000 Binary files a/app/assets/images/sprites/elements/create-tabs-icons.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/droparea.png b/app/assets/images/sprites/elements/droparea.png deleted file mode 100644 index 10ce7178fd19..000000000000 Binary files a/app/assets/images/sprites/elements/droparea.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/paper_plane.png b/app/assets/images/sprites/elements/paper_plane.png deleted file mode 100644 index bede76529cd8..000000000000 Binary files a/app/assets/images/sprites/elements/paper_plane.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/question.png b/app/assets/images/sprites/elements/question.png deleted file mode 100644 index 43db3170de6e..000000000000 Binary files a/app/assets/images/sprites/elements/question.png and /dev/null differ diff --git a/app/assets/images/sprites/elements/twitter-logo-small-grey.png b/app/assets/images/sprites/elements/twitter-logo-small-grey.png deleted file mode 100644 index 733a6333a928..000000000000 Binary files a/app/assets/images/sprites/elements/twitter-logo-small-grey.png and /dev/null differ diff --git a/app/assets/images/sprites/table/download_blue.png b/app/assets/images/sprites/table/download_blue.png deleted file mode 100644 index 774cccf6989e..000000000000 Binary files a/app/assets/images/sprites/table/download_blue.png and /dev/null differ diff --git a/app/assets/images/sprites/table/download_dark.png b/app/assets/images/sprites/table/download_dark.png deleted file mode 100644 index bfaa0b67f865..000000000000 Binary files a/app/assets/images/sprites/table/download_dark.png and /dev/null differ diff --git a/app/assets/images/sprites/table/geocoding-tabs-icons.png b/app/assets/images/sprites/table/geocoding-tabs-icons.png deleted file mode 100644 index f882442193b7..000000000000 Binary files a/app/assets/images/sprites/table/geocoding-tabs-icons.png and /dev/null differ diff --git a/app/assets/stylesheets/common/create/listing/import_selected_dataset.css.scss b/app/assets/stylesheets/common/create/listing/import_selected_dataset.css.scss index 8edf5a95de7d..823d93fd2eb2 100644 --- a/app/assets/stylesheets/common/create/listing/import_selected_dataset.css.scss +++ b/app/assets/stylesheets/common/create/listing/import_selected_dataset.css.scss @@ -71,6 +71,9 @@ $br: 4px; @include display-flex(); @include align-items(center, center); } +.DatasetSelected-syncOptionsList--syncView { + margin-left: auto; +} .DatasetSelected-syncOptionsItem { margin-left: 24px } .DatasetSelected-syncOptionsItem .RadioButton-label { font-size: $sFontSize-normal } .UpgradeElement.DatasetSelected-upgrade { diff --git a/app/assets/stylesheets/common/dialog.css.scss b/app/assets/stylesheets/common/dialog.css.scss index 4c958b2a4f9a..45457f9278ae 100644 --- a/app/assets/stylesheets/common/dialog.css.scss +++ b/app/assets/stylesheets/common/dialog.css.scss @@ -2,6 +2,8 @@ @import "../variables/colors"; @import "../variables/sizes"; +$sSmallWidth: 670px; + /* set by base dialog */ body.is-inDialog { overflow: hidden; @@ -103,6 +105,9 @@ body.is-inDialog { padding-bottom: 0; overflow: auto; } +.Dialog-body.Dialog-body--small { + width: $sSmallWidth; +} .Dialog-Stretcher { width: $sLayout-width; @include display-flex(); @@ -132,6 +137,9 @@ body.is-inDialog { @include display-flex(); @include justify-content(center); } +.Dialog-footer--small { + width: $sSmallWidth; +} .Dialog-footerContent { @include display-flex(); @include justify-content(center); @@ -221,6 +229,9 @@ body.is-inDialog { white-space: nowrap; overflow: hidden; } +.Dialog-headerText--small { + width: $sSmallWidth; +} .Dialog-footerBtn { margin-right: $sMargin-element; } diff --git a/app/assets/stylesheets/common/icons/illustration-icon.css.scss b/app/assets/stylesheets/common/icons/illustration-icon.css.scss index babdf515b039..57e1d85712ec 100644 --- a/app/assets/stylesheets/common/icons/illustration-icon.css.scss +++ b/app/assets/stylesheets/common/icons/illustration-icon.css.scss @@ -1,6 +1,7 @@ @import "../../variables/mixins"; @import "../../variables/colors"; @import "../../variables/sizes"; +@import "../../map/map-sprite"; $cNeutral: $cHighlight-main; $cPositive: $cHighlight-positive; @@ -42,6 +43,16 @@ $cLingon: rgba(#AC638B, 1); .IllustrationIcon--royalDark { background-color: $cRoyalDark } .IllustrationIcon--magenta { background-color: $cMagenta } .IllustrationIcon--lingon { background-color: $cLingon } +.IllustrationIcon--geometryLine { + @include map-sprite(geometry_line); +} +.IllustrationIcon--geometryPoint { + @include map-sprite(geometry_point); +} +.IllustrationIcon--geometryPolygon { + @include map-sprite(geometry_polygon); +} + .IllustrationIcon-text { font-size: $sFontSize-smallUpperCase; diff --git a/app/assets/stylesheets/common/notifications-dropdown.css.scss b/app/assets/stylesheets/common/notifications-dropdown.css.scss index 67fd08e43450..49100bba9edb 100644 --- a/app/assets/stylesheets/common/notifications-dropdown.css.scss +++ b/app/assets/stylesheets/common/notifications-dropdown.css.scss @@ -25,7 +25,7 @@ border: 1px solid $cTypography-help; border-radius: 20px; font-size: $sFontSize-small; - line-height: $sLineHeight-small; + line-height: 17px; color: $cTypography-help; text-align: center; } @@ -60,7 +60,7 @@ @include align-items(center, center); background: none; } -.NotificationsList-item.is--new { +.NotificationsList-item.is-new { margin: 0 $sMargin-element $sMargin-element!important; padding: $sMargin-element 0 0 33px!important; border-top: 1px solid $cStructure-mainLine; @@ -73,62 +73,19 @@ } } -// Custom icons for different messages -.NotificationsList-item .iconFont-trial_ends_soon, -.NotificationsList-item .iconFont-custom { - line-height: 17px; - &:before { content: "\E001" } -} -.NotificationsList-item.is--new .iconFont-trial_ends_soon, -.NotificationsList-item.is--new .iconFont-custom { +.NotificationsList-item.is-new .NotificationsList-itemIcon--alert { color: $cHighlight-alert; border-color: $cHighlight-alert; } -.NotificationsList-item .iconFont-upgraded_message { - line-height: 17px; - &:before { content: "\E004" } -} -.NotificationsList-item.is--new .iconFont-upgraded_message { - color: $cHighlight-positive; - border-color: $cHighlight-positive; -} -.NotificationsList-item .iconFont-try_trial { - line-height: 17px; - &:before { content: "\E035" } -} -.NotificationsList-item.is--new .iconFont-try_trial { +.NotificationsList-item.is-new .NotificationsList-itemIcon--positive { color: $cHighlight-positive; border-color: $cHighlight-positive; } -.NotificationsList-item .iconFont-close_limits { - line-height: 17px; - &:before { content: "\E02D" } -} -.NotificationsList-item.is--new .iconFont-close_limits { - color: $cHighlight-alert; - border-color: $cHighlight-alert; -} -.NotificationsList-item .iconFont-limits_exceeded { - line-height: 17px; - &:before { content: "\E036" } -} -.NotificationsList-item.is--new .iconFont-limits_exceeded { +.NotificationsList-item.is-new .NotificationsList-itemIcon--negative { color: $cHighlight-negative; border-color: $cHighlight-negative; } -.NotificationsList-item .iconFont-new_dashboard { - line-height: 17px; - &:before { content: "\E016" } -} -.NotificationsList-item.is--new .iconFont-new_dashboard { +.NotificationsList-item.is-new .NotificationsList-itemIcon--main { color: $cHighlight-main; border-color: $cHighlight-main; } -.NotificationsList-item .iconFont-new_public_dashboard { - line-height: 17px; - &:before { content: "\E008" } -} -.NotificationsList-item.is--new .iconFont-new_public_dashboard { - color: $cHighlight-positive; - border-color: $cHighlight-positive; -} diff --git a/app/assets/stylesheets/common/sync_dialog.css.scss b/app/assets/stylesheets/common/sync_dialog.css.scss deleted file mode 100644 index 03b600b6c915..000000000000 --- a/app/assets/stylesheets/common/sync_dialog.css.scss +++ /dev/null @@ -1,9 +0,0 @@ -.SyncDialogDatasetSelected-syncOptionsList { - margin-left: auto; -} - -.Dialog-headerText.Dialog-headerText--small, -.Dialog-body.Dialog-body--small, -.Dialog-footer.Dialog-footer--small { - width: 670px; -} diff --git a/app/assets/stylesheets/editor/table_overrides.css.scss b/app/assets/stylesheets/editor/table_overrides.css.scss index a5622190b3cf..a7fe847762d5 100644 --- a/app/assets/stylesheets/editor/table_overrides.css.scss +++ b/app/assets/stylesheets/editor/table_overrides.css.scss @@ -21,17 +21,11 @@ div.vis_navigation nav a.tab { padding-bottom: 3px; font-weight: $sFontWeight-bold } -.metadata_dialog label { - margin: 0; - margin-bottom: 7px; -} div.table table tbody tr td div.cell, div.map .option-button, div.dropdown ul li a, .select2-results .select2-result-label, -.metadata_dialog label, -.metadata_dialog .hint, .form_spinner, .infowindow_panel .fields li .switches, .infowindow_panel .fields li.drag_field { @@ -46,5 +40,5 @@ div.legends_panel div.forms.panel_content .right .checkbox { margin-top:11px; li .Dialog-headerTitle, .Dialog-headerText, .IntermediateInfo-title { - font-family: 'Lato', sans-serif; // TODO: remove when old styles are deleted + font-family: 'Lato', sans-serif; // TODO: remove when old styles are deleted } diff --git a/app/assets/stylesheets/map/map.css.scss b/app/assets/stylesheets/map/map.css.scss index c95c7dfe19e9..07dded2fa809 100644 --- a/app/assets/stylesheets/map/map.css.scss +++ b/app/assets/stylesheets/map/map.css.scss @@ -82,7 +82,7 @@ div.map { @include border-radius(0); - .cartodb-logo { + .cartodb-logo { margin-bottom: 0px; bottom: 10px!important; } @@ -471,7 +471,7 @@ div.map { } - div.cartodb-layer-selector-box { + div.cartodb-layer-selector-box { display:none; font-weight: normal; margin: 0; @@ -497,7 +497,7 @@ div.map { } } - // Fullscreen + // Fullscreen div.cartodb-fullscreen { display:none; position:absolute; @@ -691,38 +691,7 @@ div.map { } // div.cartodb-map -section.block.noGeoRef { - background-color: #FFF0C1; - padding: 5px; - - .innerBlock { - background-color: white; - - .content { - color: #666; - line-height:120%; - } - - .foot { - border-top: 0; - padding-top: 0px; - - .cancel { - margin-top: 15px; - - a { text-decoration: underline; } - - } - } - - .enabled { display: block; } - - } // .innerBlock - -} // section.bloc.noGeoRef - /* FOOTER EDIT BUTTONS for infowindow */ - @mixin edit-bottom-states($x,$y,$c1,$c2,$c3,$c4) { @include background(sprite($map-sprites, infowindow-edit-tools, $offset-x: $x, $offset-y: $y) no-repeat, $c1); // IE @include background(sprite($map-sprites, infowindow-edit-tools, $offset-x: $x, $offset-y: $y) no-repeat, linear-gradient($c1,$c2) 0 0); @@ -866,17 +835,15 @@ div.cartodb-edit-buttons { border:1px solid #397DBA; } -:-webkit-full-screen { +:-webkit-full-screen { top: 0!Important; left: 0!Important; right: 0!Important; bottom: 0!Important; } -:-moz-full-screen { +:-moz-full-screen { top: 0!Important; left: 0!Important; right: 0!Important; bottom: 0!Important; } -:-ms-fullscreen { +:-ms-fullscreen { top: 0!Important; left: 0!Important; right: 0!Important; bottom: 0!Important; } -:fullscreen { +:fullscreen { top: 0!Important; left: 0!Important; right: 0!Important; bottom: 0!Important; } - - diff --git a/app/assets/stylesheets/map/scratch_dialog.css.scss b/app/assets/stylesheets/map/scratch_dialog.css.scss deleted file mode 100644 index 3eb34395972e..000000000000 --- a/app/assets/stylesheets/map/scratch_dialog.css.scss +++ /dev/null @@ -1,12 +0,0 @@ -@import "../map/map-sprite"; - -.IllustrationIcon--geometryLine { - @include map-sprite(geometry_line); -} -.IllustrationIcon--geometryPoint { - @include map-sprite(geometry_point); -} -.IllustrationIcon--geometryPolygon { - @include map-sprite(geometry_polygon); -} - diff --git a/app/assets/stylesheets/map/share_dialog.css.scss b/app/assets/stylesheets/map/share_dialog.css.scss deleted file mode 100644 index a37b655c467b..000000000000 --- a/app/assets/stylesheets/map/share_dialog.css.scss +++ /dev/null @@ -1,179 +0,0 @@ -/** - * share map dialog - */ -@import "compass/css3/box"; -@import "compass/css3/box-shadow"; -@import "compass/css3/border-radius"; -@import "compass/css3/inline-block"; -@import "compass/css3/transform"; -@import "compass/css3/opacity"; -@import "../old_common/vars"; -@import "../old_common/mixins"; -@import "../table/table-sprite"; - -.share_dialog { - - & > .mamufas > section.block { - top: auto; - margin-top: 0; - } - - section.block > .foot { - border:none; - } - - section.block.private > .content ul { - - li.link .input_field, - li.embed .input_field { - display: none; - } - - li.link h4, li.embed h4 { - top: 149px; - } - - li.link i { - width: 72px; - height: 68px; - background: transparent image-url('layout/plane_locked.png') no-repeat; - } - - li.embed i { - width: 75px; - height: 58px; - background: transparent image-url('layout/tag_locked.png') no-repeat; - } - - } - - section.block > .content { - - padding: 40px 40px 0 40px; - - h3 { margin: 0 0 5px 0; } - - ul { - margin: 38px 0 0 0; - width: 722px; - - @include display-flex(); - @include cross-browser(flex-direction, row); - @include cross-browser(justify-content, space-between); - - li { - position:relative; - width: 240px; - display:block; - - @include cross-browser(column-rule, 3px outset #ff00ff); - - height:280px; - background: #f1f1f1; - border:none; - - &:hover { - background:#E9E9E9; - @include simple-transition(background, 150ms, ease-in-out); - } - - &:first-child { @include border-radius(4px 0 0 4px); } - &:last-child { @include border-radius(0 4px 4px 0); } - - h4 { - width: 100%; - position:absolute; - top: 136px; - margin: auto; - text-align:center; - font-size: 17px; - font-weight:bold; - line-height:120%; - } - - .input_field { - @include absolute-landscape-center(183px); - top: 166px; - padding: 2px; - @include border-radius(4px); - background:#fff; - clear:both; - border: 1px solid #CCCCCC; - overflow: hidden; - - &.loading input { - background: image-url('layout/loader_transparent.gif') no-repeat 5px 50%; - } - - input { - min-height:17px; - float:left; - width: 142px; - border:none; - padding: 5px 5px; - color: #999999; - font-size: 13px; - background: transparent; - outline: none; - @include box-sizing(border-box); - } - - a.copy { - width:38px; - height: 25px; - float:right; - display: block; - @include box-sizing(border-box); - font-size:9px; - padding: 8px 7px; - text-align:center; - @include border-radius(2px); - text-transform: uppercase; - color: #fff; - background: #3B7EBB; - } - - } - - p { - top: 206px; - @include absolute-landscape-center(182px); - font-size:13px; - color: #666666; - text-align: center; - - a { text-decoration: underline; } - - } - - i { - top:43px; - @include absolute-landscape-center(64px); - display:block; - } - - &.link i { - top: 44px; - height: 60px; - background: transparent image-url('layout/plane.png') no-repeat; - } - - &.embed i { - top: 54px; - height: 40px; - background: transparent image-url('layout/tag.png') no-repeat; - } - - &.api i { - top: 47px; - height: 54px; - background: transparent image-url('layout/map.png') no-repeat; - } - - } - - } - - } - -} diff --git a/app/assets/stylesheets/old_elements/all_tags_dialog.css.scss b/app/assets/stylesheets/old_elements/all_tags_dialog.css.scss deleted file mode 100644 index 79cff896be41..000000000000 --- a/app/assets/stylesheets/old_elements/all_tags_dialog.css.scss +++ /dev/null @@ -1,36 +0,0 @@ - - /** - * All tags dialog - */ - - @import "compass/css3/inline-block"; - - .all_tags .modal div.content { - overflow:auto; - max-height:250px; - - ul { - display:block; - width:100%; - letter-spacing: -4px; - word-spacing: -4px; - - li { - @include inline-block(); - vertical-align: top; - width:190px; - margin:0 10px 0 0; - padding:9px 0; - letter-spacing: 0px; - word-spacing: 0px; - - a { - display:block; - width:100%; - color:#666666; - font-size:15px; - &.dark {color:#333333;} - } - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/asset_manager.css.scss b/app/assets/stylesheets/old_elements/asset_manager.css.scss deleted file mode 100644 index b0bc76863dc7..000000000000 --- a/app/assets/stylesheets/old_elements/asset_manager.css.scss +++ /dev/null @@ -1,203 +0,0 @@ - - /** - * Asset manager loader - */ - - @import "compass/css3/inline-block"; - @import "compass/css3/opacity"; - @import "compass/css3/images"; - @import "../old_common/mixins"; - - - .asset_manager { - - div.content > div {display:block; margin:0;} - - // Hide uploader and ok button from the beginning - div.uploader, a.ok { display:none } - - // Assets styles - div.assets { - position:relative; - margin-bottom:10px; - - label { - font-weight:bold; - font-size:11px; - color: #CCCCCC; - letter-spacing: 0; - } - - ul.assets-list { - position:relative; - display:block; - height:auto; - max-height:210px; - padding-left:5px; - margin:20px 0 0 0; - overflow: auto; - } - - - .scroll { - position:absolute; - left:0; - display:none; - right:5px; - width:100%; - height:10px; - padding:0; - margin:0; - @include border-radius(0); - z-index:10; - pointer-events:none; - - &.top { - top:33px; - @include background(linear-gradient(white, rgba(white,0))); - } - &.bottom { - bottom:0px; - @include background(linear-gradient(rgba(white,0),white)); - } - } - - .assets-item { - position:relative; - @include inline-block(); - width:42px; - height:41px; - margin:0 3px 3px 0; - border:1px solid #C0C0C0!important; - @include border-radius(3px); - overflow: hidden; - background: image-url("layout/loader_transparent_small.gif") no-repeat center; - - &:nth-child(14n) { margin-right:0 } - - a.image { - @include inline-block(); - width:42px; - height:42px; - @include border-radius(3px); - text-align: center; - line-height: 42px; - background-repeat: no-repeat; - background-position: center; - } - - a.delete { - @include size(14px, 10px); - @include position(false, 0, 0, false); - @include simple-transition(opacity, 100ms); - padding: 0; - background:#333; - text-indent:0; - @include border-top-left-radius(2px); - @include border-bottom-right-radius(2px); - background:rgba(black,0.5); - z-index:2; - @include opacity(0); - - &:before { - position:absolute; - content:' '; - top:4px; - left:4px; - width:0; - height:0; - border-left:3px solid transparent; - border-right:3px solid transparent; - border-top:3px solid white; - } - } - - &:hover { - a.delete { - display:block; - @include opacity(1); - } - } - - // item states - &.is-selected { - width:40px; - height:39px; - border:2px solid #0F0F0F!important; - - a.image { - top: -1px; - left: -1px; - } - - a.delete { - right: -1px; - bottom: -1px; - } - } - - &.is-destroying { - div.loader {display:block!important;} - - &:hover { - a.delete {display:none} - } - } - - - // different asset types - - // -> simple icons - &.simpleicon a { - background-size: auto 24px!important; - } - - // -> pin maps - &.pin-maps a { - background-size: auto 24px!important; - } - } - } - - // Tabs style - .upload-tab { - margin:0; // Reset - margin-left:-1px; - - &.right { - float:right; - margin-right:-1px; - } - } - - div.loader { - padding:28px 0 20px; - @include background(image-url('layout/loader.gif') no-repeat center top); - p {text-align:center;} - } - - .disclaimer { - display:block; - margin:20px 0 5px 5px; - color:#666666; - @include border-radius(3px); - font-size:13px; - - sup { - position: relative; - vertical-align: baseline; - top: -6px; - font-size:9px; - } - - a { - color:#666; - text-decoration:underline; - &:hover { color:#333 } - } - } - - div.assets-list { - display:none; - } - } diff --git a/app/assets/stylesheets/old_elements/background_importer.css.scss b/app/assets/stylesheets/old_elements/background_importer.css.scss deleted file mode 100644 index 4a38d6374bb4..000000000000 --- a/app/assets/stylesheets/old_elements/background_importer.css.scss +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Awesomico loader after uploading a table - */ - -@import "compass/css3/background-size"; -@import "../old_elements/elements-sprite"; -@import "../old_common/mixins"; - -.background_importer{ - position: fixed; - z-index: 100; - background: white; - bottom: -100px; - left: 20px; - padding: 8px 12px 8px 8px; - border: solid 1px #CCC; - @include border-radius(5px); - @include box-shadow(rgba(black, 0.2) 0 0 5px); - - span{ - font-size: 15px; - color: #333; - letter-spacing: 0px; - margin: 0 7px 0 0; - - &.tip { - color: #999; - margin: 0 0 0 7px; - } - - &.ok{ - padding: 0 0 0 22px; - @include elements-sprite(background_loader_ok); - margin:0; - } - - &.error{ - padding: 0 0 0 22px; - @include elements-sprite(background_loader_error); - margin:0; - color:#EB2466; - - a { - color:#EB2466; - text-decoration:underline; - &:hover {color:#C61D54;} - } - } - - } - - .mini-bar { - position:relative; - top: 1px; - @include size(120px, 10px); - @include border-radius(2px); - - background: transparent; - display:inline-block; - - span { - display:block; - @include size(100%); - @include box-sizing(border-box); - @include background-size(20px 20px); - @include border-radius(2px); - - background-color:#5DA1D6; - background-image:-webkit-linear-gradient( -45deg, rgba(85, 128, 197, 1) 25%, transparent 25%, transparent 50%, rgba(85, 128, 197, 1) 50%, rgba(85, 128, 197, 1) 75%, transparent 75%, transparent); - background-image:-moz-linear-gradient( -45deg, rgba(85, 128, 197, 1) 25%, transparent 25%, transparent 50%, rgba(85, 128, 197, 1) 50%, rgba(85, 128, 197, 1) 75%, transparent 75%, transparent); - background-image:-ms-linear-gradient( -45deg, rgba(85, 128, 197, 1) 25%, transparent 25%, transparent 50%, rgba(85, 128, 197, 1) 50%, rgba(85, 128, 197, 1) 75%, transparent 75%, transparent); - background-image:linear-gradient( -45de rgba(85, 128, 197, 1) 25%, transparent 25%, transparent 50%, rgba(85, 128, 197, 1) 50%, rgba(85, 128, 197, 1) 75%, transparent 75%, transparent); - - -webkit-animation:move 1s linear infinite; - -moz-animation:move 1s linear infinite; - -ms-animation:move 1s linear infinite; - animation:move 1s linear infinite; - overflow: hidden; - } - } -} - -@-webkit-keyframes move{ - 0% {background-position: 0 0;} - 100% {background-position: 20px 20px;} -} -@-moz-keyframes move{ - 0% {background-position: 0 0;} - 100% {background-position: 20px 20px;} -} -@-ms-keyframes move{ - 0% {background-position: 0 0;} - 100% {background-position: 20px 20px;} -} -@keyframes move{ - 0% {background-position: 0 0;} - 100% {background-position: 20px 20px;} -} diff --git a/app/assets/stylesheets/old_elements/basemap_dialog.css.scss b/app/assets/stylesheets/old_elements/basemap_dialog.css.scss deleted file mode 100644 index 8046fcc56a54..000000000000 --- a/app/assets/stylesheets/old_elements/basemap_dialog.css.scss +++ /dev/null @@ -1,275 +0,0 @@ - - -/** - * Styles for basemap chooser dialog - */ - -@import "compass/css3/inline-block"; -@import "../old_common/vars"; -@import "../old_common/form-elements"; -@import "../old_common/mixins"; -@import "../old_common/common-sprite"; - -// Upload tabs -.basemap-tabs { - display: block; - height: 38px; - padding-left: 5px; - border-bottom: 1px solid #ccc; -} - -// Single basemap tab -.basemap-tab { - position:relative; - float: left; - margin: 0 0 25px -1px; - border-bottom:0!important; - - a { - display: block; - line-height: 37px; - padding: 0 15px; - border: 1px solid #ccc; - border-bottom: 1px solid #ccc; - background: #fff; - @include border-top-radius(5px); - - &.selected { - border-bottom-color: #fff; - color: #333; - - &:hover { - text-decoration: none; - cursor: default; - } - } - } -} - -.basemap_chooser { - position:relative; - margin:30px 0 20px 0; - - @include default-form-info(); - - .info { - margin-left: 5px; - } - - div.input { - position:relative; - display:block; - border:1px solid #CCCCCC; - margin: 0 0 0 5px; - @include border-radius(3px); - height:25px; - padding:10px 15px; - z-index:1; - background:white; - - &.active { - outline:none; - border-color:#999999; - @include box-shadow(rgba(0,0,0,0.1) 0 0 2px 2px); - } - - div.loader { - position:absolute; - display:none; - top:12px; - left:12px; - height:24px; - width:24px; - @include background(image-url('layout/mini-loader.gif') no-repeat center center white); - } - - span.type { - @include inline-block(); - vertical-align:top; - width:24px; - height:25px; - margin:0 8px 0 0; - padding:0; - @include common-sprite(file_type, $offset-y:-48px); - border-right:1px solid #CCCCCC; - } - - input[type="text"] { - @include inline-block(); - vertical-align:middle; - width:355px; - margin-top:2px; - border:none; - font:italic 15px $text-fonts2; - color: #666; - line-height:normal; - - &::-webkit-input-placeholder { - font-style:italic; - color:#CCC; - } - - &:-moz-placeholder { - font-style:italic; - color:#CCC; - } - - &.error { - color:rgba(red,0.5); - } - - &:focus {outline:none;} - } - } -} - -.basemap_chooser_mapbox { - div.input.access_token { - margin: 10px 0 0 5px; - } -} - -.basemap_chooser_wms_items { - border-bottom: 1px solid #ccc; - position: relative; - min-height: 233px; - margin-left: 5px; - - li { - padding: 24px 0; - width: 405px; - clear:both; overflow:hidden; - - &.invalid { - .button { - margin: 4px 0 0 0; - } - p { - color: #999; - } - strong { - margin: 0 0 3px 0; - color: #999; - } - } - - } - - .button { - float: right; - } - - .msg { - display:block; - float:left; - - strong { - @include inline-block(); - margin: 5px 0 3px 0; - width: 300px; - line-height: normal; - @include text-overflow(); - } - - p { - font-size: 12px; - color: #666; - width: 300px; - } - - } - - .scroll { - position:absolute; - left:0; - right:5px; - width:100%; - height:30px; - background:transparent; - padding:0; - margin:0; - @include border-radius(0); - pointer-events:none; - z-index:10; - - &.top {top:0; @include background(linear-gradient(rgba(white,1), rgba(white,0)));} - &.bottom {bottom:0px; @include background(linear-gradient(rgba(white,0), rgba(white,1)));} - } -} - - - -.basemap_chooser_dialog .scrollpane, -.basemap_chooser .scrollpane { - position: absolute; - overflow: hidden; - outline:none; - max-height: 233px; - width: 100%; - - &:hover .jspVerticalBar { @include opacity(1); } - - .jspContainer { overflow: hidden; position: relative; } - .jspPane { position: absolute; padding-bottom: 0;} - .jspVerticalBar { @include transition(opacity, 150ms); @include opacity(0); position: absolute; top: 0; right: 7px; width: 5px; height: 100%; background: none; z-index: 20; } - .jspVerticalBar * { margin: 0; padding: 0; } - .jspCap { display: none; } - .jspTrack { background: none; position: relative; } - .jspDrag { background: rgba(#666, .3); @include border-radius(5px); position: relative; top: 0; left: 0; cursor: pointer; } - .jspArrow { background: none; text-indent: -20000px; display: block; cursor: pointer; } - .jspVerticalBar .jspArrow { height: 10px; } - .jspVerticalBar .jspArrow:focus { outline: none; } - .jspCorner { background: #eeeef4; float: left; height: 100%; } -} - -.basemap_chooser_dialog .mamufas section.modal.compressed div.content { padding-bottom: 0; } - - -// NASA basemap pane - -.basemap-pane.nasa-pane { - - p.disclaimer { - padding:0 0 15px 15px; - font-size:13px; - } - - div.date { - float:right; - @include inline-block(); - margin-top:1px; - } - - div.type { - float:left; - @include inline-block(); - margin-top:1px; - } - - input.url { display:none!important } - - div.column { - @include inline-block(); - &.time_field { display:none } - } -} - - -// Proxy loader - -.wms-proxy-loader { - display:block; - padding:80px 0; - - .loader { - display:block; - height:24px; - @include background(image-url('layout/loader.gif') no-repeat center center white); - } - - p { - margin-top:15px; - padding:0 60px; - text-align:center; - } -} diff --git a/app/assets/stylesheets/old_elements/common_users_list.css.scss b/app/assets/stylesheets/old_elements/common_users_list.css.scss deleted file mode 100644 index ea346e7c659a..000000000000 --- a/app/assets/stylesheets/old_elements/common_users_list.css.scss +++ /dev/null @@ -1,85 +0,0 @@ - - /** - * Common users list styles - * - Showing: - * - * · Avatar - * · Username - * · Other info (visualizations, description, etc) - * - */ - - @import "compass/css3/border-radius"; - @import "compass/css3/images"; - @import "../old_common/mixins"; - - - .common-users-list { - - div.list-wrapper { - position:relative; - display:block; - } - - ul { - display:block; - max-height:170px; - overflow-x:hidden; - overflow-y:auto; - margin-top:20px; - - li { - @include display-flex(); - @include justify-content(space-between, justify); - @include align-items(center, center); - padding:14px 0; - } - - div.info { - @include display-flex(); - @include justify-content(flex-start, start); - @include align-items(center, center); - } - - div.visualizations { - max-width:48% - } - - img { - width:18px; - height:18px; - margin-right:9px; - @include border-radius(18px); - } - - h5 { - font-weight:normal; - color:#666666; - } - - } - - // Gradients for scroll purposes - .scroll { - position:absolute; - left:0; - right:5px; - width:100%; - height:10px; - padding:0; - margin:0; - @include border-radius(0); - z-index:10; - pointer-events:none; - - &.top { - top:0; - @include background(linear-gradient(white, rgba(white,0))); - } - &.bottom { - bottom:0px; - @include background(linear-gradient(rgba(white,0),white)); - } - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/copy.css.scss b/app/assets/stylesheets/old_elements/copy.css.scss deleted file mode 100644 index a5b8f1509aa8..000000000000 --- a/app/assets/stylesheets/old_elements/copy.css.scss +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copy "input" funcionality - style - * Syntax: - * div.copy - * label - * p - * a.copy - */ - - -@import "../old_common/mixins"; -@import "../old_common/form-elements"; -@import "../old_elements/elements-sprite"; - -div.copy { - position:relative; - display:block; - - @include default-input(); - - label {display:block;} - - input { - display:block; - padding-top:14px; - padding-bottom:14px; - @include border-radius(3px); - line-height:normal; - border:1px solid #CCCCCC; - background:#F5F5F5; - text-overflow:ellipsis; - overflow:hidden; - white-space:nowrap; - font-size:15px; - - &:hover { - border-color:#999999; - } - } - - a.copy { - position:absolute; - bottom:10px; - right:10px; - width:26px; - height:27px; - @include text-indent(); - @include elements-sprite(copy_button); - z-index:3; - &.hover {@include elements-sprite(copy_button, $offset-y:-27px);} - &.focus {@include elements-sprite(copy_button,$offset-y:-27px);} - &.active {@include elements-sprite(copy_button,$offset-y:-54px);} - } - -} diff --git a/app/assets/stylesheets/old_elements/create_dialog.css.scss b/app/assets/stylesheets/old_elements/create_dialog.css.scss deleted file mode 100644 index 4dbb7914e954..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog.css.scss +++ /dev/null @@ -1,102 +0,0 @@ - - /* - * Create modal dialog styles! - */ - - - @import "../old_common/mixins"; - @import "../old_common/form-elements"; - @import "../old_elements/elements-sprite"; - - - // Big mamufas css - div.drag_mamufas { - position:fixed; - top:0; - left:0; - right:0; - bottom:0; - display:none; - background:rgba(black,0.5); - z-index:10; - - span { - position:absolute; - top:50%; - left:50%; - width:160px; - height:160px; - margin:-160px 0 0 -80px; - @include elements-sprite(droparea); - } - - p { - position:absolute; - top:50%; - left:50%; - width:240px; - margin:20px 0 0 -120px; - color:rgba(white,0.4); - text-align:center; - } - - div.mask { - position:absolute; - top:0; - left:0; - right:0; - bottom:0; - width:100%; - height:100%; - background:none; - display:block; - z-index:1; - } - } - - section.creation { - position:relative; - - div.content { - overflow:hidden; - min-height:50px; - padding-bottom:20px; - - div.dialog-panes { - position:relative; - display:block; - } - - .dialog-tabs li { border-bottom:none } - li.dialog-tab { margin-bottom:25px } - - .dialog-pane {display:none; margin-left:20px;} - .dialog-tab.active .dialog-pane { display:block } - - .dialog-upload-pane { - // margin-bottom:50px; - } - } - - div.foot { - - p.left { - width:285px; - } - - p.info { - position:relative; - top: 10px; - width: 307px; - font-size: 11px; - color: #999999; - - a { text-decoration: underline; } - } - - a.green.button.ok { - font-size:17px; - font-weight:normal; - } - } - } diff --git a/app/assets/stylesheets/old_elements/create_dialog/create_dialog.css.scss b/app/assets/stylesheets/old_elements/create_dialog/create_dialog.css.scss deleted file mode 100644 index c6db83b3988e..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/create_dialog.css.scss +++ /dev/null @@ -1,82 +0,0 @@ - - /** - * Create dialog styles (v2) - */ - - @import "compass/css3/inline-block"; - @import "compass/css3/transform"; - @import "compass/css3/transition"; - @import "compass/css3/inline-block"; - @import "compass/css3/opacity"; - @import "../../old_common/mixins"; - @import "../../old_common/vars"; - - - section.create-dialog { - - div.head { - padding:0 40px 30px; - border:none; - - h3 { - @include inline-block(); - width:100%; - margin:40px 0 10px; - font-size: 15px; - font-weight:normal; - font-family: $text-fonts2; - text-align: center; - color:#CCCCCC; - letter-spacing:0; - @include transform-style("linear"); - @include transition-property("opacity,margin"); - @include transition-duration(200ms); - - &.disabled { - @include opacity(0); - margin:0px; - } - } - } - - div.content { - padding:0; - } - - div.foot { - @include display-flex(); - @include justify-content(flex-end, end); - padding:0 40px 40px; - background:#F6F6F6; - border-top:none; - @include border-bottom-radius(3px); - - .info { - position:absolute; - bottom:0; - left:0; - width:320px; - margin-top:8px; - font-size:11px; - color:#999999; - } - - &.to_right { - @include justify-content(flex-end, end); - } - - &.middle { - @include justify-content(center, center); - } - - a.ok { - @include inline-block(); - - &.green { - font-weight:400; - font-size:17px; - } - } - } - - } diff --git a/app/assets/stylesheets/old_elements/create_dialog/create_dialog_content.css.scss b/app/assets/stylesheets/old_elements/create_dialog/create_dialog_content.css.scss deleted file mode 100644 index 9134e8d64cbb..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/create_dialog_content.css.scss +++ /dev/null @@ -1,537 +0,0 @@ - - /** - * Create dialog content styles - * - * - Tabs styles - * - Panes styles - * - */ - - @import "compass/css3/background-size"; - @import "compass/css3/inline-block"; - @import "compass/css3/opacity"; - @import "compass/css3/images"; - @import "compass/css3/transform"; - @import "compass/css3/transition"; - @import "../../old_common/mixins"; - @import "../../old_common/vars"; - @import "../../old_elements/elements-sprite"; - @import "../../old_elements/progress-bar"; - @import "../../old_common/common-sprite"; - - - /////////// - // Tabs! // - /////////// - - .create-tabs-navigation { - display:block; - padding:34px 0 30px; - text-align:center; - @include transform-style("linear"); - @include transition-property("padding"); - @include transition-duration(250ms); - - li { - @include inline-block(); - border:none!important; - } - - a { - color:#666666; - - &.selected { - color:#CCCCCC; - text-decoration:underline; - cursor:default; - } - } - - // Enable/disable - &.disabled { - @include opacity(0); - padding-top:0; - } - } - - .create-tabs-wrapper { - display:block; - overflow-x:hidden; - overflow-y:visible; - } - - .create-tabs { - position:relative; - // Arg!!!!important :() - display: -webkit-box!important; - display: -moz-box!important; - display: -ms-flexbox!important; - display: -webkit-flex!important; - display: flex!important; - @include justify-content(space-between, justify); - @include align-items(center, center); - width:200%; - z-index:1; - - border-bottom:1px solid #CCCCCC; - } - - // Types of tabs - .create-tabs > div { - @include display-flex(); - @include justify-content(center, center); - @include align-items(center, center); - width:100%; - } - - .create-tab { - position:relative; - width:90px; - height:104px; - border:none!important; - - &.success { display:none } - - a { - @include display-flex(); - @include cross-browser(flex-direction,column); - @include align-items(center,center); - font-size:13px; - text-align:center; - @include transform-style("linear"); - @include transition-property("opacity,margin"); - @include transition-duration(450ms); - - span { display:block } - - // TYPES - &.error { - @include opacity(0); - margin-top:10px; - color:#FF7272!important; - font-size:15px; - } - - // Disabled state - &.disabled { - @include opacity(0.5); - text-decoration: none; - - &:hover { cursor:default } - } - - // Selected state - &.selected { - color:black; - text-decoration: none; - - &:hover { - cursor:default; - color:inherit; - color:black; - } - - &:before, &:after { - content: ''; - position:absolute; - left:50%; - width:0; - height:0; - margin-left:-18px; - border-left:18px solid transparent; - border-right:18px solid transparent; - } - - &:before { - bottom:0; - border-bottom:18px solid #CCC; - z-index:1; - } - - &:after { - bottom:-1px; - border-bottom:18px solid #F6F6F6; - z-index:2; - } - } - - // Show state - &.show { - margin-top:0px; - @include opacity(1); - z-index:1; - } - - // Hide state - &.hide { - margin-top:-30px; - @include opacity(0); - z-index:0; - } - } - - // Create icon - .create-icon { - @include inline-block(); - width:29px; - height:38px; - margin-bottom:18px; - - &.file { @include elements-sprite(create-tabs-icons) } - - &.gdrive { - width:40px; - @include elements-sprite(create-tabs-icons, $offset-x:-29px); - } - - &.dropbox { - width:40px; - @include elements-sprite(create-tabs-icons, $offset-x:-69px); - } - - &.twitter { - width:41px; - @include elements-sprite(create-tabs-icons, $offset-x:-109px); - } - - &.scratch { - width:29px; - @include elements-sprite(create-tabs-icons, $offset-x:-150px); - } - - &.layer { - width:32px; - @include elements-sprite(create-tabs-icons, $offset-x:-179px); - } - - &.arcgis { - width:37px; - height:40px; - @include elements-sprite(create-tabs-icons, $offset-x:-253px); - } - - &.salesforce { - width:50px; - height:40px; - @include elements-sprite(create-tabs-icons, $offset-x:-328px, $offset-y:1px); - } - - &.instagram { - width:37px; - height:43px; - @include elements-sprite(create-tabs-icons, $offset-x:-290px); - } - - &.mailchimp { - width:33px; - height:36px; - @include elements-sprite(create-tabs-icons, $offset-x:-378px); - } - - &.error { - width:42px; - @include elements-sprite(create-tabs-icons, $offset-x:-211px); - } - } - - - // Content - .create-content { - position:relative; - padding:40px; - background:#F6F6F6; - @include border-bottom-radius(3px); - z-index:2; - - // When fixed class is set, elements out - // of bounds will be hidden - &.fixed { - overflow:hidden; - } - - // When compressed class is set, top and bottom - // element padding is not 40px - &.compressed { - padding:20px 40px; - } - } - } - - // Error tab! - .create-tab.error { - position:absolute; - top:0; - left:0; - display:none; - width:100%; - z-index:-1; - } - - - // Content - .create-content { - position:relative; - padding:40px; - background:#F6F6F6; - z-index:2; - - // When fixed class is set, elements out - // of bounds will be hidden - &.fixed { - overflow:hidden; - } - - // When compressed class is set, top and bottom - // element padding is not 40px - &.compressed { - padding:20px 40px; - } - } - - - //////////// - // Panes! // - //////////// - .create-panes { - background:#F6F6F6; - - // Message + progress (Twitter and geocoding credits for example) - .pane-quota { - @include display-flex(); - @include justify-content(space-between, justify); - @include align-items(center, center); - - .message { - width:342px; - color:#999; - font-size:13px; - line-height:16px; - } - - .pane-progress { - @include display-flex(); - @include cross-browser(flex-direction,column); - @include justify-content(center,center); - width:143px; - height:48px; - padding-left:10px; - border-left: 1px solid #CCCCCC; - - @include progress-bar(4px, 3px, true, 3px); - - div.progress-bar { - margin-top:7px; - span.bar-2 { z-index:1 } - } - - i.icon.help { - @include inline-block(); - width:13px; - height:13px; - @include border-radius(13px); - background:#CCC; - text-align:center; - line-height:14px; - font-weight:300; - font-size:9px; - color:white; - - &:hover { - background:#999; - cursor:pointer; - } - } - } - } - - // Import - .import-pane { - padding:0!important; - margin:0!important; - - form.upload { - - .upload { - margin-top:0; - - input.url-input { - width:445px; - } - } - - .infobox { - div.info.active { margin-top:-18px } - } - } - } - - // Import pane disabled - .import-message-pane { - - div.canvas { - position:absolute; - top:0; - left:0; - right:0; - bottom:0; - z-index:0; - - &.twitter { @include background(image-url("layout/twitter_disabled.png") no-repeat 19px 0px) } - &.arcgis { @include background(image-url("layout/arcgis_disabled.png") no-repeat 61px -5px) } - } - - div.message { - position:relative; - display:block; - padding:20px 0 30px; - z-index:0; - - ul { - width:100%; - margin-top:14px; - } - - p,li { - font-size:15px; - line-height:18px; - color:#666666; - } - - p { width:295px } - - li { - margin-top:4px; - @include background(image-url("layout/list.png") no-repeat 0 7px); - padding-left:10px; - border:none; - } - - &.twitter { padding:25px 0 35px } - } - } - - // Scratch - .create-empty { - margin-top:-20px; // HA! - } - - // Success - .create-success { - - p { - color: #666666; - text-align:center; - font-size:15px; - } - - i { - - &.twitter { - @include common-sprite(twitter_import_success); - } - - display:block; - margin: 0 auto 20px auto; - width: 45px; - height: 38px; - } - - } - - // error - .create-error { - - div.item_queue_id { - position:absolute; - display:none; - left:40px; - bottom:-35px; - width:265px; - - a { - color: #999; - text-decoration:underline; - &:hover { color:#666 } - } - } - } - } - - ////////////// - // progress // - ////////////// - - .create-progress { - display:none; - height:0; - margin-top:30px; - @include opacity(0); - - .progress-bar { - position:relative; - width:160px; - height:12px; - margin:0 auto; - @include background(#dedede); - @include border-radius(2px); - } - - .progress-total { - display:block; - height:100%; - width:2%; - background-color:#5290d0; - @include box-sizing(border-box); - @include background-size(12px 12px); - @include border-radius(2px); - @include progress-background(rgba(74, 132, 194, 1)); - -webkit-animation:progress 1.5s linear infinite; - -moz-animation:progress 1.5s linear infinite; - -ms-animation:progress 1.5s linear infinite; - animation:progress 1.5s linear infinite; - overflow: hidden; - } - - .progress-text { - @include display-flex(); - @include justify-content(center, center); - @include align-items(center, center); - margin-top:15px; - } - - .message { - text-align:center; - font-size:15px; - color:#666666; - } - - .progress-stop { - display:none; - margin-left:7px; - color:#666; - } - - } - - - - - - - // Keyframes for progress bar - @-webkit-keyframes progress{ - 0% {background-position: 0 0;} - 100% {background-position: 30px 30px;} - } - @-moz-keyframes progress{ - 0% {background-position: 0 0;} - 100% {background-position: 30px 30px;} - } - @-ms-keyframes progress{ - 0% {background-position: 0 0;} - 100% {background-position: 30px 30px;} - } - @keyframes progress{ - 0% {background-position: 0 0;} - 100% {background-position: 30px 30px;} - } diff --git a/app/assets/stylesheets/old_elements/create_dialog/create_dialog_states.css.scss b/app/assets/stylesheets/old_elements/create_dialog/create_dialog_states.css.scss deleted file mode 100644 index a3c5972ad343..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/create_dialog_states.css.scss +++ /dev/null @@ -1,7 +0,0 @@ - - /** - * - * - */ - - \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/create_dialog/create_dialog_uploader.css.scss b/app/assets/stylesheets/old_elements/create_dialog/create_dialog_uploader.css.scss deleted file mode 100644 index 41d9b6c9d121..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/create_dialog_uploader.css.scss +++ /dev/null @@ -1,15 +0,0 @@ - - - /** - * Create dialog uploader styles - * - */ - - - .create-dialog { - - - - - } - \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/create_dialog/import_message_pane.css.scss b/app/assets/stylesheets/old_elements/create_dialog/import_message_pane.css.scss deleted file mode 100644 index 1d9f17bc340f..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/import_message_pane.css.scss +++ /dev/null @@ -1,19 +0,0 @@ - - /** - * Layer import pane styles - * - * - Loading status - * - Data warnings - */ - - @import "compass/css3/border-radius"; - @import "old_common/vars"; - - .import-message-pane { - - p { - font-size:13px; - color:#666; - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/create_dialog/import_pane_arcgis.css.scss b/app/assets/stylesheets/old_elements/create_dialog/import_pane_arcgis.css.scss deleted file mode 100644 index cb4bbfb16689..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/import_pane_arcgis.css.scss +++ /dev/null @@ -1,44 +0,0 @@ - - /** - * ArcGIS import pane styles - * - */ - - @import "compass/css3/images"; - - - .import-pane.import-arcgis-pane { - position:inherit; - - form.upload { - .upload { - margin-top:25px; - } - - ul { - margin-top:15px; - - li { - display:block; - padding-left:12px; - margin-top:10px; - font-size:12px; - color: #666666; - border:none; - @include background(image-url("layout/list.png") no-repeat 0 4px); - } - } - } - - div.message { - position:absolute; - left:40px; - bottom:-38px; - width:250px; - - p { - font-size:12px; - color:#999999; - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/create_dialog/import_pane_layer.css.scss b/app/assets/stylesheets/old_elements/create_dialog/import_pane_layer.css.scss deleted file mode 100644 index 8b5dc3eb4583..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/import_pane_layer.css.scss +++ /dev/null @@ -1,49 +0,0 @@ - - /** - * Layer import pane styles - * - * - Loading status - * - Data warnings - */ - - @import "compass/css3/border-radius"; - @import "old_common/vars"; - - .import-layer-pane { - - span.loader { - display:block; - width:100%; - margin:15px 0 0 0; - padding:28px 0 0 0; - text-align:center; - background:image-url("layout/loader_transparent.gif") no-repeat center top; - color:#898989; - } - - p.message, - .combo_wrapper, - p.warning { display:none } - - .combo_wrapper { - padding:12px; - background:white; - @include border-radius(3px); - border:1px solid #DDD; - } - - p.warning { - padding:0 14px; - margin:4px 0 0; - line-height:44px; - @include border-radius(3px); - background:#FFF8E3; - color:#666666; - font-size:14px; - font-family: $text-fonts; - border:1px solid rgba(black,0.1); - - &.privacy, &.error {background:#FFEAEA;} - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/create_dialog/import_pane_salesforce.css.scss b/app/assets/stylesheets/old_elements/create_dialog/import_pane_salesforce.css.scss deleted file mode 100644 index b5083df84d6b..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/import_pane_salesforce.css.scss +++ /dev/null @@ -1,26 +0,0 @@ - /** - * ArcGIS import pane styles - * - */ - - .import-pane.import-salesforce-pane { - position:inherit; - - form.upload { - .upload { - margin-top:25px; - } - } - - div.message { - position:absolute; - left:40px; - bottom:-38px; - width:250px; - - p { - font-size:12px; - color:#999999; - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/create_dialog/import_pane_twitter.css.scss b/app/assets/stylesheets/old_elements/create_dialog/import_pane_twitter.css.scss deleted file mode 100644 index 3fc15dc5ce82..000000000000 --- a/app/assets/stylesheets/old_elements/create_dialog/import_pane_twitter.css.scss +++ /dev/null @@ -1,42 +0,0 @@ - - /** - * Twitter import pane styles - * - * - Error info - * - Warning message, etc... - */ - - @import "compass/css3/inline-block"; - @import "old_common/mixins"; - @import "old_common/form-elements"; - - .import-twitter-pane { - - @include default-form-info(); - - .twitter-categories, - .twitter-date { - position:relative; - z-index:1 - } - - .twitter-terms { - position:absolute; - bottom:-73px; - left:0; - width:242px; - font-size:11px; - p { color:#999999 } - a { text-decoration:underline } - } - - - div.infobox { - z-index:0; - - div.info.active { - margin-top:-10px; - } - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/custom_objects.css.scss b/app/assets/stylesheets/old_elements/custom_objects.css.scss index 5657a00c8e44..cb0afb02a622 100644 --- a/app/assets/stylesheets/old_elements/custom_objects.css.scss +++ b/app/assets/stylesheets/old_elements/custom_objects.css.scss @@ -179,61 +179,6 @@ span.handle { background:rgba(black,0.4) } } } - - - /* - - span.color { - @include inline-block(); - @include border-left-radius(3px); - width:27px; - height:21px; - - &:before { - content:' '; - position:absolute; - left:0; - top:0; - width:25px; - height:19px; - background:none; - @include border-left-radius(3px); - border:1px solid rgba(0,0,0,0.2); - } - &.image-color { - @include elements-sprite(image_color); - } - } - - a.picker { - position:absolute; - right:0; - top:0; - width:15px; - height:19px; - border:1px solid #9E9E9E; - @include border-right-radius(3px); - border-left:0; - @include text-indent(); - - &:before { - content:' '; - position:absolute; - left:5px; - top:9px; - width:0; - height:0; - border-left:2px solid transparent; - border-right:2px solid transparent; - border-top:3px solid #666666; - } - } - - &:hover { - cursor:pointer; - a:before {border-top:3px solid #000000;} - } - */ } .form_align { @@ -342,7 +287,7 @@ @include border-radius(0); background: none; - .label { + .label { margin: 0 4px 0 0; font-size: 11px; color: #797979; @@ -381,7 +326,7 @@ border: 1px solid #7E7E7E; } - &:hover input.value { + &:hover input.value { color: #333; } diff --git a/app/assets/stylesheets/old_elements/datepicker.css.scss b/app/assets/stylesheets/old_elements/datepicker.css.scss deleted file mode 100644 index 7ffb531f588b..000000000000 --- a/app/assets/stylesheets/old_elements/datepicker.css.scss +++ /dev/null @@ -1,383 +0,0 @@ - - /** - * Date picker component - * - */ - - @import "compass/css3/border-radius"; - @import "compass/css3/opacity"; - @import "compass/css3/inline-block"; - @import "compass/css3/box-shadow"; - @import "../old_common/mixins"; - @import "../old_elements/elements-sprite"; - - - $border-radius: 3px; - - div.custom-datepicker { - position:relative; - margin-top:5px; - z-index:3; - - // Button - .dates { - position:relative; - @include display-flex(); - @include align-items(center, center); - @include justify-content(flex-start, start); - height:46px; - padding:0 14px; - background:white; - border:1px solid #CCC; - @include border-radius($border-radius); - outline:none; - - // Icon - .calendar.icon { - @include inline-block(); - width:14px; - height:14px; - @include elements-sprite(calendar); - } - - // Message - .label { - margin-left:13px; - padding-left:10px; - line-height:24px; - border-left:1px solid #CCCCCC; - color:#CCCCCC; - - em { color:#666666 } - } - - // Dropdown tick - &:after { - content:''; - position:absolute; - top:50%; - right:14px; - width:0; - height:0; - margin-top:-1px; - border-right:4px solid transparent; - border-left:4px solid transparent; - border-top:4px solid #999; - } - - // Hover and focus? - &:hover, - &:focus { - text-decoration:none; - border-color:#AAA; - - .label { color:#CCCCCC } - em { color:#666666 } - &:after { border-top-color:#666 } - } - - } - - // Hint - p.hint { - display:block; - font-size:11px; - color:#AAA; - font-style:italic; - text-align:center; - } - - // Timers - .timers { - @include display-flex(); - @include align-items(center, center); - @include justify-content(space-between, justify); - - .from, - .to { - @include display-flex(); - @include align-items(center, center); - @include justify-content(space-between, justify); - width:175px; - padding-top:15px; - border-top:1px solid #CCCCCC; - } - - label { - position:relative; - top:auto; - left:auto; - width:auto; - margin:0 5px 0 0; - font-weight:bold; - font-size:11px; - color:#666; - } - } - - // Date picker + timers - div.calendar { - position:absolute; - bottom:54px; - left:0; - right:0; - padding:40px; - border:1px solid #9E9E9E; - background:white; - @include border-radius($border-radius); - @include box-shadow(0 2px 2px 2px rgba(0,0,0,0.1)); - z-index:10; - - // Default datepicker styles - div.datepicker { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - width: 174px; - height: 195px; - cursor: default; - } - - .datepickerContainer { background: white; } - - .datepickerHidden { - display: none; - } - div.datepicker table { - border-collapse:collapse; - } - div.datepicker a { - text-decoration: none; - cursor: pointer; - outline: none; - } - div.datepicker table td { - text-align: center; - padding: 0; - margin: 0; - width:22px; - height:22px; - } - div.datepicker th { - text-align: center; - font-weight: normal; - } - div.datepicker tbody th { - text-align: left; - } - div.datepicker tbody a { - display: block; - } - .datepickerDays a { - width: 20px; - line-height: 20px; - height: 20px; - border:1px solid white; - } - .datepickerYears a, - .datepickerMonths a{ - width: 44px; - line-height: 36px; - height: 36px; - text-align: center; - } - td.datepickerNotInMonth a { - // color: #666; - } - tbody.datepickerDays td.datepickerSelected{ - background: #3B7EBB; - } - tbody.datepickerDays td.datepickerNotInMonth.datepickerSelected { - background: #17384d; - } - tbody.datepickerYears td.datepickerSelected, - tbody.datepickerMonths td.datepickerSelected{ - background: #17384d; - } - // div.datepicker a:hover, - // div.datepicker a:hover { - // color: #88c5eb; - // } - div.datepicker td.datepickerNotInMonth a:hover { - // color: #999; - } - div.datepicker tbody th { - text-align: left; - } - .datepickerSpace div { - width: 20px; - } - .datepickerGoNext a, - .datepickerGoPrev a, - .datepickerMonth a { - text-align: center; - height: 20px; - line-height: 20px; - color:#666666; - text-transform: uppercase; - font-weight:bold; - font-size:11px; - } - .datepickerGoNext a { - float: right; - width: 20px; - } - .datepickerGoPrev a { - float: left; - width: 20px; - } - table.datepickerViewDays tbody.datepickerMonths, - table.datepickerViewDays tbody.datepickerYears { - display: none; - } - table.datepickerViewMonths tbody.datepickerDays, - table.datepickerViewMonths tbody.datepickerYears, - table.datepickerViewMonths tr.datepickerDoW { - display: none; - } - table.datepickerViewYears tbody.datepickerDays, - table.datepickerViewYears tbody.datepickerMonths, - table.datepickerViewYears tr.datepickerDoW { - display: none; - } - td.datepickerDisabled a, - td.datepickerDisabled.datepickerNotInMonth a{ - color: #333; - @include opacity(.5); - } - td.datepickerDisabled a:hover { - color: #333; - @include opacity(.5); - } - td.datepickerSpecial a { - background: #700; - } - td.datepickerSpecial.datepickerSelected a { - background: #a00; - } - - ////////////////////////////// - // Custom datepicker styles // - ////////////////////////////// - - .datepickerDoW { - margin:10px 0; - border-bottom:1px solid #CCCCCC; - - th { - height:30px; - text-align:center!important; - - &:first-child { - display:none; - } - - span { - font-size:9px; - color:#CCCCCC; - text-transform:uppercase; - } - } - } - - tbody.datepickerDays:before { - line-height:5px; - content:"-"; - color:white; - display:block; - } - - th.datepickerWeek { - text-align:center!important; - a { color:#CCC; } - } - - td.datepickerSelected a { - color:white; - border-color:#3B7EBB; - } - - tbody.datepickerDays td.datepickerSelectedFirst.datepickerSelected, - tbody.datepickerDays td.datepickerSelectedLast.datepickerSelected { - background:#3B7EBB; - - a { - background:white; - color:#3B7EBB; - border-color:#3B7EBB; - @include border-radius(22px); - } - } - - td.datepickerSelectedFirst { - @include border-top-left-radius(22px); - @include border-bottom-left-radius(22px); - } - - td.datepickerSelectedLast { - @include border-top-right-radius(22px); - @include border-bottom-right-radius(22px); - } - - .datepickerNotInMonth a { - color:#999; - } - - tbody.datepickerDays - td.datepickerNotInMonth.datepickerSelected { - background:#E7EAEC; - a { border-color:#E7EAEC } - } - - // Margin for a calendar - table.datepickerViewDays { - margin:0 10px; - } - - // Hide week links - thead > tr.datepickerDoW > th:first-child, - .datepickerWeek { - display:none - } - - // Remove data picker 'inside' arrows - .datepickerContainer > table > tbody > tr td { - // &:first-child thead th.datepickerGoNext a { - // display:none - // } - // &:last-child thead th.datepickerGoPrev a { - // display:none - // } - thead th.datepickerGoNext a, - thead th.datepickerGoPrev a { - display:none - } - } - - // Remove hover style for month title - .datepickerMonth a:hover { - cursor:default; - } - - .datepickerSpace { - position:relative; - - div { - @include inline-block(); - height:100%; - width: 74px; - - &:before { - content:''; - position:absolute; - top:0; - left:38px; - width:1px; - height:100%; - background:#CCCCCC; - } - } - } - - - } - } diff --git a/app/assets/stylesheets/old_elements/default_jscrollpane.css.scss b/app/assets/stylesheets/old_elements/default_jscrollpane.css.scss deleted file mode 100644 index bbf895ee0952..000000000000 --- a/app/assets/stylesheets/old_elements/default_jscrollpane.css.scss +++ /dev/null @@ -1,60 +0,0 @@ - - /** - * Default styles for new jscrollpane view - * + scroll gradients if it is enabled - * - */ - - @import "compass/css3/transition"; - @import "compass/css3/opacity"; - @import "compass/css3/images"; - @import "compass/css3/border-radius"; - @import "../old_common/mixins"; - - .default-scrollpane { - position:relative; - padding:0; - max-height: 154px; - min-height: 154px; - overflow: hidden; - outline:none; - - // jScrollPane - .jspContainer { overflow: hidden; position: relative; } - .jspPane { position: absolute; width:100%!important; } - .jspVerticalBar { @include simple-transition(opacity, 150ms); @include opacity(0); position: absolute; top: 0; right: 7px; width: 5px; height: 100%; background: none; z-index: 20; } - .jspVerticalBar * { margin: 0; padding: 0; } - .jspCap { display: none; } - .jspTrack { background: none; position: relative; } - .jspDrag { background: rgba(#BBB, .5); @include border-radius(5px); position: relative; top: 0; left: 0; cursor: pointer; } - .jspArrow { background: none; text-indent: -20000px; display: block; cursor: pointer; } - .jspVerticalBar .jspArrow { height: 10px; } - .jspVerticalBar .jspArrow:focus { outline: none; } - .jspCorner { background: #eeeef4; float: left; height: 100%; } - - // Scroll gradients - .scroll { - position:absolute; - left:0; - right:5px; - width:100%; - height:10px; - padding:0; - margin:0; - @include border-radius(0); - z-index:10; - pointer-events:none; - - &.top { - top:0; - @include background(linear-gradient(white, rgba(white,0))); - } - &.bottom { - bottom:0px; - @include background(linear-gradient(rgba(white,0),white)); - } - } - - - &:hover .jspVerticalBar { @include opacity(1); } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/delete_table_dialog.css.scss b/app/assets/stylesheets/old_elements/delete_table_dialog.css.scss deleted file mode 100644 index e9d17cbc55a2..000000000000 --- a/app/assets/stylesheets/old_elements/delete_table_dialog.css.scss +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Delete dialog (with export section) - */ - -@import "old_common/mixins"; -@import "compass/css3/inline-block"; -@import "../table/table-sprite"; - - -.delete_table_dialog { - - .export_content { - padding: 40px; - } - - .loader { - - &.hidden { display:none; } - - margin: 40px auto; - @include size(38px, 16px); - - background:image-url("layout/loader.gif") no-repeat 0 0; - } - - .foot { display:none; } - - .content { - display:none; - - p { margin: 0; } - - .non_dependent, .dependent, .synced { - - &.open .visualizations { - display:block; - } - - &.open .msg { - @include border-radius(4px 4px 0 0); - margin: 0 0 1px 0; - } - - .visualizations { - display:none; - padding: 13px 14px; - color: #666666; - font-size: 15px; - @include border-radius(0 0 4px 4px); - margin: 0 0 5px 0; - - a { - font-style: italic; - color: #2483B4; - } - - } - - .msg { - padding: 13px 14px; - color: #666666; - font-size: 15px; - @include border-radius(4px); - - a { - color: #666; - border-bottom: 1px solid #666; - text-decoration:none; - &:hover { color: #333; border-color: #666; } - } - } - } - - .non_dependent > div { - background:rgba(#FFDC73, .2); - } - - .dependent > div { - background:rgba(#FECBCB, .4); - } - - .non_dependent .msg, .dependent .msg { - margin: 0 0 4px 0; - } - - .synced > div { - background:rgba(#FFDC73, .2); - } - - ul { - margin: 15px 0 0 0; - - li { - padding: 15px 0; - - &:last-child { padding-bottom: 0; } - a { font-weight: bold; } - } - } - } - - .modal.export { - display:none; - - nav { - display:table; - width:100%; - - a.button.grey { - display: table-cell; - text-align:center; - @include border-radius(0px); - border-right-width:0; - - &:first-child { - @include border-left-radius(3px); - } - - &:last-child { - border-right-width:1px; - @include border-right-radius(3px); - } - } - } - } // .modal.export -} diff --git a/app/assets/stylesheets/old_elements/docs_info_dialog.css.scss b/app/assets/stylesheets/old_elements/docs_info_dialog.css.scss deleted file mode 100644 index bec6e829c7ad..000000000000 --- a/app/assets/stylesheets/old_elements/docs_info_dialog.css.scss +++ /dev/null @@ -1,43 +0,0 @@ - - - /** - * Styles for the information about docs, carto, posgres,... dialog - */ - - - @import "../old_elements/elements-sprite"; - - $border-color: rgba(#BBBBBB,0.7); - - .docs_info_dialog { - nav { - position:relative; - display:table; - width:100%; - padding:22px 0; - margin:35px 0 0; - border-top:1px solid $border-color; - border-bottom:1px solid $border-color; - - &:after { - position:absolute; - content:''; - top:-15px; - left:50%; - width:55px; - height:32px; - margin:0 0 0 -27px; - @include elements-sprite(paper_plane); - z-index:1; - } - - a { - display:table-cell; - width:50%; - text-align:center; - border-left:1px solid $border-color; - &:first-child {border:none;} - &.alone {width:100%;} - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/duplicate_dialog.css.scss b/app/assets/stylesheets/old_elements/duplicate_dialog.css.scss deleted file mode 100644 index 135134956c48..000000000000 --- a/app/assets/stylesheets/old_elements/duplicate_dialog.css.scss +++ /dev/null @@ -1,41 +0,0 @@ - - - /** - * Duplicate table dialog styles - */ - - - @import "old_common/form-elements"; - - .duplicate_dialog { - - @include default-input(); - input.text {display:block; width:422px;} - @include default-form-info(); - - .duplicate_content { - padding:80px 40px; - } - - section.block { - .content { - padding: 40px 40px 25px 40px; - } - } - - .modal.duplicating { - display:none; - width:300px!important; - - div.loader { - padding-top:40px; - @include background(image-url('layout/loader.gif') no-repeat center top); - p {text-align:center;} - } - } - - .modal.error { - display:none; - width:600px!important; - } - } diff --git a/app/assets/stylesheets/old_elements/duplicate_table_dialog.css.scss b/app/assets/stylesheets/old_elements/duplicate_table_dialog.css.scss deleted file mode 100644 index 135134956c48..000000000000 --- a/app/assets/stylesheets/old_elements/duplicate_table_dialog.css.scss +++ /dev/null @@ -1,41 +0,0 @@ - - - /** - * Duplicate table dialog styles - */ - - - @import "old_common/form-elements"; - - .duplicate_dialog { - - @include default-input(); - input.text {display:block; width:422px;} - @include default-form-info(); - - .duplicate_content { - padding:80px 40px; - } - - section.block { - .content { - padding: 40px 40px 25px 40px; - } - } - - .modal.duplicating { - display:none; - width:300px!important; - - div.loader { - padding-top:40px; - @include background(image-url('layout/loader.gif') no-repeat center top); - p {text-align:center;} - } - } - - .modal.error { - display:none; - width:600px!important; - } - } diff --git a/app/assets/stylesheets/old_elements/edit_fields_dialog.css.scss b/app/assets/stylesheets/old_elements/edit_fields_dialog.css.scss deleted file mode 100644 index 12bdd25f9df7..000000000000 --- a/app/assets/stylesheets/old_elements/edit_fields_dialog.css.scss +++ /dev/null @@ -1,152 +0,0 @@ - - /** - * Styles for edit fields dialog - */ - - - @import "../old_common/vars"; - @import "../old_common/form-elements"; - - .edit_fields_dialog { - div.content { - position:relative; - padding:0!important; - margin-bottom:40px; - - span.scroll { - position:absolute; - left:0; - right:5px; - width:100%; - height:30px; - background:transparent; - padding:0; - margin:0; - @include border-radius(0); - pointer-events:none; - z-index:10; - - &.top {top:0; @include background(linear-gradient(rgba(white,1), rgba(white,0)));} - &.bottom {bottom:0px; @include background(linear-gradient(rgba(white,0), rgba(white,1)));} - } - - div.wrapper { - display:block; - padding:40px 40px 0; - max-height: 320px; - overflow:auto; - } - - div.field { - display:block; - margin-top:20px; - - & > label { - display:block; - margin-bottom:9px; - font:bold 12px $text-fonts; - color:$cGray4; - text-transform: uppercase; - } - - // Number touched - &.number { - @include default-input(); - input[type="text"] { - width:346px; - - // Types - &.number_field {color:#4DC964;} - - // Actions - &.error {border-color:rgba(red,0.5);} - } - } - - // String touched - &.string { - @include default-textarea(); - textarea { - width:346px; - min-width:346px; - max-width:346px; - max-height:200px; - min-height:20px; - height:18px; - } - } - - // Boolean touched - &.boolean { - nav { - display:table; - width:346px; - padding:8px 11px; - border: 1px solid #C0C1C2; - @include border-radius(4px); - - a { - display:table-cell; - width:115px; - text-align:center; - border-right:1px solid #D9D9D9; - font-weight:normal; - line-height:21px; - span.radio {margin-top:5px;} - - &:last-child {border:none;} - } - } - } - - // Date touched - &.date { - div.date_field { - display:table; - width:346px; - padding:9px 11px; - border: 1px solid #C0C1C2; - @include border-radius(4px); - letter-spacing: -4px; - word-spacing: -4px; - - & > div.column { - @include inline-block(); - letter-spacing: 0; - word-spacing: 0; - margin-right:10px; - - label { - display:block; - padding:0; - margin:0 0 3px; - font:normal 12px $text-fonts; - color:#DDD; - } - - &.day_field {width:46px;} - &.month_field {width:141px;} - &.year_field {width:54px;} - &.time_field { - width:75px; - @include default-input(); - input { - border-color:#9E9E9E; - width:67px; - padding:2px 3px; - font-size:13px; - // Actions - &.error {border-color:rgba(red,0.5);} - &[readonly] {background:#f4f4f4; border-color:#DDDDDD;} - } - } - - &:last-child {margin-right:0;} - } - } - } - - &:first-child {margin-top:0;} - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/elements-sprite.css.scss b/app/assets/stylesheets/old_elements/elements-sprite.css.scss index 0546cc720ab2..266d316d0cce 100644 --- a/app/assets/stylesheets/old_elements/elements-sprite.css.scss +++ b/app/assets/stylesheets/old_elements/elements-sprite.css.scss @@ -3,18 +3,17 @@ */ @import "compass/utilities/sprites/base"; - + // General Sprite Defaults // You can override them before you import this file. $elements-sprite-base-class: ".elements-sprite" !default; $elements-sprite-dimensions: false !default; - + $elements-sprites: sprite-map("sprites/elements/*.png", $position: 0%, $spacing: 0, $repeat: no-repeat, $readonly-spacing: 0, - $elements-background_loader_error-spacing: 10px, $elements-question-spacing: 10px, $elements-image_color-spacing: 5px, $elements-image_fill-spacing: 15px, @@ -26,30 +25,30 @@ $elements-sprites: sprite-map("sprites/elements/*.png", #{$elements-sprite-base-class} { background: $elements-sprites no-repeat; } - + // Use this to set the dimensions of an element // based on the size of the original image. @mixin elements-sprite-dimensions($name) { @include sprite-dimensions($elements-sprites, $name) } - + // Move the background position to display the sprite. @mixin elements-sprite-position($name, $offset-x: 0, $offset-y: 0) { @include sprite-position($elements-sprites, $name, $offset-x, $offset-y) } - + // Extends the sprite base class and set the background position for the desired sprite. // It will also apply the image dimensions if $dimensions is true. @mixin elements-sprite($name, $dimensions: $elements-sprite-dimensions, $offset-x: 0, $offset-y: 0) { @extend #{$elements-sprite-base-class}; @include sprite($elements-sprites, $name, $dimensions, $offset-x, $offset-y) } - + @mixin elements-sprites($sprite-names, $dimensions: $elements-sprite-dimensions, $prefix: sprite-map-name($elements-sprites)) { @include sprites($elements-sprites, $sprite-names, $elements-sprite-base-class, $dimensions, $prefix) } - + // Generates a class for each sprited image. @mixin all-elements-sprites($dimensions: $elements-sprite-dimensions, $prefix: sprite-map-name($elements-sprites)) { @include elements-sprites(favorite important photos readonly symbolic-link system unreadable, $dimensions, $prefix); -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/old_elements/export_dialog.css.scss b/app/assets/stylesheets/old_elements/export_dialog.css.scss deleted file mode 100644 index 23295257bd02..000000000000 --- a/app/assets/stylesheets/old_elements/export_dialog.css.scss +++ /dev/null @@ -1,58 +0,0 @@ - - /* - * Export content dialog - */ - - @import "compass/css3/border-radius"; - - .export_table_dialog { - nav { - display:table; - width:100%; - - a.button.grey { - display: table-cell; - text-align:center; - @include border-radius(0px); - border-right-width:0; - - &:first-child { - @include border-left-radius(3px); - } - - &:last-child { - border-right-width:1px; - @include border-right-radius(3px); - } - } - } - - .generating, .error, .geospatial { - width:100%; - p { - text-align:center; - color: #AAA; - padding-top: 1em; - } - &.hidden { - display: none; - } - } - .error p { - color: #EB2466; - } - - div.loader { - display:block; - width:100%; - height:50px; - text-align: center; - .loading { - img { - display: block; - margin: 0 auto 5px; - } - } - } - - } diff --git a/app/assets/stylesheets/old_elements/filter_column_dialog.css.scss b/app/assets/stylesheets/old_elements/filter_column_dialog.css.scss deleted file mode 100644 index e05b20245319..000000000000 --- a/app/assets/stylesheets/old_elements/filter_column_dialog.css.scss +++ /dev/null @@ -1,25 +0,0 @@ - - - -@import "../old_common/form-elements"; - - -.filter_column_dialog { - - @include default-input; - @include default-form-info; - @include default-select; - - input { - width: 253px - 11*2px; - - &::-webkit-input-placeholder { - font-style:italic; - } - - &:-moz-placeholder { - font-style:italic; - } - } - -} diff --git a/app/assets/stylesheets/old_elements/lock_visualization_dialog.css.scss b/app/assets/stylesheets/old_elements/lock_visualization_dialog.css.scss deleted file mode 100644 index ebbace53b9ee..000000000000 --- a/app/assets/stylesheets/old_elements/lock_visualization_dialog.css.scss +++ /dev/null @@ -1,16 +0,0 @@ - - /** - * Lock visualization dialog styles - */ - - .lock_visualization { - .mamufas { - - section.modal.notification { - div.foot { - a.cancel { display:block } - } - } - - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/merge_tables_dialog.css.scss b/app/assets/stylesheets/old_elements/merge_tables_dialog.css.scss deleted file mode 100644 index ee72d7c3bddd..000000000000 --- a/app/assets/stylesheets/old_elements/merge_tables_dialog.css.scss +++ /dev/null @@ -1,157 +0,0 @@ - - /** - * Merge tables dialog - */ - - - @import "../old_common/form-elements"; - @import "../old_common/mixins"; - - .merge_tables_dialog { - - .back { display:none; } - - @include default-input; - @include default-form-info; - - .table_name { - display:none; - - input.text { display:block; width:529px;} - } - - // Tables selector - .tables_selector { - display:block; - - .description { margin: 0 0 20px 0; } - - strong.title { - display:block; - margin: 0 0 5px 0; - } - - ul.join_types { - width:100%; - padding-bottom:30px; - margin:40px 0 0 0; - letter-spacing: -4px; - word-spacing: -4px; - border:none; - - li { - @include inline-block(); - vertical-align:top; - width:256px; - letter-spacing: 0; - word-spacing: 0; - border-bottom:0; - - &.disabled p { - @include opacity(.5); - } - - &:first-child {margin-right:41px;} - - a { - font-size: 15px; - &.radiobutton.inactive {@include opacity(0.6)} - } - - p { - margin-top:7px; - padding-left:20px; - font-size: 13px; - } - } - } - - // Table columns selector/preview - div.tables { - width:100%; - display:none; - letter-spacing: -4px; - word-spacing: -4px; - margin: 0 0 30px 0; - - .table_preview { - @include inline-block(); - width:254px; - height:230px; - border:1px solid #CCCCCC; - @include border-radius(3px); - letter-spacing: 0; - word-spacing: 0; - background:white; - - .cover { - display:none; - background: #f1f1f1; - position: absolute; - width: 100%; - height: 179px; - bottom: 0; - z-index: 100; - - p { - width: 215px; - margin: 55px auto 0 auto; - - text-align: center; - font-size: 14px; - } - - } - - * {letter-spacing: 0; word-spacing: 0;} - - &:first-child {margin-right:41px;} - - li a { color: #333; } - li .radiobutton .radio { border-color: #333; } - } - } - - p.approx_rows { - display:none; - margin-right:10px; - } - - } - - // Table name - .modal.naming { - display:none; - width:525px!important; - - @include default-input; - @include default-form-info; - - div.merge_content { - display:block; - padding:40px; - input.text {display:block; width:422px;} - } - } - - // Merging process - .modal.merging { - display:none; - width:300px!important; - height:217px; - - div.loader { - display:inline-block; - margin:60px 0 0; - padding:40px; - @include background(image-url('layout/loader.gif') no-repeat center top); - p {text-align:center;} - } - } - - // Error? - .modal.error { - display:none; - width:600px!important; - } - } diff --git a/app/assets/stylesheets/old_elements/modal.css.scss b/app/assets/stylesheets/old_elements/modal.css.scss index 7116040a21ed..613e757bf3d9 100644 --- a/app/assets/stylesheets/old_elements/modal.css.scss +++ b/app/assets/stylesheets/old_elements/modal.css.scss @@ -45,48 +45,6 @@ } } - // Compressed (footer fewer space, eg: share map window) - &.compressed { - div.content, div.error_content {padding:40px 40px 15px 40px;} - div.content > p { margin: 0 0 20px 0; } - div.foot {border:none; padding-top:15px;} - } - - // Red one, important! - Confirm or error. - &.confirmation, &.error { - border:4px solid rgba(#FC5353,0.3); - div.content, div.error_content {padding:40px 40px 15px 40px;} - div.foot {border:none; padding-top:15px;} - - div.error_content { - max-height:250px; - overflow:auto; - - h4 { - line-height:18px; - padding-left:30px; - letter-spacing:0; - - &.exclamation { @include elements-sprite(background_loader_error, $offset-y:0); } - &.question { @include elements-sprite(question, $offset-y:0); } - } - - p { padding-left:30px } - - .item_queue_id { - position:absolute; - bottom:50px; - left:40px; - font-size:12px; - color:#999; - } - } - - .block p a { text-decoration: underline; } - - a.close {right:-18px; top:-18px;} - } - // Create something new (table, row,...) &.creation { div.foot { @@ -105,15 +63,5 @@ a.cancel { position:relative; top: 15px; } } } - - // Notification (upgrade account) - &.notification { - border:4px solid rgba(#FFCC33,0.3); - div.foot { - padding-top:0; - border:none; - a.cancel {display:none} - } - } } } diff --git a/app/assets/stylesheets/old_elements/new_column_dialog.css.scss b/app/assets/stylesheets/old_elements/new_column_dialog.css.scss deleted file mode 100644 index 348de42d5719..000000000000 --- a/app/assets/stylesheets/old_elements/new_column_dialog.css.scss +++ /dev/null @@ -1,32 +0,0 @@ - - - -@import "../old_common/form-elements"; - - -.new_column_dialog { - - @include default-input(); - @include default-form-info(); - @include default-select(); - - input { - width: 253px - 11*2px; - - &::-webkit-input-placeholder { - font-style:italic; - } - - &:-moz-placeholder { - font-style:italic; - } - } - - div.column_select { - display:block; - padding:14px 12px; - margin:20px 0 0 0; - background:#F2F2F2; - @include border-radius(4px); - } -} diff --git a/app/assets/stylesheets/old_elements/posts_widget.css.scss b/app/assets/stylesheets/old_elements/posts_widget.css.scss deleted file mode 100644 index e5c345f520f9..000000000000 --- a/app/assets/stylesheets/old_elements/posts_widget.css.scss +++ /dev/null @@ -1,27 +0,0 @@ - - /** - * Posts widget styles - */ - - - div.dropdown.posts_widget { - - ul { - display:block; - padding:0; - width:auto; - } - - li { - display:block; - padding:14px 15px; - - a { - display:block; - padding:0; - font-weight:bold; - font-size: 14px; - line-height:16px; - } - } - } diff --git a/app/assets/stylesheets/old_elements/privacy_dialog.css.scss b/app/assets/stylesheets/old_elements/privacy_dialog.css.scss deleted file mode 100644 index 699f3faa8f0e..000000000000 --- a/app/assets/stylesheets/old_elements/privacy_dialog.css.scss +++ /dev/null @@ -1,349 +0,0 @@ - - /** - * Privacy dialog styles - * - * - It includes - * - * · Dialog itself - * · Privacy password view - * · Organization users list - * · Organization users item - * · Privacy selector - * - */ - - @import "compass/css3/inline-block"; - @import "compass/css3/box-shadow"; - @import "compass/css3/border-radius"; - @import "compass/css3/images"; - @import "compass/css3/opacity"; - @import "compass/css3/transform"; - @import "compass/css3/transition"; - @import "../old_common/vars"; - @import "../old_common/mixins"; - @import "../table/table-sprite"; - - - // Modal dialogs - .vis_privacy_dialog { - - section.block { - div.foot { - position:relative; - padding:0 40px 35px; - border:none; - } - } - - section.warning { - display:none; - } - - } - - - /** - * Privacy password view styles - * - */ - - $br: 2px; - - .privacy-password { - position:absolute; - left:40px; - top:7px; - - form { - padding:4px; - border: 1px solid #CCCCCC; - @include border-radius($br); - line-height:20px; - - &.focus { border-color:#AAA } - } - - input.password { - border:none; - outline:none; - padding:0; - } - - input.submit { - padding:0 8px; - margin:0px; - background:#FFD2A6; - border:none; - @include border-radius($br); - text-align:center; - font:normal 11px $text-fonts; - color:#AD9571; - outline:none; - line-height:20px; - - &:hover { background:#FFCA94; cursor:pointer } - &:active { background:#FFC182 } - - &.disabled { - @include opacity(0.5); - &:hover { background:#FFD2A6; cursor:default } - &:active { background:#FFD2A6 } - } - } - } - - - /** - * Organization users list + user item - * - */ - - .org_users_list { - position:relative; - display:block; - width:100%; - height:auto; - margin:20px 0 0; - - // List wrapper - .org_users_wrapper { - &.scrollpane { - height:215px; - overflow:hidden; - } - } - - ul { - display:block; - - li { - padding:14px 0; - @include display-flex(); - @include justify-content(space-between, justify); - @include align-items(center, center); - } - - div.info , - div.switches { - @include display-flex(); - @include align-items(center, center); - } - - div.info { - text-align: left; - width:250px; - - &.disabled { @include opacity(.5) } - } - - div.switches { - text-align: right; - width:125px; - @include justify-content(flex-end, end); - } - - img { - width:18px; - height:18px; - @include border-radius(20px); - background:#EDEDED; - } - - p { - max-width:255px; - margin-left:6px; - font-size:15px - } - - span.separator { - position:relative; - width:3px; - height:3px; - margin:0 10px; - background:#EEE; - @include border-radius(4px); - } - - // Scrollpane! - &.scrollpane { - width: 100%!important; - height: 215px; - overflow-y: hidden; - overflow-x: visible; - outline:none; - - // space for scroll - li { padding-right:10px } - - .jspContainer { overflow: hidden; position: relative; } - .jspPane { position: absolute } - .jspVerticalBar { @include simple-transition(opacity, 150ms); @include opacity(0); position: absolute; top: 0; right: 0; width: 5px; height: 100%; background: none; z-index: 20; } - .jspVerticalBar * { margin: 0; padding: 0; } - .jspCap { display: none; } - .jspTrack { background: none; position: relative; } - .jspDrag { background: rgba(#BBB, .5); @include border-radius(5px); position: relative; top: 0; left: 0; cursor: pointer; } - .jspDrag.jspHover { background: rgba(#BBB,1) } - .jspArrow { background: none; text-indent: -20000px; display: block; cursor: pointer; } - .jspVerticalBar .jspArrow { height: 10px; } - .jspVerticalBar .jspArrow:focus { outline: none; } - .jspCorner { background: #eeeef4; float: left; height: 100%; } - - &:hover .jspVerticalBar { @include opacity(1); } - } - } - - // Scroll gradients - span.scroll { - position:absolute; - left:0; - right:5px; - width:100%; - height:30px; - background:transparent; - padding:0; - margin:0; - @include border-radius(0); - pointer-events:none; - z-index:10; - - &.top { display:none; top:0; @include background(linear-gradient(rgba(white,1), rgba(white,0)));} - &.bottom {bottom:0px; @include background(linear-gradient(rgba(white,0), rgba(white,1)));} - } - } - - - - - /** - * Visualization (derived or table) privacy-selector styles - * - * - It could be public, link, password, organization or private - */ - - - .vis_privacy_selector { - position:relative; - display:block; - - // List - .privacy-list { - position:absolute; - display:block; - top:0; - left:0; - right:0; - border:1px solid #B0B0B0; - @include box-shadow(0 0 3px 3px rgba(black,0.15)); - @include border-radius(3px); - overflow:hidden; - z-index:20; - } - - // List item - .privacy-item { - position:relative; - display:block; - width:auto; - background:white; - - .privacy-link { - display:block; - padding:9px; - text-decoration:none; - - &:hover { background:#EDEDED } - - &.disabled:hover { background:none } - - &.selected { - background:#EDEDED; - cursor:default; - } - } - - // Upgrade button - a.button { - position:absolute; - right:10px; - top:15px; - padding:4px 8px; - font-size:12px; - font-weight:normal; - } - - h5 { font-size: 15px; color:#333333 } - p { font-size:13px; color:#666666 } - - span.status, - span.info { - @include inline-block(); - } - - span.status.privacy-status { - @include inline-block(); - width:33px; - height:33px; - margin-right:6px; - overflow:hidden; - - &:after, &:before { display:none } - - &.public { background: sprite($table-sprites, lock_open, $offset-x: 11px, $offset-y: 10px) no-repeat rgba(#97C341, .5) } - &.link { background: sprite($table-sprites, lock_open, $offset-x: 11px, $offset-y: 10px) no-repeat rgba(#FFA64D, .5) } - &.password { background: sprite($table-sprites, lock_key, $offset-x: 11px, $offset-y: 10px) no-repeat rgba(#FFA64D, .5) } - &.organization { background: sprite($table-sprites, lock_user, $offset-x: 11px, $offset-y: 10px) no-repeat rgba(#FFA64D, .5) } - &.private { background: sprite( $table-sprites, lock_closed, $offset-x: 11px, $offset-y: 10px) no-repeat rgba(#FF7373, .5) } - } - } - - // Current one - .current-privacy-item { - display:block; - width:auto; - - .privacy-link { - position:relative; - text-decoration:none; - border:1px solid #B0B0B0; - @include border-radius(3px); - @include background(linear-gradient(top,#FFF,#EBEBEB)); - @include transform-style("linear"); - @include transition-property("box-shadow,border,background"); - @include transition-duration(250ms); - - &:before, - &:after { - content:''; - position:absolute; - top:0; - } - - &:before { - top:10px; - right:42px; - height:32px; - width:1px; - background:#C2C2C2; - } - &:after { - top:24px; - right:18px; - height:0; - width:0; - border-left:4px solid transparent; - border-right:4px solid transparent; - border-top:6px solid #666666; - } - - &:hover { - @include background(linear-gradient(top,#FFF,#DEDEDE)); - } - - &:active { - @include box-shadow(rgba(255,255,255,0) 0 0 1px 0,rgba(130,126,111,0.6) 0 1px 3px 0 inset,#fff 0 1px 0 0); - } - } - - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/service_pane.css.scss b/app/assets/stylesheets/old_elements/service_pane.css.scss deleted file mode 100644 index 7eb2c4c2485c..000000000000 --- a/app/assets/stylesheets/old_elements/service_pane.css.scss +++ /dev/null @@ -1,193 +0,0 @@ - - /** - * Styles for import service pane. - * - * - Services that requires oauth calls,... - * - Loading states. - * - Display lists. - * - Error in the process. - * - Final input file. - */ - - @import "old_common/mixins"; - @import "old_common/form-elements"; - - - .import-service-pane { - position:relative; - margin-bottom:30px!important; - display:block; - - a.service-button, a.change { - @include inline-block(); - margin:0; - padding:4px 7px; - font-size:12px; - font-weight:bold; - letter-spacing:0; - } - - a.change { display:none } - - p { - &.msg { display:none } - &.filename { width:335px!important } - } - - span.loader { - position:absolute; - display:none; - top:15px; - right:10px; - width:38px!important; - height:16px; - margin:0!important; - padding:0!important; - background:image-url("layout/loader.gif") no-repeat center center; - } - - div.list { - display:none; - } - - // List header - .list_header { - display:block; - height:26px; - padding:0 14px; - line-height:26px; - background:#394046; - @include border-top-radius(3px); - - h5 { - display:inline-block; - color:#FFFFFF; - font-size:12px; - line-height:14px; - } - } - - // Files list - ul { - display:none; - max-height:200px; - overflow:auto; - overflow-x:hidden; - border:1px solid #DDDDDD; - background:white; - @include border-bottom-radius(3px); - - li { - position:relative; - @include display-flex(); - @include justify-content(space-between, justify); - @include align-items(center, center); - padding:14px; - border-top:1px solid #EEEEEE; - border-bottom:0!important; - - &:first-child { border:none } - - &.empty { - padding:30px 90px; - text-align:center; - color:#999; - line-height:18px; - } - } - - h6 { - @include text-overflow(); - color:#3A7EBA; - font-size:13px; - } - - p { - margin-top:3px; - font-style:italic; - font-size:11px; - color:#999; - @include text-overflow(); - - &.smaller { - margin-top:2px; - } - } - - i.path { - @include inline-block(); - vertical-align:top; - max-width:290px; - @include text-overflow(); - } - - a { - @include inline-block(); - } - } - - div.upload { - position:relative; - height:22px; - padding:11px 10px; - border:1px solid #CCCCCC; - background:white; - @include border-radius(4px); - z-index:2; - - p.filename { - float:left; - @include inline-block(); - display:none; - width:285px; - margin:2px 0 0 4px; - font-size:15px; - font-style:italic; - color:#666; - @include text-overflow(); - } - } - - div.infobox { - @include default-form-info(); - z-index:2; - - div.info { - position:relative; - z-index:1; - - &.error { - margin-top:-55px; - } - - &.active { - margin-top: -7px; - } - - } - } - - span.scroll { - position:absolute; - left:1px; - right:5px; - height:30px; - background:transparent; - padding:0; - margin:0; - @include border-radius(0); - pointer-events:none; - z-index:10; - - &.top { - top:27px; - @include background(linear-gradient(rgba(white,1), rgba(white,0))); - } - &.bottom { - bottom:1px; - @include background(linear-gradient(rgba(white,0), rgba(white,1))); - @include border-bottom-radius(3px); - } - } - } - diff --git a/app/assets/stylesheets/old_elements/share_private_tables_dialog.css.scss b/app/assets/stylesheets/old_elements/share_private_tables_dialog.css.scss deleted file mode 100644 index 0a36dd1394c2..000000000000 --- a/app/assets/stylesheets/old_elements/share_private_tables_dialog.css.scss +++ /dev/null @@ -1,71 +0,0 @@ - - - /** - * Share privacy dialog - */ - - - @import "../old_common/vars"; - @import "../old_common/mixins"; - - .share_private_tables_dialog { - ul { - display:block; - margin:30px 0 0 0; - } - - li { - display:block; - width:100%; - height:27px; - padding:6px 0; - - a.name { - float:left; - height:18px; - max-width:200px; - margin:7px 0 0 0; - font-weight:bold; - font-size:0.938em; - @include text-overflow(); - } - - span.status { - float:left; - margin:5px 0 0 10px; - padding:3px 13px; - @include border-radius(25px); - font:bold 0.688em $text-fonts2; - color:white; - line-height:normal; - - &.public {background:rgba(146,188,65,0.5);} - &.private {background:rgba(255,0,0,0.5);} - } - - span.loader { - display:none; - @include size(36px, 15px); - margin:5px 10px 0 0; - @include text-indent(); - background:image-url("layout/loader.gif") no-repeat 0 0; - } - - a.button.grey { - font-size:0.750em; - } - } - - p.error { - padding:0 14px; - margin:10px 0 0; - line-height:44px; - @include border-radius(3px); - background:#FFEAEA; - color:#666666; - font-size:14px; - font-family: $text-fonts; - } - - a.ok {margin:10px 0 0 0;} - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/table_column_selector.css.scss b/app/assets/stylesheets/old_elements/table_column_selector.css.scss deleted file mode 100644 index 5fb3861584a8..000000000000 --- a/app/assets/stylesheets/old_elements/table_column_selector.css.scss +++ /dev/null @@ -1,183 +0,0 @@ - - - /** - * Table column selector plugin - */ - - @import "compass/css3/inline-block"; - @import "compass/css3/transform"; - @import "compass/css3/images"; - @import "compass/css3/opacity"; - @import "../old_common/mixins"; - - .table_preview { - position:relative; - - div.table { - display:block; - height:202px; - padding:14px; - background:#F2F2F2; - @include transform-style("linear"); - @include transition-property("height"); - @include transition-duration(320ms); - - div.select.tables { - @include transform-style("linear"); - @include transition-property("margin"); - @include transition-duration(320ms); - margin-top:60px; - } - - p { - margin-top:5px; - text-align:center; - text-overflow:ellipsis; - overflow:hidden; - } - - &.chosen { - height:22px; - border-bottom:1px solid rgba(#CCCCCC,0.5); - div.select.tables {margin:0;} - p {display:none;} - } - } - - div.columns { - - ul { - position:relative; - width:100%; - max-height:180px; - overflow: auto; - - &:before { - content:'Loading columns'; - position:absolute; - top:10px; - left:55px; - padding:2px 0 2px 25px; - @include background(image-url('layout/mini-loader.gif') no-repeat top left white); - z-index:-1; - color:#999999; - font-size:13px; - } - - li { - position:relative; - padding:9px 13px; - margin-bottom:0!important; - border-bottom:1px solid rgba(#CCCCCC,0.5)!important; - z-index:1; - - &:last-child {border-bottom:none!important;} - } - } - } - - div.merge_methods { - position:absolute; - display:none; - right:0; - bottom:-35px; - width:175px; - - label { - float:left; - margin: 2px 10px 0 0; - color:#999999; - font-size:13px; - line-height:18px; - } - - ul { - float:left; - - li { - @include inline-block(); - margin: 0 1px 0 0!important; - - &:first-child a { - @include border-radius(3px 0 0 3px); - } - &:last-child a { - @include border-radius(0 3px 3px 0); - } - - a { - display:block; - padding: 7px; - font-size: 9px; - text-transform: uppercase; - background:#f1f1f1; - text-decoration: none; - font-weight:bold; - color:#397DB8; - - /*@include simple-transition(color, 100ms);*/ - /*@include simple-transition(background, 50ms);*/ - - &:hover, &.selected { color: #fff!Important; background: #397DB8; } - } - } - - } - } - - div.merge_all { - - position:absolute; - display:none; - bottom:-25px; - right:13px; - width:140px; - label {float:right; color:#999999; font-size:13px; line-height:18px;} - a.switch {float:right; margin-left:10px;} - &.moveRight {right:28px;} - } - - // Small switch - .switch, .form_switch { - margin-top:2px; - width:21px; - height:12px; - - span.handle { - top:0px; - width:10px; - height:10px; - left:9px; - } - - &.enabled span.handle {left:9px;} - &.disabled span.handle {left:1px;} - } - - // Small radiobutton - .radiobutton { - width:180px; - white-space:nowrap; - text-overflow:ellipsis; - overflow:hidden; - - - span.radio { - width:8px; - height:8px; - - &:before { - width:4px; - height:4px; - } - } - - &.disabled { - @include opacity(0.35); - - span.radio { - @include opacity(0.35); - } - } - } - } diff --git a/app/assets/stylesheets/old_elements/table_privacy_dialog.css.scss b/app/assets/stylesheets/old_elements/table_privacy_dialog.css.scss deleted file mode 100644 index fe3a9113921f..000000000000 --- a/app/assets/stylesheets/old_elements/table_privacy_dialog.css.scss +++ /dev/null @@ -1,23 +0,0 @@ - - - /** - * Table privacy dialog styles - */ - - .table_privacy_dialog { - .content { - ul { - max-height:220px; - overflow-y:auto; - overflow-x:hidden; - margin: 15px 0 0 0; - - li { - padding: 15px 0; - - &:last-child { padding-bottom: 0; } - a { font-weight: bold; } - } - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/twitter_categories.css.scss b/app/assets/stylesheets/old_elements/twitter_categories.css.scss deleted file mode 100644 index 48012207ef75..000000000000 --- a/app/assets/stylesheets/old_elements/twitter_categories.css.scss +++ /dev/null @@ -1,115 +0,0 @@ - - /** - * Twitter categories styles - * - */ - - @import "../old_common/mixins"; - @import "../old_common/vars"; - @import "compass/css3/opacity"; - @import "compass/css3/transform"; - @import "compass/css3/transition"; - @import "compass/css3/inline-block"; - @import "../old_elements/elements-sprite"; - - - .twitter-categories { - display:block; - border:1px solid #CCCCCC; - background:white; - @include border-radius(3px); - - // Category field - .twitter-category { - @include display-flex(); - @include justify-content(flex-start, start); - @include align-items(center, center); - height: 0; - padding:0 13px; - margin:0; - overflow: hidden; - @include opacity(0); - border-bottom:none; - - i.twitter-icon { - @include inline-block(); - width:17px; - height:14px; - margin-right:10px; - @include elements-sprite(twitter-logo-small-grey); - } - - input.text { - height:24px; - padding:0 10px; - line-height:24px; - border:none; - font-size:15px; - font-weight:300; - font-family: $text-fonts2; - color:#666; - border-left:1px solid #CCCCCC; - outline:none; - - // How I hate placeholder tricks - &::-webkit-input-placeholder { - color:#CCCCCC; - font-style:italic; - } - - &:-moz-placeholder { - color:#CCCCCC; - font-style:italic; - } - - &:-ms-input-placeholder { - color:#CCCCCC; - font-style:italic; - } - - &[readonly] { - background:white; - color: #E0E0E0; - } - - &.long { width:298px } - &.short { width:120px } - } - - // Character counter - div.counter { - @include display-flex(); - @include justify-content(flex-end, end); - @include align-items(center, center); - width:32px; - height:12px; - margin:0 9px 0 0; - text-align:center; - - span.counter-label { - display:none; - width:auto; - padding:0 5px; - @include border-radius(2px); - background:#CCC; - color:white; - font:normal 11px $text-fonts; - line-height:14px; - } - } - - // Category enabled - &.enabled { - border-bottom:1px solid #CCC; - height:46px; - @include opacity(1); - } - - // Last category child! - &:last-child { - border-bottom:none - } - - } - - } diff --git a/app/assets/stylesheets/old_elements/upgrade_dialog.css.scss b/app/assets/stylesheets/old_elements/upgrade_dialog.css.scss deleted file mode 100644 index d7198fdc02b7..000000000000 --- a/app/assets/stylesheets/old_elements/upgrade_dialog.css.scss +++ /dev/null @@ -1,125 +0,0 @@ - - /** - * Upgrade dialog - */ - - @import "compass/css3/inline-block"; - @import "compass/css3/border-radius"; - @import "compass/css3/images"; - @import "../old_common/vars"; - - - .upgrade_account { - - ul.instances { - position:relative; - width:100%; - height:299px; - display:block; - border:none; - @include border-radius(4px); - letter-spacing:-4px; - word-wrap:-4px; - @include background(image-url('layout/loader.gif') no-repeat center 115px); - - &:before { - position:absolute; - z-index:0; - content:'Getting pricing info...'; - top:45%; - left:0; - width:100%; - margin-top:10px; - text-align:center; - letter-spacing: 0; - color:#787878; - } - - &.active { - border:1px solid #DEDEDE; - } - - &.disabled { - background:white; - &:before { - left:50%; - margin:-25px 0 0 -200px; - width:400px; - content:'There was an error getting pricing information. Please try again later or send an email to support@cartodb.com.'; - color:rgba(red,0.5); - line-height:20px; - } - } - - & > li { - position:relative; - @include inline-block(); - letter-spacing:0; - word-wrap:0; - padding:32px 37px 37px; - width:138px; - height:230px; - margin:0; - background:#F2F2F2; - border-bottom:0!important; - border-right:1px solid #E5E5E5; - - &:nth-child(2) {@include border-left-radius(4px);} - &:last-child {width:138.6px; /*lol*/ border:none; @include border-right-radius(4px);} - - h4 { - font:bold 29px $title-fonts; - color:#333333; - letter-spacing:-2px; - small { - font-size:21px; - letter-spacing:-1px; - } - } - p.sub { - margin:0; - font:normal 17px $title-fonts; - color:#333333; - line-height:20px; - text-transform: capitalize; - } - - ul { - padding:6px 0; - li { - padding:12px 0; - p {font:normal 15px $text-fonts; color:#666666;} - } - } - - a.button { - display:block; - padding:10px 10px 12px 25px; - line-height:16px; - font-weight:bold; - font-family:$text-fonts; - font-size:15px!important; - - span.radio { - top:1px; - border-color:#333333; - } - } - - &.selected { - background: white; - - a.button, a.button:hover { - @include background(linear-gradient(#7FA938,#94BE42)); - } - - h4, p.sub {color:000000;} - ul li p {color:#333333;} - } - } - } - - a.list_prices { - margin:17px 20px 0 0; - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/old_elements/visualizations-selector.css.scss b/app/assets/stylesheets/old_elements/visualizations-selector.css.scss deleted file mode 100644 index cb7751161fbc..000000000000 --- a/app/assets/stylesheets/old_elements/visualizations-selector.css.scss +++ /dev/null @@ -1,87 +0,0 @@ - - // Visualizations combo - - @import "compass/css3/border-radius"; - @import "compass/css3/inline-block"; - @import "compass/css3/opacity"; - @import "../old_common/common-sprite"; - @import "../old_common/mixins"; - - - - .visualizations-selector { - width:100%; - } - - .visualizations-dropdown { - - .select2-results li { - padding:8px 0; - } - - .select2-results .select2-result-label { - display:block; - width:auto; - } - - .select2-results .select2-highlighted { - background:#EEEEEE; - border-bottom:1px solid rgba(0,0,0,0); - } - - div.vis-info-item { - @include display-flex(); - @include justify-content(space-between, justify); - @include align-items(center, center); - - img { - width:18px; - height:18px; - margin-left:6px; - background:#EDEDED; - @include border-radius(18px); - } - - .value { - color:#666666; - @include text-overflow(); - } - - .by { - @include display-flex(); - @include justify-content(flex-end, end); - @include align-items(center, center); - color:#999999; - - span.permission { - width:40px; - line-height:15px; - margin-right:5px; - font-size:10px; - text-align:center; - border:1px solid #BBBBBB; - @include border-radius(20px); - } - - span.username { - font-size:11px; - } - - .remove { - margin-left:5px; - @include common-sprite(close_grey); - @include size(13px); - - &:hover { @include common-sprite(close_grey, $offset_y:-13px); } - } - } - - &.disabled { - @include opacity(0.5); - } - - &.shared { - .value { max-width:200px } - } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/table/create_visualization_dialog.css.scss b/app/assets/stylesheets/table/create_visualization_dialog.css.scss deleted file mode 100644 index 8a69d6b837f3..000000000000 --- a/app/assets/stylesheets/table/create_visualization_dialog.css.scss +++ /dev/null @@ -1,37 +0,0 @@ - - - /** - * Duplicate table dialog styles - */ - - @import "compass/css3/images"; - @import "old_common/form-elements"; - - .create_visualization { - - @include default-form-info(); - @include default-input(); - - input { - width:346px; - padding:14px 11px; - } - - .modal.creating { - display:none; - width:300px!important; - - .creating_content {padding:80px 40px;} - - div.loader { - padding-top:40px; - @include background(image-url('layout/loader.gif') no-repeat center top); - p {text-align:center;} - } - } - - .modal.error { - display:none; - width:600px!important; - } - } diff --git a/app/assets/stylesheets/table/geocoding_dialog/geocoder_stats.css.scss b/app/assets/stylesheets/table/geocoding_dialog/geocoder_stats.css.scss deleted file mode 100644 index e68f31e84e42..000000000000 --- a/app/assets/stylesheets/table/geocoding_dialog/geocoder_stats.css.scss +++ /dev/null @@ -1,43 +0,0 @@ - - - /** - * Geocoder user stats styles - * - * For the moment only used in geocoding dialog. - */ - - @import "compass/css3/border-radius"; - @import "compass/css3/images"; - - div.geocoder_stats { - position:relative; - display:block; - - a { text-decoration:underline; font-weight:bold; } - - p strong.cost { - color: #E95850; - } - - div.progress { - display:block; - height:8px; - margin: 9px 0; - - @include border-radius(8px); - background:#E2E2E2; - overflow:hidden; - - span.used { - display:block; - height:8px; - min-width:3%; - margin:0; - @include background(linear-gradient(#85acdc, #5990ce)); - @include border-radius(8px); - - &.warning {@include background(linear-gradient(#E7B100, #FF9326));} - &.danger {@include background(linear-gradient(#FF7373, #FF4D4D));} - } - } - } diff --git a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane.css.scss b/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane.css.scss deleted file mode 100644 index 4c501dd6669e..000000000000 --- a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane.css.scss +++ /dev/null @@ -1,421 +0,0 @@ - - /** - * Default styles for a geocoding dialog pane - * - * - A box with a title and a list of options. - */ - - @import "compass/css3/border-radius"; - @import "compass/css3/inline-block"; - @import "compass/css3/opacity"; - @import "compass/css3/images"; - @import "compass/css3/filter"; - @import "compass/css3/background-size"; - @import "../../table/table-sprite"; - @import "../../old_common/vars"; - @import "../../old_common/mixins"; - @import "../../old_common/form-elements"; - - - - // Head - .geocoding-dialog.create-dialog { - div.head { - padding-bottom:15px; - } - } - - // Content - section.block div.content { - - $br: 3px; // Default border radius for any pane - - // Pane wrapper - .geocoding-pane-default-geocoder { - display:block; - width:525px; - overflow-x:hidden; - overflow-y:visible!important; - } - - .geocoding-pane-content-wrapper { - width:1200px; - } - - .geocoding-pane-step { - @include inline-block(); - vertical-align: top; - width:525px; - margin-right:40px; - } - - // Default - .geocoding-pane-default { - - // Infobox styles - @include default-form-info(); - - // Title - .geocoding-pane-title { - @include display-flex(); - @include align-items(center, center); - height:26px; - padding:0 15px; - background:#394046; - @include border-top-radius($br); - - h4 { - font:500 12px $text-fonts; - color:white; - } - } - - // Options content - .geocoding-pane-options { - position:relative; - display:block; - border:1px solid #BBBBBB; - border-top:none; - @include border-bottom-radius($br); - background:white; - z-index:1; - - li { - @include display-flex(); - @include justify-content(space-between, justify); - @include align-items(center, center); - height:49px; - padding:0 15px; - } - - .geocoding-pane-label { - font:400 13px $text-fonts2; - color:#666666; - } - } - } - - - // Pane styles - // Marvelous animations by @javier - // from old georeference dialog - .geocoding-pane-styles { - display:block; - height:auto; - @include display-flex(); - -webkit-transform: translate3d(0,0,0); - -moz-transform: translate3d(0,0,0); - transform: translate3d(0,0,0); - - li { - position:relative; - border:none; - outline:none; - - @include cross-browser(flex-grow, 1); - - -webkit-transition: background-color 350ms ease-in-out; - -moz-transition: background-color 350ms ease-in-out; - -o-transition: background-color 350ms ease-in-out; - transition: background-color 350ms ease-in-out; - - &.selected { - - .opt { - color:white; - background:#3B7EBB; - } - - .marker { - background: #4F79BD; - border-color: #25527C; - } - - } - - .opt { - display: block; - position:relative; - outline:none; - padding: 25px 20px; - @include box-sizing(border-box); - min-height: 203px; - - border: 1px solid #BBBBBB; - - font-size:15px; - font-weight:500; - text-align:center; - - background:white; - } - - &:first-child .opt { border-right: none; @include border-radius(5px 0px 0px 5px); } - &:last-child .opt { @include border-radius(0px 5px 5px 0px); } - - span { - position:absolute; - bottom: 25px; - @include inline-block(); - $width: 163px; - width: $width; - left: 50%; - margin-left: -$width/2; - line-height:normal; - } - - &:last-child span { - $width: 200px; - width: $width; - margin-left: -$width/2; - } - - .marker { - - &.a { top: 0px; left: 14px; } - &.b { top: 30px; left: 42px; } - &.c { top: 20px; left: 72px; } - - @include opacity(0); - position:absolute; - width: 12px; - height: 12px; - display: block; - @include border-radius(100px); - background: #ccc; - border: 1px solid #bbb; - z-index:2; - - &.a { - -webkit-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - -moz-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - -o-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - } - - &.b { - -webkit-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - -moz-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - -o-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - } - - &.c { - -webkit-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - -moz-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - -o-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - } - - } - - .icon_container { - margin: 0 auto 5px; - position:relative; - width: 96px; - height: 96px; - - @include border-radius(200px); - border: 2px solid rgba(#333, .55); - - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - - -webkit-transform: translate3d(0,0,0); - -moz-transform: translate3d(0,0,0); - transform: translate3d(0,0,0); - background-size: cover; - - clear:both; - overflow:hidden; - - .icon { width: 96px; height: 96px; } - - } - - .opt .icon { - @include filter(grayscale(100%)); - @include opacity(.9); - } - - .opt, .opt .icon { - -webkit-transition: all 250ms ease-out; - -moz-transition: all 250ms ease-out; - -o-transition: all 250ms ease-out; - transition: all 250ms ease-out; - } - - - &.disabled { - - &.animated { - - .icon .marker.a { top: 33px; @include opacity(1); } - .icon .marker.b { top: 60px; @include opacity(1); } - .icon .marker.c { top: 40px; @include opacity(1); } - - } - - .opt, &.selected .opt { - - .icon_container { - - border: 2px solid rgba(#333, .3); - - .icon { - @include filter(grayscale(80%)); - @include opacity(.5); - .marker { - background: #666; - border-color: #333; - - } - } - } - - span { color: #999999; font-weight:normal;} - background:#fff; - } - - &.point span { - width: 200px; - margin-left: -100px; - } - - &.polygon .icon, - &.selected.polygon .icon { - -webkit-transform: scale(1, 1); - transform: scale(1, 1); - } - } - - .opt .warning { - position:absolute; - top: 30px; - right:65px; - width:31px; - height:31px; - @include background(image-url("layout/georeference_warning.png") repeat center center); - @include opacity(1); - } - - .opt .loading { - position:absolute; - top: 30px; - right:65px; - width:31px; - height:31px; - @include background(image-url("layout/loader.gif") no-repeat center center white); - @include background-size(24px 10px); - border:1px solid #CCC; - @include opacity(1); - @include border-radius(31px); - } - - em { - text-decoration: underline; - color:#467FB7; - &:hover { color:black } - } - - &.selected .opt { - - .icon_container { - border: 2px solid rgba(#333, .75); - .icon { @include opacity(1); } - } - - .icon { - @include filter(grayscale(0%)); - @include opacity(1); - } - - } - - &.point { - - .icon { @include background(image-url("layout/georeference_points.png") repeat center center); } - - &.selected.animated .icon .marker { - &.a { top: 33px; @include opacity(1); } - &.b { top: 60px; @include opacity(1); } - &.c { top: 40px; @include opacity(1); } - } - - &.animated .icon .marker { - &.a { top: 33px; @include opacity(.7); } - &.b { top: 60px; @include opacity(.7); } - &.c { top: 40px; @include opacity(.7); } - } - - } - - &.polygon { - - .icon_container:before { - content: ''; - width: 100px; - height: 100px; - display: block; - border: 3px solid #fff; - background: none; - position: absolute; - border-radius: 100px; - top: 50%; - left: 50%; - margin-left: -50px; - margin-top: -50px; - padding: 0; - @include box-sizing(border-box); - z-index:1; - } - - .icon { - -webkit-transform: scale(.5, .5) rotate(10deg); - transform: scale(.5, .5) rotate(10deg); - @include background(image-url("layout/georeference_polygons.png") repeat center center); - width: 400px; - height: 400px; - top: -132px; - left: -137px; - position: absolute; - } - - &.selected .icon { - -webkit-transform: scale(1, 1); - transform: scale(1, 1); - } - } // polygon - - } - } - - // Pane footer - .geocoding-pane-foot { - display:block; - height:45px; - margin-top:40px; - - .back { - float:left; - display:none; - margin-top:12px; - padding-left:17px; - @include table-sprite(blue-back-arrow, $offset-y:4px); - line-height:17px; - - &:hover { - @include table-sprite(blue-back-arrow, $offset-y:-16px); - text-decoration:none; - } - } - - .ok.button { - float:right; - @include inline-block(); - font-size:17px; - } - } - } - \ No newline at end of file diff --git a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane_address.css.scss b/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane_address.css.scss deleted file mode 100644 index b2dfab7b201f..000000000000 --- a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane_address.css.scss +++ /dev/null @@ -1,80 +0,0 @@ - - /** - * Address geocoding styles within geocoding dialog - * - */ - - @import "compass/css3/border-radius"; - @import "../../old_common/vars"; - @import "../../old_common/mixins"; - - - .geocoding-quota { - - .loading { - padding-left:45px; - background: image-url("layout/loader_transparent.gif") no-repeat 0 0; - } - - .message p { - font-size:13px; - em { color: #EB594C } - } - - &.pane-quota .pane-progress.geocoding-progress { - height:42px; - } - } - - - .geocoding-pane-address { - - // Add additional column view - .geocoding-additional-columns { - position:relative; - - li { border-bottom:1px solid rgba(204,204,204,0.35)!important } - } - - // Add additional column link - .add_column { - position:absolute; - bottom:-8px; - left:15px; - padding:3px 8px; - border:1px solid #397EB8; - @include border-radius(15px); - background:white; - text-decoration:none; - font-size:9px; - z-index:2; - - &:hover { border-color:black } - } - - .geocoding-pane-options ul { - li { - position:relative; - } - } - - .geocoding-pane-terms { - @include display-flex(); - @include justify-content(flex-start, start); - float:left; - width:287px; - margin-top:10px; - - .checkbox { width:20px; } - - label { - margin-left:7px; - color:#999999; - font-size:13px; - - &.error { color:#eb594c } - } - - input { margin-top:2px } - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane_lonlat.css.scss b/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane_lonlat.css.scss deleted file mode 100644 index 950aec8fd34a..000000000000 --- a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_pane_lonlat.css.scss +++ /dev/null @@ -1,108 +0,0 @@ - - /** - * Styles for longitude and latitude pane - * - */ - - @import "compass/css3/border-radius"; - @import "../../old_common/vars"; - @import "../../old_common/mixins"; - @import "../../old_common/form-elements"; - - - $br: 3px; // Default border radius for this pane - - - section.block div.content { - - .geocoding-pane-lonlat { - - ul.lonlat-columns { - position:relative; - @include display-flex(); - @include justify-content(space-between, justify); - z-index:2; - - li { - border:none; - - // Column type - &.column { - width:249px; - @include cross-browser(flex-grow, 2); - } - - // Separator type - &.separator { - position:relative; - @include cross-browser(flex-grow, 1); - - // Lines - &:before, - &:after { - content:''; - position:absolute; - left:50%; - width:1px; - margin-left:-1px; - background:rgba(black,0.23); - z-index:2; - } - - &:before { top:0; height:35px } - &:after { bottom:0; height:9px } - } - - &:first-child { - .lonlat-content { - @include border-bottom-left-radius($br); - border-left:1px solid #BBBBBB; - } - label { @include border-top-left-radius($br) } - } - - &:last-child { - .lonlat-content { - border-right:1px solid #BBBBBB; - @include border-bottom-right-radius($br); - } - label { @include border-top-right-radius($br) } - } - } - - div.lonlat-content { - padding:14px; - background:white; - border-bottom:1px solid #BBBBBB; - } - - div.separator-content { - position:relative; - height:21px; - padding:14px 5px; - background:white; - text-align:center; - color:#BBB; - font:normal 17px $text-fonts; - line-height:21px; - border-bottom:1px solid #BBBBBB; - } - - label { - @include display-flex(); - @include align-items(center, center); - height:26px; - padding:0 15px; - background:#394046; - font:500 12px $text-fonts; - color:white; - } - } - - // Infobox styles - @include default-form-info(); - } - - - } - \ No newline at end of file diff --git a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_tabs.css.scss b/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_tabs.css.scss deleted file mode 100644 index 9a3732b583d1..000000000000 --- a/app/assets/stylesheets/table/geocoding_dialog/geocoding_dialog_tabs.css.scss +++ /dev/null @@ -1,69 +0,0 @@ - - /** - * Styles for new geocoding tabs - * - */ - - @import "compass/css3/images"; - @import "../../old_common/mixins"; - @import "../../old_common/vars"; - @import "../../table/table-sprite"; - - .geocoding-dialog { - - // GEOCODING TABS ICONS - .create-tab { - height:125px; - - a { - @include display-flex(); - @include justify-content(flex-end,end); - @include align-items(center,center); - height:90px; - } - - span { margin-top:15px } - } - - .create-icon { - margin-bottom:0!important; - - &.lonlat { - width:28px; - height:35px; - @include table-sprite(geocoding-tabs-icons, $offset-x:0); - } - - &.city { - width:44px; - height:43px; - @include table-sprite(geocoding-tabs-icons, $offset-x:-28px); - } - - &.admin { - width:49px; - height:37px; - @include table-sprite(geocoding-tabs-icons, $offset-x:-74px); - } - - &.postal { - width:49px; - height:37px; - @include table-sprite(geocoding-tabs-icons, $offset-x:-123px); - } - - &.ip { - width:42px; - height:33px; - @include table-sprite(geocoding-tabs-icons, $offset-x:-173px); - } - - &.address { - width:28px; - height:35px; - @include table-sprite(geocoding-tabs-icons, $offset-x:-216px); - } - - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/table/geocoding_dialog/geocoding_message_dialog.css.scss b/app/assets/stylesheets/table/geocoding_dialog/geocoding_message_dialog.css.scss deleted file mode 100644 index e066f541da0a..000000000000 --- a/app/assets/stylesheets/table/geocoding_dialog/geocoding_message_dialog.css.scss +++ /dev/null @@ -1,187 +0,0 @@ - - /** - * Georeference message dialog - */ - - @import "compass/css3/inline-block"; - @import "compass/css3/filter"; - @import "../../old_common/vars"; - @import "../../old_common/form-elements"; - @import "../../old_common/mixins"; - - - .geocoding_message_dialog { - text-align: center; - - h4 { margin: 0 0 10px 0; padding: 0; font-size: 17px; line-height:normal; } - p { font-size: 15px; color: #666; line-height:normal; } - - - .mamufas .block.modal a.close { - right: -18px; - top: -18px; - } - - .mamufas .block.modal div.content { - padding: 40px; - } - - section.block p { margin: 0 0 15px 0;} - - .mamufas .block.modal div.foot { overflow: visible; padding: 0px 40px 48px 40px; } - .mamufas .block.modal div.foot a { padding: 12px 32px; } - - .marker { - - &.a { top: 0px; left: 14px; } - &.b { top: 30px; left: 42px; } - &.c { top: 20px; left: 72px; } - - @include opacity(0); - width: 12px; - height: 12px; - display:block; - position:absolute; - @include border-radius(100px); - background: #ccc; - border: 1px solid #bbb; - - &.a { - -webkit-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - -moz-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - -o-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 300ms ease-in-out, opacity 200ms ease-in; - } - - &.b { - -webkit-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - -moz-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - -o-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 200ms ease-in-out, opacity 200ms ease-in; - } - - &.c { - -webkit-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - -moz-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - -o-transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - transition: all 400ms ease-in-out,border-color 400ms ease-in-out, background-color 400ms ease-in-out, top 400ms ease-in-out, opacity 400ms ease-in; - } - - &.error:after { - content: '×'; - color: #f1f1f1; - display: block; - position: relative; - top: -3px; - font-size: 15px; - } - - } - - .icon_container { - margin: 0 auto 5px auto; - position:relative; - width: 96px; - height: 96px; - @include border-radius(200px); - border: 2px solid rgba(#333, .55); - - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - -webkit-transform: translate3d(0,0,0); - -moz-transform: translate3d(0,0,0); - transform: translate3d(0,0,0); - background-size: cover; - - clear:both; - overflow:hidden; - - .icon { width: 96px; height: 96px; } - } - - .opt { - position:relative; - margin: auto; - width: 96px; height: 96px; - margin: 0 auto 25px auto; - } - - .opt .icon_container .icon { - @include filter(grayscale(100%)); - @include opacity(.9); - } - - .opt, .opt > .icon { - -webkit-transition: all 250ms ease-in-out; - -moz-transition: all 250ms ease-in-out; - -o-transition: all 250ms ease-in-out; - transition: all 250ms ease-in-out; - } - - .opt > .icon { - position:absolute; - top: 0px; - right: -5px; - width:31px; - height:31px; - @include simple-transition(all, 170ms, ease-in); - } - - .opt .icon.warning { - @include background(image-url("layout/georeference_warning.png") repeat center center); - } - - .opt .icon.error { - @include background(image-url("layout/georeference_error.png") repeat center center); - } - - .point .icon_container .icon { @include background(image-url("layout/georeference_points.png") repeat center center); } - - .point.selected.animated .icon_container .icon .marker.a { top: 33px; @include opacity(1);-webkit-transform: scale(1, 1); transform: scale(1, 1); } - .point.selected.animated .icon_container .icon .marker.b { top: 60px; @include opacity(1);-webkit-transform: scale(1, 1); transform: scale(1, 1); } - .point.selected.animated .icon_container .icon .marker.c { top: 40px; @include opacity(1);-webkit-transform: scale(1, 1); transform: scale(1, 1); } - - .point.animated .icon_container .icon .marker.a { top: 33px; @include opacity(.7); -webkit-transform: scale(.6, .6); transform: scale(.6, .6); } - .point.animated .icon_container .icon .marker.b { top: 60px; @include opacity(.7); -webkit-transform: scale(.6, .6); transform: scale(.6, .6); } - .point.animated .icon_container .icon .marker.c { top: 40px; @include opacity(.7); -webkit-transform: scale(.6, .6); transform: scale(.6, .6); } - - .polygon { - - .icon_container:before { - content: ''; - width: 100px; - height: 100px; - display: block; - border: 3px solid #fff; - background: none; - position: absolute; - border-radius: 300px; - top: 50%; - left: 50%; - margin-left: -49px; - margin-top: -49px; - padding: 0; - @include box-sizing(border-box); - z-index:1; - } - - .icon_container .icon { - -webkit-transform: scale(.5, .5) rotate(10deg); - -moz-transform: scale(.5, .5) rotate(10deg); - transform: scale(.5, .5) rotate(10deg); - @include background(image-url("layout/georeference_polygons.png") repeat center center); - width: 400px; - height: 400px; - top: -132px; - left: -137px; - position: absolute; - } - - &.selected .icon_container .icon { - -webkit-transform: scale(1, 1); - transform: scale(1, 1); - } - } - - } \ No newline at end of file diff --git a/app/assets/stylesheets/table/header/header_content.css.scss b/app/assets/stylesheets/table/header/header_content.css.scss index 73cf8f3e1c35..c433b26ae96d 100644 --- a/app/assets/stylesheets/table/header/header_content.css.scss +++ b/app/assets/stylesheets/table/header/header_content.css.scss @@ -246,7 +246,6 @@ a { display: block; font-weight:300; - &.share, &.data_download { font-weight:500; } } } diff --git a/app/assets/stylesheets/table/header/sync_now_modal.css.scss b/app/assets/stylesheets/table/header/sync_now_modal.css.scss deleted file mode 100644 index bdf1f697edcc..000000000000 --- a/app/assets/stylesheets/table/header/sync_now_modal.css.scss +++ /dev/null @@ -1,21 +0,0 @@ - - /** - * Sync now modal - */ - - @import "compass/css3/images"; - - - .modal.syncing { - display:block; - padding:40px; - - div.loader { - display:block; - margin-top:10px; - padding-top:40px; - @include background(image-url('layout/loader.gif') no-repeat center top); - } - - p { text-align:center } - } \ No newline at end of file diff --git a/app/assets/stylesheets/table/metadata_dialog.css.scss b/app/assets/stylesheets/table/metadata_dialog.css.scss deleted file mode 100644 index 4dd34036f4fc..000000000000 --- a/app/assets/stylesheets/table/metadata_dialog.css.scss +++ /dev/null @@ -1,238 +0,0 @@ -/** - * Metadata dialog styles - */ - -@import "compass/css3/box-sizing"; -@import "compass/css3/opacity"; -@import "compass/css3/images"; -@import "compass/css3/transition"; -@import "old_common/form-elements"; -@import "old_common/mixins"; - - - -.metadata_dialog { - - @include default-form-info(); - @include default-input(); - @include default-textarea(); - - // Sections - div.content { - padding: 22px 40px 40px 40px; - } - - div.foot { - padding: 0 40px 35px 40px!important; - border:none!important; - } - - // Elements - input[type="text"], - textarea { - @include box-sizing(border-box); - width:410px; - padding:14px 11px; - } - - textarea { - height: 90px; - max-width:410px; - max-height:90; - resize: none; - - &[readonly] { - background: #F5F5F5; - color: #CCC; - } - } - - label { - display:block; - margin:0 0 7px 0; - } - - .hint { - margin: 4px 0 0 0; - padding: 4px 3px 0 0; - font-size: 12px; - text-align: right; - color: #ccc; - - strong { margin-right: 3px; } - em { margin-right: 3px; font-style: italic; } - } - - - // Owner - .owner { - float:left; - - h3 { - color: #ccc; - font-size: 12px; - text-transform: uppercase; - margin: 0 0 7px 0; - } - - span { - vertical-align: top; - color: #666666; - font-size: 15px; - line-height: 20px; - } - - img { - width: 20px; - height: 20px; - vertical-align: top; - @include border-radius(100px); - } - } - - // Tags - ul { - position:relative; - @include box-sizing(border-box); - @include inline-block(); - max-height:100px!important; - width:410px; - padding: 12px 11px 8px; - background:white; - border: 1px solid #C0C1C2; - @include border-radius(4px); - - // Focus? - &.focus { - outline:none; - border-color:#999999; - @include box-shadow(rgba(0,0,0,0.1) 0 0 2px 2px); - } - - li { border:none; } - - li.tagit-choice { - margin:0 3px 3px 0; - padding:0; - background:#4086C3; - border:1px solid #2B5B85!important; - @include border-radius(3px); - font:normal 11px "Arial"; - color:#FFFFFF; - - span.tagit-label { - @include inline-block(); - padding:2px 5px; - font-size: 14px; - border-right:1px solid #2B5B85; - line-height:19px; - } - - a.tagit-close { - position:relative; - @include inline-block(); - width:auto; - height:100%; - margin:0; - line-height:19px; - - &:hover { - span.text-icon {color:white;} - text-decoration:none; - } - - span.text-icon { - display:block; - margin:0; - padding:0 5px 0px 7px; - line-height:19px; - color:#1F4362; - } - } - } - - li.tagit-choice.tagit-choice-read-only { - .tagit-label { border-right: 0px } - } - - li.tagit-new { - padding:0; - margin-top:0; - margin-bottom:0; - width: 100px; - - input { - @include inline-block(); - &:focus { @include box-shadow(none); } - position:relative; - top:0; - right:auto; - left:auto; - bottom:auto; - margin:3px 0 3px 5px; - padding:0; - font-size:15px; - line-height:16px; - } - } - - // Read only state - &.readonly { - background:#F5F5F5; - - li { - @include opacity(0.5); - } - } - } - - - // Scrollpane! - .metadata_list { - position:relative; - width: 100%!important; - min-height: 310px; - max-height: 350px; - overflow-y: hidden; - overflow-x: visible; - outline:none; - - .jspContainer { overflow: hidden; position: relative; } - .jspPane { position: absolute; width:100%!important } - .jspVerticalBar { @include simple-transition(opacity, 150ms); @include opacity(0); position: absolute; top: 0; right: 0; width: 6px; height: 100%; background: none; z-index: 20; } - .jspVerticalBar * { margin: 0; padding: 0; } - .jspCap { display: none; } - .jspTrack { background: none; position: relative; } - .jspDrag { background: rgba(#BBB, .5); @include border-radius(5px); position: relative; top: 0; left: 0; cursor: pointer; } - .jspDrag.jspHover { background: rgba(#BBB,1) } - .jspArrow { background: none; text-indent: -20000px; display: block; cursor: pointer; } - .jspVerticalBar .jspArrow { height: 10px; } - .jspVerticalBar .jspArrow:focus { outline: none; } - .jspCorner { background: #eeeef4; float: left; height: 100%; } - - &:hover .jspVerticalBar { @include opacity(0.8); } - } - - // Scroll gradients - span.scroll { - position:absolute; - left:0; - right:5px; - width:100%; - height:30px; - background:transparent; - padding:0; - margin:0; - @include border-radius(0); - pointer-events:none; - z-index:10; - - &.top { display:none; top:0; @include background(linear-gradient(rgba(white,1), rgba(white,0)));} - &.bottom {bottom:0px; @include background(linear-gradient(rgba(white,0), rgba(white,1)));} - } - - section.modal.confirmation { - display:none; - } - -} diff --git a/app/assets/stylesheets/table/new_layer_dialog.css.scss b/app/assets/stylesheets/table/new_layer_dialog.css.scss deleted file mode 100644 index 26e02fdf993c..000000000000 --- a/app/assets/stylesheets/table/new_layer_dialog.css.scss +++ /dev/null @@ -1,54 +0,0 @@ - - /** - * New layer dialog styles - */ - - @import "compass/css3/border-radius"; - @import "compass/css3/opacity"; - @import "../old_common/vars"; - @import "../old_common/mixins"; - - .new_layer_dialog { - - span.loader { - display:block; - width:100%; - margin:15px 0 0 0; - padding:28px 0 0 0; - text-align:center; - background:image-url("layout/loader.gif") no-repeat center top; - color:#898989; - } - - ul.options { - div.options { - @include opacity(0); - } - } - - div.upload { - input[type="text"] { width:410px!important; } - } - - .combo_wrapper { - display:none; - padding:12px; - background:#F2F2F2; - @include border-radius(6px); - margin: 10px 0 0 0; - } - - p.warning { - display:none; - padding:0 14px; - margin:4px 0 0; - line-height:44px; - @include border-radius(3px); - background:#FFF8E3; - color:#666666; - font-size:14px; - font-family: $text-fonts; - - &.privacy, &.error {background:#FFEAEA;} - } - } diff --git a/app/assets/stylesheets/table/share_private_vis_dialog.css.scss b/app/assets/stylesheets/table/share_private_vis_dialog.css.scss deleted file mode 100644 index b88a3c40164f..000000000000 --- a/app/assets/stylesheets/table/share_private_vis_dialog.css.scss +++ /dev/null @@ -1,27 +0,0 @@ - - - /** - * Styles for share private vis dialog - */ - - @import "../old_common/vars"; - @import "../old_common/mixins"; - - .share_private_vis_dialog { - span.loader { - display:none; - position:absolute; - bottom:52px; - right:170px; - @include size(36px, 15px); - margin:5px 10px 0 0; - @include text-indent(); - background:image-url("layout/loader.gif") no-repeat 0 0; - } - - p.error { - display:none; - margin:10px 0 0; - color:rgba(255,0,0,0.5); - } - } \ No newline at end of file diff --git a/app/assets/stylesheets/table/table-sprite.css.scss b/app/assets/stylesheets/table/table-sprite.css.scss index aa521687b6df..ba9f81ec1910 100644 --- a/app/assets/stylesheets/table/table-sprite.css.scss +++ b/app/assets/stylesheets/table/table-sprite.css.scss @@ -15,8 +15,6 @@ $table-sprites: sprite-map("sprites/table/*.png", $repeat: no-repeat, $readonly-spacing: 0, $table-infowindow_panel_icons-spacing: 20px, - $table-download_dark-spacing: 1px, - $table-download_blue-spacing: 1px, $table-drag_points-spacing: 40px, $table-unredo-spacing: 15px, $table-lock_open-spacing: 15px, diff --git a/app/assets/stylesheets/table/table.css.scss b/app/assets/stylesheets/table/table.css.scss index a3dae761eea7..3a799036d0b4 100644 --- a/app/assets/stylesheets/table/table.css.scss +++ b/app/assets/stylesheets/table/table.css.scss @@ -7,7 +7,7 @@ @import "../table/table-sprite"; @import "../old_elements/progress-bar"; - @-webkit-keyframes highlight-fade { + @-webkit-keyframes highlight-fade { 0% { background: none; } 20% { background: #ECFCE5; } 80% { background: #ECFCE5; } @@ -515,7 +515,7 @@ div.table { &.vis { div.shadow { top:144px; - } + } } // tbody @@ -718,27 +718,9 @@ div.order_selector { background: image-url('layout/clock.png') no-repeat 0 0 transparent; } -.data_download { - cursor: pointer; - - span.icon { - @include inline-block(); - vertical-align:middle; - height: 9px; - width: 13px; - margin:0 0 1px; - padding:0; - @include table-sprite(download_blue); - } - - &:hover span.icon { - @include table-sprite(download_dark); - } -} - // Hello hacks for Firefox -@-moz-document url-prefix() { +@-moz-document url-prefix() { table { border-collapse: inherit; } thead div.sqlview { z-index:1!important; } thead tr th div { z-index:2!important; } diff --git a/app/assets/stylesheets/table/table_big_loader.css.scss b/app/assets/stylesheets/table/table_big_loader.css.scss deleted file mode 100644 index ad1de0cf9a87..000000000000 --- a/app/assets/stylesheets/table/table_big_loader.css.scss +++ /dev/null @@ -1,23 +0,0 @@ - - /** - * Big loader for table view - * - It will work when changes between table or visualization - */ - - @import "compass/css3/images"; - - - .table_big_loader { - - .modal { - width:300px!important; - - .content {padding:80px 40px;} - - div.loader { - padding-top:40px; - @include background(image-url('layout/loader.gif') no-repeat center top); - p {text-align:center;} - } - } - } \ No newline at end of file diff --git a/app/models/organization.rb b/app/models/organization.rb index ecd086be19a3..df19d9fb896b 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -147,11 +147,8 @@ def unassigned_quota quota_in_bytes - assigned_quota end - # options: - # :show_organization_users: load all organization users under :users key - def to_poro(filtered_user = nil, options = {}) - filtered_user ||= self.owner - poro = { + def to_poro + { :created_at => self.created_at, :description => self.description, :discus_shortname => self.discus_shortname, @@ -177,17 +174,6 @@ def to_poro(filtered_user = nil, options = {}) :admin_email => self.admin_email, :avatar_url => self.avatar_url } - if options[:show_organization_users] == true - poro[:users] = self.users.reject { |item| filtered_user && item.id == filtered_user.id } - .map { |u| - { - :id => u.id, - :username => u.username, - :avatar_url => u.avatar_url - } - } - end - poro end def public_visualizations(page_num = 1, items_per_page = 5, tag = nil) diff --git a/app/models/user/user_decorator.rb b/app/models/user/user_decorator.rb index d3ef2ef7fbf9..27022787bdae 100644 --- a/app/models/user/user_decorator.rb +++ b/app/models/user/user_decorator.rb @@ -74,7 +74,7 @@ def data(options = {}) base_url: self.public_url } - data[:organization] = self.organization.to_poro(self, options) if self.organization.present? + data[:organization] = self.organization.to_poro if self.organization.present? if options[:extended] data.merge({ diff --git a/app/views/admin/visualizations/show.html.erb b/app/views/admin/visualizations/show.html.erb index 861b3b679677..4d3e275768e1 100644 --- a/app/views/admin/visualizations/show.html.erb +++ b/app/views/admin/visualizations/show.html.erb @@ -1,23 +1,15 @@ -<% - user_data_options = current_user.has_feature_flag?('new_modals') ? {} : { show_organization_users: true } -%> <% content_for(:page_title) do %> <%= @visualization.name %> | <% end %> <% content_for(:css) do %> - <% if current_user.has_feature_flag?('new_modals') %> - <%= stylesheet_link_tag 'old_common_without_core.css', :media => 'all' %> - <% else %> - <%= stylesheet_link_tag 'old_common.css', :media => 'all' %> - <% end %> - <%= stylesheet_link_tag 'common.css', 'cdb.css', 'table.css', 'editor.css', 'map.css', :media => 'all' %> + <%= stylesheet_link_tag 'old_common_without_core.css', 'common.css', 'cdb.css', 'table.css', 'editor.css', 'map.css', :media => 'all' %> <% end %>