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

Jump to bottom

Fix misplaced footer in New dialog #15418

Merged
merged 5 commits into from
Jan 22, 2020
Merged

Fix misplaced footer in New dialog #15418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5da3f2
Make ShareViaUrl dialog styles specific to dialog footer
jesusbotella Jan 22, 2020
74a331a
Semicolon ;
jesusbotella Jan 22, 2020
ca09bfc
Update NEWS.md
jesusbotella Jan 22, 2020
7d05aed
Do not push bump commit to master
jesusbotella Jan 22, 2020
3091236
Bump assets version
jesusbotella Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ sudo make install
- None yet

### Bug fixes / enhancements
- Fix misplaced footer in Dialogs ([#15418](https://github.com/CartoDB/cartodb/pull/15418))
- Remove directo connections debug trace ([#15274](https://github.com/CartoDB/cartodb/pull/15274))
- New versioned sanitization of column names ([#15326](https://github.com/CartoDB/cartodb/issues/15326))
- Change Catalog dropdown placeholders (([#15335](https://github.com/CartoDB/cartodb/issues/15335)))
Expand Down
4 changes: 2 additions & 2 deletions lib/assets/javascripts/new-dashboard/components/Backbone/Dialogs/ShareViaUrl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>

<div class="Dialog-stickyFooter u-flex">
<div class="Dialog-footer u-inner">
<div class="Dialog-shareViaUrl-footer Dialog-footer u-inner">
<button class="CDB-Button CDB-Button--secondary" @click="close">
<span class="CDB-Button-Text CDB-Text is-semibold CDB-Size-small u-upperCase">{{ $t('Dialogs.ShareViaURL.close') }}</span>
</button>
Expand Down Expand Up @@ -79,7 +79,7 @@ export default {
@import 'new-dashboard/styles/variables';
@import 'assets/stylesheets/editor-3/_cards.scss';

.Dialog-footer {
.Dialog-shareViaUrl-footer.Dialog-footer {
display: flex;
align-items: center;
justify-content: flex-end;
Expand Down
2 changes: 1 addition & 1 deletion lib/assets/javascripts/new-dashboard/components/QuickActions/MapQuickActions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default {
return !this.isOutOfPublicMapsQuota || this.isSelectedMapPrivate;
},
isKuviz () {
return this.map.type === 'kuviz'
return this.map.type === 'kuviz';
}
},
methods: {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "1.0.0-assets.151",
"version": "1.0.0-assets.152",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
Expand Down Expand Up @@ -212,7 +212,7 @@
"lint:css": "stylelint './app/assets/stylesheets/**/*.scss'",
"lint:fix": "eslint . --fix",
"bump": "npm --no-git-tag-version version prerelease --preid=assets",
"postversion": "git add package.json package-lock.json && git commit -m 'Bump assets version' && git push origin master",
"postversion": "git add package.json package-lock.json && git commit -m 'Bump assets version' && git push",
"update-internal-deps": "rm -rf node_modules && npm install",
"branch-files": "node lib/build/branchFiles/branchFiles.js",
"affected_specs": "node lib/build/branchFiles/branchFiles.js | xargs node lib/build/affectedFiles/affectedFiles.js",
Expand Down