Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old, unused modals code #5068

Merged
merged 110 commits into from
Aug 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
0e95e8f
Remove dead code
Aug 13, 2015
866149e
Remove old imagepicker/assets code
Aug 13, 2015
4514100
Remove change-title confirmation
Aug 13, 2015
48a4412
Remove old delete-layer-confirmation
Aug 13, 2015
4483c07
Remove old image picker for pattern
Aug 13, 2015
584bd09
Remove old confirm column type confirmation
Aug 13, 2015
8d244f2
Remove old confirm edit geom
Aug 13, 2015
d7ebdea
Remove gmaps deprecaton confirmation
Aug 13, 2015
d93f96c
Remove old delete columns confirmation
Aug 13, 2015
97e2faa
Remove unnecessary new_modals check
Aug 13, 2015
4d1491c
Remove old delete row confirmation
Aug 13, 2015
134acbc
Remove old metadata code
Aug 14, 2015
4e482f4
Remove old help modals
Aug 14, 2015
36097ac
Remove ref to old geocoder working modal
Aug 14, 2015
bb9a679
Remove old delete slide confirmation
Aug 14, 2015
44478fb
Remove old delete row confirmation
Aug 14, 2015
e12cd45
Remove old change lock view usage
Aug 14, 2015
00e36fc
Remove old geocoding modal usage
Aug 14, 2015
2a76c5e
Remove old share controller usage
Aug 14, 2015
60ccefe
Fix georef view replacement
Aug 14, 2015
9f85dd9
Remove old privacy modal usage
Aug 14, 2015
ea27941
Remove old metadata modal usage
Aug 14, 2015
50e248a
Remove old create Layer modal usage
Aug 14, 2015
1c20bd4
Remove old basemap adder modal usage
Aug 14, 2015
a0ba94f
Remove old new column modal usage
Aug 14, 2015
88bfe58
Remove old sync settings modal
Aug 14, 2015
3e0be88
Remove old sync now modal usage
Aug 14, 2015
060d7a3
Remove old change log modal usage
Aug 14, 2015
32c052e
Remove old export modal usage
Aug 14, 2015
e13de36
Remove old duplicate table modal usage
Aug 14, 2015
0f020a5
Remove old duplicate vis modal usage
Aug 14, 2015
6f3e09c
Remove old change privacy modal usage
Aug 14, 2015
d1510e6
Remove old sync view modal usage
Aug 14, 2015
b8d5134
Remove old merge modal usage
Aug 14, 2015
c970c70
Remove old delete dataset/vis modal usage
Aug 14, 2015
a87d1c0
Remove old add column modal usage
Aug 14, 2015
663a97d
Remove old merge datasets modal usage
Aug 14, 2015
8d03ced
Remove new old geometry dropdown usage
Aug 14, 2015
243b28c
Remove old edit feature modal usage
Aug 14, 2015
74a445e
Remove old georeference modal usage
Aug 14, 2015
b2e71f1
Remove old delete dataset modal usage
Aug 14, 2015
e00dec2
Remove unnecessary .open calls for new modals
Aug 14, 2015
002c24f
Fix imagepicker spec
Aug 14, 2015
32a4919
Remove test case w/o assertions
Aug 14, 2015
78ba7c9
Remove old assets manager spec
Aug 14, 2015
d6adc5b
Remove deprecated test-case
Aug 14, 2015
9aa1456
Remove now unused code
Aug 14, 2015
13043db
Fix actions_menu tests related to old modals
Aug 14, 2015
b6f3ef4
Fix column test
Aug 14, 2015
942f37b
Fix tests due to changed modals
Aug 14, 2015
fc23a96
Apply filter from given columns
Aug 14, 2015
6542107
Remove old basemap chooser panel
Aug 14, 2015
a755e30
Remove CreateLayerDialog
Aug 14, 2015
63b06ec
Remove cdb.admin.CreateVizDialog
Aug 14, 2015
a7c392d
Remove old duplication modals
Aug 14, 2015
c5d347a
Remove old delete modal
Aug 14, 2015
9856de9
Remove old edit feature fields modal
Aug 14, 2015
3c6512f
Remove old share modal
Aug 14, 2015
86a3660
Remove old edit fields metadata modal spec
Aug 14, 2015
50b422a
Remove old export modal
Aug 14, 2015
bd36d8d
Remove old geooding modal
Aug 15, 2015
06f0b67
Remove old lock modal
Aug 15, 2015
1ba70da
Remove old merge tables tests
Aug 15, 2015
4c29f56
Move image picker assets to commons modules
Aug 15, 2015
e36c8f2
Remove old metadata modal
Aug 15, 2015
e75cb57
Remove old new column modal
Aug 15, 2015
94cb05c
Remove old new geometry dropdown
Aug 15, 2015
7e5f55e
Remove old privacy modal
Aug 15, 2015
a8d21a4
Remove old sync setings
Aug 15, 2015
40e9945
Remove old upgrade modal
Aug 15, 2015
f821984
Remove old upload states
Aug 15, 2015
bcac147
Delete old import models
Aug 15, 2015
2d3810d
Remove column selector
Aug 15, 2015
79819e6
Rename file.js to import.js to reflect its content
Aug 15, 2015
b36e3d4
Remove old geocoding stuff
Aug 15, 2015
e714d00
Remove old unused modals encountered
Aug 15, 2015
c4b948b
Remove refs to old base dialog
Aug 15, 2015
ae6c40c
Move model to map box dir
Aug 15, 2015
9fb339e
Replace big loader with default loader modal
Aug 15, 2015
055b919
Fix test
Aug 15, 2015
b90d39d
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 17, 2015
2123dd3
Replace infowindow-help modal with new type
Aug 17, 2015
453edcb
Unifying CSS styles to each conceptual file
Aug 17, 2015
47e2321
Remove old, now unused CSS
Aug 17, 2015
b11cb29
Remove old, now unused CSS elements
Aug 17, 2015
552c754
Delete old, now unused geocoding CSS and assets
Aug 17, 2015
b277fc2
Remove old, now unused CSS in table scope
Aug 17, 2015
657d202
Remove unused data_download rule
Aug 17, 2015
4ad8370
Remove old, now unused CSS leftovers
Aug 17, 2015
b828f68
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 17, 2015
b927c7e
Bump frontend assets version
Aug 17, 2015
7fc4cf6
Remove old, public export options
Aug 17, 2015
e382bbc
Remove old base_dialog (modal)
Aug 17, 2015
444a61d
Remove now unused fileupload vendor files
Aug 17, 2015
111c898
Update NEWS
Aug 17, 2015
6d6907b
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 18, 2015
a2f7842
Bump frontend assets version
Aug 18, 2015
bfd1e5e
Remove unused modernizr file
Aug 18, 2015
0096c6c
Remove unused vendor file
Aug 18, 2015
ac27565
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 18, 2015
75303cf
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 18, 2015
2844abf
Fix using correct object
Aug 19, 2015
ebc8858
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 19, 2015
37321a4
Upgrade cartodb-postgresql extension to 0.9.0
Aug 19, 2015
065de7f
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 19, 2015
1d11cd9
Revert "Upgrade cartodb-postgresql extension to 0.9.0"
Aug 19, 2015
4c062f9
Use synchronisation object directly on table model
Aug 19, 2015
e7c66d9
Use generated iconFonts classes instead of inlined content values
Aug 20, 2015
553a217
Merge remote-tracking branch 'origin/master' into 4673-rm-old-modals
Aug 20, 2015
0ea62ac
Merge branch 'master' into 4673-rm-old-modals
Aug 24, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file removed app/assets/images/layout/arcgis_disabled.png
Binary file not shown.
Binary file removed app/assets/images/layout/geocoding_result_icon.png
Binary file not shown.
Binary file removed app/assets/images/layout/georeference_error.png
Binary file not shown.
Binary file removed app/assets/images/layout/georeference_points.png
Binary file not shown.
Binary file not shown.
Binary file removed app/assets/images/layout/georeference_warning.png
Binary file not shown.
Binary file removed app/assets/images/layout/list.png
Binary file not shown.
Binary file not shown.
Binary file removed app/assets/images/layout/map.png
Binary file not shown.
Binary file removed app/assets/images/layout/mini-loader.gif
Binary file not shown.
Binary file removed app/assets/images/layout/plane.png
Binary file not shown.
Binary file removed app/assets/images/layout/plane_locked.png
Binary file not shown.
Binary file removed app/assets/images/layout/tag.png
Binary file not shown.
Binary file removed app/assets/images/layout/tag_locked.png
Binary file not shown.
Binary file removed app/assets/images/layout/twitter_disabled.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/assets/images/sprites/elements/calendar.png
Binary file not shown.
Binary file removed app/assets/images/sprites/elements/copy_button.png
Binary file not shown.
Binary file not shown.
Binary file removed app/assets/images/sprites/elements/droparea.png
Binary file not shown.
Binary file removed app/assets/images/sprites/elements/paper_plane.png
Binary file not shown.
Binary file removed app/assets/images/sprites/elements/question.png
Binary file not shown.
Binary file not shown.
Binary file removed app/assets/images/sprites/table/download_blue.png
Diff not rendered.
Binary file removed app/assets/images/sprites/table/download_dark.png
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 11 additions & 0 deletions app/assets/stylesheets/common/dialog.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
@import "../variables/colors";
@import "../variables/sizes";

