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.

Sign up for GitHub

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

Frontend cleaning #3563

Merged
merged 25 commits into from
May 11, 2015
Merged

Frontend cleaning #3563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
40c5710
Frontend assets version bumped
xavijam May 7, 2015
c5e5e5f
Removed old dashboard images + sprite
xavijam May 7, 2015
b0db639
First steps renaming, cleaning and moving CSS files
xavijam May 7, 2015
dc51e11
Added S3 upload improvement
xavijam May 7, 2015
55f1b97
Common submodule moved
xavijam May 7, 2015
3da3d1e
CSS files changed
xavijam May 7, 2015
8cdce3f
Common submodule now is old_common
xavijam May 7, 2015
a40f24d
Correctly added new changes in s3 grunt upload
xavijam May 7, 2015
a5fb156
old common submodule updated
xavijam May 7, 2015
06fcd77
git modules changes
xavijam May 7, 2015
ae7a99a
old-common version updated
xavijam May 7, 2015
026ae7e
Master merge conflicts solved
xavijam May 8, 2015
a54b19e
Removed specs stylesheet from application.rb
xavijam May 8, 2015
48557fb
Changes in git modules
xavijam May 8, 2015
2de888a
Updated cdb
xavijam May 8, 2015
d158754
Changes with JS and JST related
xavijam May 8, 2015
8122d27
twitter category getting template from old common
xavijam May 8, 2015
3ad2197
back to old urls in modules
xavijam May 8, 2015
5785edd
Fixed template route for import arcgis pane tests
xavijam May 8, 2015
835a843
Filled up all_js file to be generated for jasmine test
xavijam May 8, 2015
badfe6e
fixed styles for element stylesheets
xavijam May 8, 2015
b3985df
cartodb.js updated
xavijam May 8, 2015
beb81c5
Conflicts solved
xavijam May 11, 2015
e7b3b47
NEWs changed
xavijam May 11, 2015
432b51a
Added steps in news
xavijam May 11, 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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "lib/assets/javascripts/cdb"]
path = lib/assets/javascripts/cdb
url = git://github.com/CartoDB/cartodb.js.git
[submodule "app/assets/stylesheets/common"]
path = app/assets/stylesheets/common
url = git://github.com/CartoDB/cartodb.js.git
[submodule "app/assets/stylesheets/old_common"]
path = app/assets/stylesheets/old_common
url = git://github.com/CartoDB/cartodb.css.git
[submodule "lib/sql"]
path = lib/sql
Expand Down
11 changes: 11 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
3.10.2 ()
---------
* Ongoing backend refactor and migration from Sequel to ActiveRecord.
* Frontend assets cleaning [PR 3563](https://github.com/CartoDB/cartodb/pull/3563).

#### Steps to avoid problems with submodules changes
```shell
# Before get last changes from master, let's remove the
# common submodule
git submodule deinit app/assets/stylesheets/common
git pull origin master
git submodule sync
git submodule update --init
```

3.10.1 (2015-05-05)
-------------------
Expand Down
Binary file removed app/assets/images/sprites/dashboard/burguer.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/burguer_line.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/download_dataset.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/download_dataset_people.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/feed.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/feed_error.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/paginator_arrows.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/prohibited.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/square.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/star.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/t.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/t_plus.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/trash.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/v.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/sprites/dashboard/x.png
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions app/assets/stylesheets/cdb.css.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/stylesheets/common
Open in desktop
Submodule common deleted from 332cb1
5 changes: 0 additions & 5 deletions app/assets/stylesheets/common.css.scss
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ..._common/background-importer-item.css.scss → .../common/background-importer-item.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../new_variables/progress-bar";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";
@import "../variables/progress-bar";

// Background importer item styles

Expand Down
6 changes: 3 additions & 3 deletions ...s/new_common/background-importer.css.scss → ...heets/common/background-importer.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

// Background importer styles

Expand Down
6 changes: 3 additions & 3 deletions ...ets/stylesheets/new_common/badge.css.scss → app/assets/stylesheets/common/badge.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

.Badge {
position: absolute;
Expand Down
6 changes: 3 additions & 3 deletions ...s/stylesheets/new_common/buttons.css.scss → ...ssets/stylesheets/common/buttons.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Buttons
// --------------------------------------------------

@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

.Button {
@include display-flex();
Expand Down
6 changes: 3 additions & 3 deletions ...sheets/new_common/change-privacy.css.scss → ...tylesheets/common/change-privacy.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

.ChangePrivacy-upgradeBanner {
padding: 20px 0;
Expand Down
6 changes: 3 additions & 3 deletions ...ew_common/connect_dataset/dialog.css.scss → ...ts/common/connect_dataset/dialog.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../new_variables/mixins";
@import "../../new_variables/colors";
@import "../../new_variables/sizes";
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";



Expand Down
6 changes: 3 additions & 3 deletions ...sheets/new_common/content-footer.css.scss → ...tylesheets/common/content-footer.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

.ContentFooter {
@include display-flex();
Expand Down
11 changes: 11 additions & 0 deletions app/assets/stylesheets/common/create/create_dialog.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";


.Dialog-body.CreateDialog-body {
position: relative;
width: 100%;
padding: 35px 0 0;
overflow: auto;
}
6 changes: 3 additions & 3 deletions .../new_common/create/create_footer.css.scss → ...eets/common/create/create_footer.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../new_variables/mixins";
@import "../../new_variables/colors";
@import "../../new_variables/sizes";
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";

// Create dialog footer styles

Expand Down
6 changes: 3 additions & 3 deletions .../new_common/create/create_header.css.scss → ...eets/common/create/create_header.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../new_variables/mixins";
@import "../../new_variables/colors";
@import "../../new_variables/sizes";
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";


.CreateDialog-header {
Expand Down
6 changes: 3 additions & 3 deletions ...new_common/create/create_listing.css.scss → ...ets/common/create/create_listing.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../new_variables/mixins";
@import "../../new_variables/colors";
@import "../../new_variables/sizes";
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";

// Create dialog listing block styles

Expand Down
6 changes: 3 additions & 3 deletions ...new_common/create/create_preview.css.scss → ...ets/common/create/create_preview.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../new_variables/mixins";
@import "../../new_variables/colors";
@import "../../new_variables/sizes";
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";

// Create dialog preview block styles

Expand Down
6 changes: 3 additions & 3 deletions ...w_common/create/create_templates.css.scss → ...s/common/create/create_templates.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../new_variables/mixins";
@import "../../new_variables/colors";
@import "../../new_variables/sizes";
@import "../../variables/mixins";
@import "../../variables/colors";
@import "../../variables/sizes";

// Map templates styles
$w: 700px;
Expand Down
6 changes: 3 additions & 3 deletions ...mmon/create/listing/import_panel.css.scss → ...mmon/create/listing/import_panel.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";

// Default import panel styles

Expand Down
6 changes: 3 additions & 3 deletions .../listing/import_selected_dataset.css.scss → .../listing/import_selected_dataset.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";

// Selected dataset styles

Expand Down
6 changes: 3 additions & 3 deletions ...on/create/listing/import_twitter.css.scss → ...on/create/listing/import_twitter.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";

// Import twitter view styles

Expand Down
6 changes: 3 additions & 3 deletions ...n/create/listing/imports_options.css.scss → ...n/create/listing/imports_options.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";
@import "compass/css3/images";

// Imports styles
Expand Down
6 changes: 3 additions & 3 deletions ...reate/listing/listing_navigation.css.scss → ...reate/listing/listing_navigation.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";

// Navigation styles

Expand Down
6 changes: 3 additions & 3 deletions ...mmon/create/listing/service_list.css.scss → ...mmon/create/listing/service_list.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";

// Service list styles within import panel

Expand Down
6 changes: 3 additions & 3 deletions ...mmon/create/preview/map_template.css.scss → ...mmon/create/preview/map_template.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../new_variables/mixins";
@import "../../../new_variables/colors";
@import "../../../new_variables/sizes";
@import "../../../variables/mixins";
@import "../../../variables/colors";
@import "../../../variables/sizes";

// Map template video styles

Expand Down
6 changes: 3 additions & 3 deletions ...ts/new_common/create/video_steps.css.scss → ...sheets/common/create/video_steps.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

$standardColor: #D0D0D0;
$blueColor: #3190DB;
Expand Down
6 changes: 3 additions & 3 deletions ...esheets/new_common/datasets-list.css.scss → ...stylesheets/common/datasets-list.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

/* compensate for the negative margins and border */
$selectedItemPaddingOnSides: $sMargin-element - 1px;
Expand Down
6 changes: 3 additions & 3 deletions ...tylesheets/new_common/datepicker.css.scss → ...ts/stylesheets/common/datepicker.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";


/**
Expand Down
6 changes: 3 additions & 3 deletions ...s/new_common/default-description.css.scss → ...heets/common/default-description.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Default description for datasets and maps
// --------------------------------------------------

@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../new_variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";
@import "../variables/mixins";

.DefaultDescription {
font-size: $sFontSize-normal;
Expand Down
6 changes: 3 additions & 3 deletions ...ets/new_common/default-paragraph.css.scss → ...esheets/common/default-paragraph.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../new_variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";
@import "../variables/mixins";

.DefaultParagraph {
font-size: $sFontSize-large;
Expand Down
4 changes: 2 additions & 2 deletions ...ets/new_common/default-secondary.css.scss → ...esheets/common/default-secondary.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Default secondary paragraph texts
// --------------------------------------------------

@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/colors";
@import "../variables/sizes";

.DefaultSecondary {
font-size: $sFontSize-large;
Expand Down
6 changes: 3 additions & 3 deletions ...lesheets/new_common/default-tags.css.scss → .../stylesheets/common/default-tags.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Default tags for datasets and maps
// --------------------------------------------------

@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../new_variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";
@import "../variables/mixins";

.DefaultTags {
color: $cTypography-secondary;
Expand Down
6 changes: 3 additions & 3 deletions ...ets/new_common/default-time-diff.css.scss → ...esheets/common/default-time-diff.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Time diff indicator (2 weeks ago by ...)
// --------------------------------------------------

@import "../new_variables/colors";
@import "../new_variables/mixins";
@import "../new_variables/sizes";
@import "../variables/colors";
@import "../variables/mixins";
@import "../variables/sizes";

.DefaultTimeDiff {
@include display-flex();
Expand Down
4 changes: 2 additions & 2 deletions ...esheets/new_common/default-title.css.scss → ...stylesheets/common/default-title.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/colors";
@import "../variables/sizes";

// Default title for datasets and maps
//
Expand Down
6 changes: 3 additions & 3 deletions ...s/stylesheets/new_common/default.css.scss → ...ssets/stylesheets/common/default.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
// --------------------------------------------------------------------------------------------------------------------

@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../new_variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";
@import "../variables/mixins";

* {
margin: 0;
Expand Down
6 changes: 3 additions & 3 deletions ...ts/stylesheets/new_common/dialog.css.scss → ...assets/stylesheets/common/dialog.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

/* set by base dialog */
body.is-inDialog {
Expand Down
6 changes: 3 additions & 3 deletions ...esheets/new_common/dropdown-link.css.scss → ...stylesheets/common/dropdown-link.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../new_variables/sizes";
@import "../variables/mixins";
@import "../variables/colors";
@import "../variables/sizes";

// Append a standard dropdown triangle icon next to he right of the text of the link, like "foobar v".
// Usage is as simple as:
Expand Down
4 changes: 2 additions & 2 deletions .../stylesheets/new_common/dropdown.css.scss → ...sets/stylesheets/common/dropdown.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* The tick can be placed horizontally by .tick_left/center/right, or vertically by .tick_top/middle/bottom, in
* combination with horizontal_left/right and vertical_top/bottom.
*/
@import "../new_variables/mixins";
@import "../new_variables/colors";
@import "../variables/mixins";
@import "../variables/colors";

.Dropdown {
position: absolute;
Expand Down
Loading