$sSmallWidth: 670px;

/* set by base dialog */
body.is-inDialog {
overflow: hidden;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -221,6 +229,9 @@ body.is-inDialog {
white-space: nowrap;
overflow: hidden;
}
.Dialog-headerText--small {
width: $sSmallWidth;
}
.Dialog-footerBtn {
margin-right: $sMargin-element;
}
Expand Down
11 changes: 11 additions & 0 deletions app/assets/stylesheets/common/icons/illustration-icon.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";
@import "../../map/map-sprite";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No more sprites please, let's try to leave and they are and if we need images, create them separately.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was migrated from app/assets/stylesheets/map/scratch_dialog.css.scss (now deleted) as it was. cc @javierarce

, let's try to leave and they are and if we need images

Not sure I understand the sentence entirely, do we leave it as it is for now or you want to change it? What would be the proper way of writing these rules?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave compass sprites as they are because we are still using it in the editor, but we shouldn't add more icons to them due to the fact that we will remove them when we have the new editor layout.


$cNeutral: $cHighlight-main;
$cPositive: $cHighlight-positive;
Expand Down Expand Up @@ -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;
Expand Down
55 changes: 6 additions & 49 deletions app/assets/stylesheets/common/notifications-dropdown.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
9 changes: 0 additions & 9 deletions app/assets/stylesheets/common/sync_dialog.css.scss

This file was deleted.

8 changes: 1 addition & 7 deletions app/assets/stylesheets/editor/table_overrides.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
47 changes: 7 additions & 40 deletions app/assets/stylesheets/map/map.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ div.map {

@include border-radius(0);

.cartodb-logo {
.cartodb-logo {
margin-bottom: 0px;
bottom: 10px!important;
}
Expand Down Expand Up @@ -471,7 +471,7 @@ div.map {

}

div.cartodb-layer-selector-box {
div.cartodb-layer-selector-box {
display:none;
font-weight: normal;
margin: 0;
Expand All @@ -497,7 +497,7 @@ div.map {
}
}

// Fullscreen
// Fullscreen
div.cartodb-fullscreen {
display:none;
position:absolute;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}


12 changes: 0 additions & 12 deletions app/assets/stylesheets/map/scratch_dialog.css.scss

This file was deleted.

Loading