diff --git a/NEWS.md b/NEWS.md index 580a5c725d54..b43e8f90bb68 100644 --- a/NEWS.md +++ b/NEWS.md @@ -43,7 +43,8 @@ Bugfixes: * Pressing enter when deleting a table opens a new modal [#2126](https://github.com/CartoDB/cartodb/pull/2126) * Deselect all doesn't work [#2341](https://github.com/CartoDB/cartodb/issues/2341) * Fixes for new dashboard texts [#2499](https://github.com/CartoDB/cartodb/pull/2499) -* Fixes a problem generating images from private visualizations of private org users. +* Fixes a problem generating images from private visualizations of private org users. +* Remove lighter font weights [#2513](https://github.com/CartoDB/cartodb/pull/2513) 3.8.0 (2015-01-30) ------------------ @@ -290,7 +291,7 @@ Bugfixes: * Several minor improvements * Fixed bugs - * Security fix regarding Typhoeus library + * Security fix regarding Typhoeus library * Several minor bugs * Migration Type (see UPGRADE): Mandatory migration diff --git a/app/assets/stylesheets/new_common/create/create_templates.css.scss b/app/assets/stylesheets/new_common/create/create_templates.css.scss index b3cf069f3016..48ebcf183fb4 100644 --- a/app/assets/stylesheets/new_common/create/create_templates.css.scss +++ b/app/assets/stylesheets/new_common/create/create_templates.css.scss @@ -33,7 +33,7 @@ padding-bottom: 10px; text-transform: uppercase; font-size: $sFontSize-small; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color: $cTypography-secondary; border-bottom: 1px solid $cStructure-mainLine; } @@ -83,6 +83,6 @@ .CreateDialog-templatesButtonText { margin: 3px 25px 0 25px; font-size: $sFontSize-normal; + @include nicer-lato-typography(); color: $cTypography-secondary; - font-weight: $sFontWeight-lighter; } diff --git a/app/assets/stylesheets/new_common/create/listing/import_selected_dataset.css.scss b/app/assets/stylesheets/new_common/create/listing/import_selected_dataset.css.scss index 46c5abc0e461..ca321b3f0b06 100644 --- a/app/assets/stylesheets/new_common/create/listing/import_selected_dataset.css.scss +++ b/app/assets/stylesheets/new_common/create/listing/import_selected_dataset.css.scss @@ -42,7 +42,7 @@ $br: 4px; display: block; margin-top: 3px; font-size: $sFontSize-normal; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color: $cTypography-secondary; } .DatasetSelected-sync { @@ -100,4 +100,4 @@ $br: 4px; padding-left: 40px; padding-right: 40px; &:hover { color: white } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/new_common/create/video_steps.css.scss b/app/assets/stylesheets/new_common/create/video_steps.css.scss index 50eb4b3f8809..91b5a102d8f7 100644 --- a/app/assets/stylesheets/new_common/create/video_steps.css.scss +++ b/app/assets/stylesheets/new_common/create/video_steps.css.scss @@ -31,7 +31,7 @@ $blueColor: #3190DB; height: 16px; line-height: $sLineHeight-small; font-size: $sFontSize-smallUpperCase; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); border-radius: 16px; text-align: center; color: white; diff --git a/app/assets/stylesheets/new_common/default-description.css.scss b/app/assets/stylesheets/new_common/default-description.css.scss index c402d630f914..8d5b1fad252f 100644 --- a/app/assets/stylesheets/new_common/default-description.css.scss +++ b/app/assets/stylesheets/new_common/default-description.css.scss @@ -7,16 +7,12 @@ .DefaultDescription { font-size: $sFontSize-normal; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); line-height: $sLineHeight-normal; color: $cTypography-secondary; overflow-wrap: break-word; position: relative; } -.DefaultDescription.is--empty { - color: $cTypography-help; - font-style: italic; -} .DefaultDescription--error { color: $cHighlight-negative; } diff --git a/app/assets/stylesheets/new_common/default-paragraph.css.scss b/app/assets/stylesheets/new_common/default-paragraph.css.scss index 711f25e8fbc6..4ba987ad8a24 100644 --- a/app/assets/stylesheets/new_common/default-paragraph.css.scss +++ b/app/assets/stylesheets/new_common/default-paragraph.css.scss @@ -1,5 +1,6 @@ @import "../new_variables/colors"; @import "../new_variables/sizes"; +@import "../new_variables/mixins"; .DefaultParagraph { font-size: $sFontSize-large; diff --git a/app/assets/stylesheets/new_common/default-tags.css.scss b/app/assets/stylesheets/new_common/default-tags.css.scss index d51ff5369668..ef00c07b0bda 100644 --- a/app/assets/stylesheets/new_common/default-tags.css.scss +++ b/app/assets/stylesheets/new_common/default-tags.css.scss @@ -3,10 +3,11 @@ @import "../new_variables/colors"; @import "../new_variables/sizes"; +@import "../new_variables/mixins"; .DefaultTags { - color:$cTypography-secondary; - font-weight: $sFontWeight-lighter; + color: $cTypography-secondary; + @include nicer-lato-typography(); } .DefaultTags-item { border: none; @@ -21,9 +22,3 @@ color: $cTypography-linkHover; text-decoration: underline; } -.DefaultTags-item.is--empty { - color: $cTypography-help; - font-style: italic; - font-weight: $sFontWeight-lighter; - &:hover { text-decoration: none } -} \ No newline at end of file diff --git a/app/assets/stylesheets/new_common/default-time-diff.css.scss b/app/assets/stylesheets/new_common/default-time-diff.css.scss index 2ef1b77ad5e2..79c8bbe7dd54 100644 --- a/app/assets/stylesheets/new_common/default-time-diff.css.scss +++ b/app/assets/stylesheets/new_common/default-time-diff.css.scss @@ -9,13 +9,13 @@ @include display-flex(); @include align-items(center, center); font-size: $sFontSize-normal; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color:$cTypography-secondary; } .DefaultTimeDiff-icon { margin-right: 5px; font-size: $sFontSize-smallUpperCase; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color: $cTypography-help; } -.DefaultTimeDiff p { margin-left: 5px } \ No newline at end of file +.DefaultTimeDiff p { margin-left: 5px } diff --git a/app/assets/stylesheets/new_common/default.css.scss b/app/assets/stylesheets/new_common/default.css.scss index b7f8a812f198..1f0900d7701c 100644 --- a/app/assets/stylesheets/new_common/default.css.scss +++ b/app/assets/stylesheets/new_common/default.css.scss @@ -13,6 +13,7 @@ * { margin: 0; padding: 0; + text-rendering: optimizeLegibility; } body { diff --git a/app/assets/stylesheets/new_common/filters.css.scss b/app/assets/stylesheets/new_common/filters.css.scss index c6340c3f44fe..fa4a4e3d5a79 100644 --- a/app/assets/stylesheets/new_common/filters.css.scss +++ b/app/assets/stylesheets/new_common/filters.css.scss @@ -19,7 +19,7 @@ .Filters.is-fixed { position: fixed; background: white; - + &:before { content: ''; position:absolute; @@ -100,7 +100,7 @@ vertical-align: middle; margin-right:5px; margin-left: 1px; - + } .Filters-searchLink:hover { color: #333 } .Filters-searchItem { @@ -138,7 +138,7 @@ line-height:31px; background: transparent; outline: none; - + &:hover { border:1px solid #999; color:#999; @@ -147,14 +147,17 @@ a.Filters-cleanSearch { line-height:32px } // We can't group this style :( .Filters-searchInput::-webkit-input-placeholder { + font-weight: $sFontWeight-normal; font-style:italic; color:#DDD; } .Filters-searchInput::-moz-placeholder { + font-weight: $sFontWeight-normal; font-style:italic; color:#DDD; } .Filters-searchInput:-ms-placeholder { + font-weight: $sFontWeight-normal; font-style:italic; color:#DDD; } @@ -183,7 +186,7 @@ a.Filters-cleanSearch { line-height:32px } width:100%; height:1px; background:$cTypography-linkSelected; - } + } &:hover { cursor:default; text-decoration: none; diff --git a/app/assets/stylesheets/new_common/form-content.css.scss b/app/assets/stylesheets/new_common/form-content.css.scss index 4f6b17175413..9291af936c5c 100644 --- a/app/assets/stylesheets/new_common/form-content.css.scss +++ b/app/assets/stylesheets/new_common/form-content.css.scss @@ -44,6 +44,7 @@ .Form-label { font-size: $sFontSize-normal; font-weight: $sFontWeight-normal; + @include nicer-lato-typography(); color: $cTypography-paragraphs; } .Form-rowPreview { @@ -78,7 +79,7 @@ font-size: 14px; font-weight: $sFontWeight-lighter; color: $cTypography-secondary; - + &:before, &:after { content: ''; position: absolute; @@ -115,10 +116,10 @@ &:focus { border-color: #999 } } -.Form-input::-webkit-input-placeholder { font-style: italic; font-weight: $sFontWeight-lighter } -.Form-input:-moz-placeholder { font-style: italic; font-weight: $sFontWeight-lighter } -.Form-input::-moz-placeholder { font-style: italic; font-weight: $sFontWeight-lighter } -.Form-input:-ms-input-placeholder { font-style: italic; font-weight: $sFontWeight-lighter } +.Form-input::-webkit-input-placeholder { font-style: italic; } +.Form-input:-moz-placeholder { font-style: italic; } +.Form-input::-moz-placeholder { font-style: italic; } +.Form-input:-ms-input-placeholder { font-style: italic; } // Sizes .Form-input--longer { width: 434px } @@ -172,7 +173,6 @@ background: #FFF4F4; color: $cHighlight-negative; font-size: $sFontSize-normal; - font-weight: $sFontWeight-lighter; border-radius: 4px; @include transition(top, 200ms, ease-in-out); } @@ -187,7 +187,7 @@ .Form-copyIcon.hover { color: $cTypography-paragraphs } .Form-text--preview { font-size: $sFontSize-normal; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color: $cTypography-secondary; line-height: $sLineHeight-large; } @@ -265,4 +265,4 @@ font-size: $sFontSize-normal; color: white; text-align: center; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/new_common/forms/checkbox.css.scss b/app/assets/stylesheets/new_common/forms/checkbox.css.scss index 0e03bb18f1fb..6efbb91840af 100644 --- a/app/assets/stylesheets/new_common/forms/checkbox.css.scss +++ b/app/assets/stylesheets/new_common/forms/checkbox.css.scss @@ -23,7 +23,7 @@ border: 2px solid $cStructure-mainLine; border-radius: 3px; background: white; - + &:hover { border-color: #AAA; } @@ -53,7 +53,6 @@ } .Checkbox-label { margin-left: 8px; - font-weight: $sFontWeight-lighter; color: $cTypography-secondary; } .Checkbox.is-disabled .Checkbox-input { @@ -66,4 +65,4 @@ } .Checkbox.is-disabled .Checkbox-label { @include opacity(0.4); -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/new_common/forms/radiobutton.css.scss b/app/assets/stylesheets/new_common/forms/radiobutton.css.scss index 5fff8bf629fe..95ce5909d313 100644 --- a/app/assets/stylesheets/new_common/forms/radiobutton.css.scss +++ b/app/assets/stylesheets/new_common/forms/radiobutton.css.scss @@ -23,7 +23,7 @@ border: 2px solid $cStructure-mainLine; border-radius: 16px; background: white; - + &:hover { border-color: #AAA } } .RadioButton-input.is-checked { @@ -40,8 +40,8 @@ } .RadioButton-label { margin-left: 8px; - font-weight: $sFontWeight-lighter; color: $cTypography-secondary; + @include nicer-lato-typography(); } .RadioButton.is-disabled .RadioButton-input { @include opacity(0.4); @@ -53,4 +53,4 @@ } .RadioButton.is-disabled .RadioButton-label { @include opacity(0.4); -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/new_common/likes-indicator.css.scss b/app/assets/stylesheets/new_common/likes-indicator.css.scss index dc883973e067..f3d893a5d740 100644 --- a/app/assets/stylesheets/new_common/likes-indicator.css.scss +++ b/app/assets/stylesheets/new_common/likes-indicator.css.scss @@ -8,9 +8,9 @@ $cLiked: #D93F56; .LikesIndicator { - font-weight: $sFontWeight-lighter; color:$cTypography-secondary; cursor: default; + @include nicer-lato-typography(); } .LikesIndicator-icon { @include transform(1); diff --git a/app/assets/stylesheets/new_common/no-results.css.scss b/app/assets/stylesheets/new_common/no-results.css.scss new file mode 100644 index 000000000000..411ec2b445f0 --- /dev/null +++ b/app/assets/stylesheets/new_common/no-results.css.scss @@ -0,0 +1,10 @@ +@import "../new_variables/colors"; +@import "../new_variables/sizes"; + +.NoResults { + font-size: $sFontSize-normal; + line-height: $sLineHeight-normal; + color: $cTypography-help; + font-style: italic; + &:hover { text-decoration: none } +} diff --git a/app/assets/stylesheets/new_common/rows-indicator.css.scss b/app/assets/stylesheets/new_common/rows-indicator.css.scss index 8553dd8ad08c..f5724154f9eb 100644 --- a/app/assets/stylesheets/new_common/rows-indicator.css.scss +++ b/app/assets/stylesheets/new_common/rows-indicator.css.scss @@ -1,14 +1,15 @@ @import "../new_variables/colors"; @import "../new_variables/sizes"; +@import "../new_variables/mixins"; .RowsIndicator { - font-weight: $sFontWeight-lighter; color: $cTypography-secondary; + @include nicer-lato-typography(); } .RowsIndicator-icon { margin-right: 4px; font-size: $sFontSize-smaller; + @include nicer-lato-typography(); line-height: $sLineHeight-smaller; - font-weight: $sFontWeight-lighter; color: $cTypography-help; } diff --git a/app/assets/stylesheets/new_common/size-indicator.css.scss b/app/assets/stylesheets/new_common/size-indicator.css.scss index f49c2effedeb..48b32220eacf 100644 --- a/app/assets/stylesheets/new_common/size-indicator.css.scss +++ b/app/assets/stylesheets/new_common/size-indicator.css.scss @@ -1,13 +1,14 @@ @import "../new_variables/colors"; @import "../new_variables/sizes"; +@import "../new_variables/mixins"; .SizeIndicator { - font-weight: $sFontWeight-lighter; color: $cTypography-secondary; + @include nicer-lato-typography(); } .SizeIndicator-icon { margin-right: 4px; font-size: $sFontSize-small; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color: $cTypography-help; } diff --git a/app/assets/stylesheets/new_common/support-banner.css.scss b/app/assets/stylesheets/new_common/support-banner.css.scss index 4598aadded31..7d23e94dd9a5 100644 --- a/app/assets/stylesheets/new_common/support-banner.css.scss +++ b/app/assets/stylesheets/new_common/support-banner.css.scss @@ -22,9 +22,9 @@ color:white; } .SupportBanner-infoDescription { - margin-top:5px; - font-weight: $sFontWeight-lighter; - font-weight: $sFontSize-large; + margin-top: 5px; + font-weight: $sFontWeight-normal; + font-size: $sFontSize-large; color:rgba(white, .5); } .SupportBanner-infoDescriptionLink { diff --git a/app/assets/stylesheets/new_common/user-avatar.css.scss b/app/assets/stylesheets/new_common/user-avatar.css.scss index 4f4412ec3cf3..6612bb445be9 100644 --- a/app/assets/stylesheets/new_common/user-avatar.css.scss +++ b/app/assets/stylesheets/new_common/user-avatar.css.scss @@ -28,7 +28,7 @@ background-color: $cHighlight-negative; color: white; font-size: $sFontSize-smallUpperCase; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); text-align: center; } .UserAvatar-img { diff --git a/app/assets/stylesheets/new_dashboard/background_importer_item.css.scss b/app/assets/stylesheets/new_dashboard/background_importer_item.css.scss index 7aeb27c29394..cde5c9f21fed 100644 --- a/app/assets/stylesheets/new_dashboard/background_importer_item.css.scss +++ b/app/assets/stylesheets/new_dashboard/background_importer_item.css.scss @@ -21,7 +21,6 @@ white-space: nowrap; overflow: hidden; font-size: $sFontSize-normal; - font-weight: $sFontWeight-lighter; color: $cTypography-paragraphs; } .ImportItem-textState { diff --git a/app/assets/stylesheets/new_dashboard/call-to-action.css.scss b/app/assets/stylesheets/new_dashboard/call-to-action.css.scss deleted file mode 100644 index ff99053d3481..000000000000 --- a/app/assets/stylesheets/new_dashboard/call-to-action.css.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import "../new_variables/colors"; -@import "../new_variables/sizes"; - -// Used to hint user to add some optional piece of information, e.g. tags, description. -// TODO: check this component, probably not necessary -.CallToAction { - font-weight: $sFontWeight-lighter; - font-style: italic; - color: $cTypography-link; -} diff --git a/app/assets/stylesheets/new_dashboard/default-editinline.css.scss b/app/assets/stylesheets/new_dashboard/default-editinline.css.scss index 6bda3345b62b..a3b4936b862a 100644 --- a/app/assets/stylesheets/new_dashboard/default-editinline.css.scss +++ b/app/assets/stylesheets/new_dashboard/default-editinline.css.scss @@ -3,13 +3,11 @@ @import "../new_variables/colors"; @import "../new_variables/sizes"; - +@import "../new_variables/mixins"; .DefaultEditInline { - } .DefaultEditInline-form { - } .DefaultEditInline-input { border:none; @@ -19,7 +17,7 @@ // It is not possible to be grouped :( .DefaultEditInline-input::-webkit-input-placeholder { font-style: italic; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); color: $cTypography-link; } .DefaultEditInline-input:hover::-webkit-input-placeholder { color: $cTypography-linkHover } diff --git a/app/assets/stylesheets/new_dashboard/option-card.css.scss b/app/assets/stylesheets/new_dashboard/option-card.css.scss index 98302e0ea81a..03730849ab22 100644 --- a/app/assets/stylesheets/new_dashboard/option-card.css.scss +++ b/app/assets/stylesheets/new_dashboard/option-card.css.scss @@ -45,6 +45,6 @@ .OptionCard-desc { font-size: $sFontSize-normal; line-height: $sLineHeight-normal; - font-weight: $sFontWeight-lighter; color: $cTypography-secondary; + @include nicer-lato-typography(); } diff --git a/app/assets/stylesheets/new_dashboard/privacy-indicator.css.scss b/app/assets/stylesheets/new_dashboard/privacy-indicator.css.scss index f11d5e2b6ffe..442518c10f42 100644 --- a/app/assets/stylesheets/new_dashboard/privacy-indicator.css.scss +++ b/app/assets/stylesheets/new_dashboard/privacy-indicator.css.scss @@ -11,7 +11,7 @@ $cPrivacy-other: rgba(#F5A623, 1); display: inline-block; position: relative; color: $cTypography-secondary; - font-weight: $sFontWeight-lighter; + @include nicer-lato-typography(); } .PrivacyIndicator:hover { text-decoration: none; diff --git a/app/assets/stylesheets/new_variables/mixins.css.scss b/app/assets/stylesheets/new_variables/mixins.css.scss index ac5bda7fe3b2..30e8cc0f4422 100644 --- a/app/assets/stylesheets/new_variables/mixins.css.scss +++ b/app/assets/stylesheets/new_variables/mixins.css.scss @@ -107,7 +107,14 @@ filter:alpha(opacity=($v*100)); // IE10 } -/* BACKGROUND GRADIENT */ +// The Lato font we use does not render well on some browsers (e.g. IE) when the font size is <= 13px and has a light +// font-weight. This mixin alleviates that we cannot use a light font-weight to make the text render a bit nicer at least. +// It may also be used for font sizes >13px, but only on white background to look OK. +@mixin nicer-lato-typography() { + -webkit-text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; +} + @mixin background-gradient($startColor: #3C3C3C, $endColor: #999999) { background-color: $startColor; background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)); @@ -119,7 +126,6 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#{$startColor}', endColorStr='#{$endColor}'); } -/* BACKGROUND HORIZONTAL */ @mixin background-horizontal($startColor: #3C3C3C, $endColor: #999999) { background-color: $startColor; background-image: -webkit-gradient(linear, left top, right top, from($startColor), to($endColor)); @@ -131,17 +137,14 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#{$startColor}', endColorStr='#{$endColor}', gradientType='1'); } -/* TRANSFORM */ @mixin transform($params) { @include css3-prefix('transform', $params); } -/* TRANSFORM STYLE */ @mixin transform-style($style: preserve-3d) { @include css3-prefix('transform-style', $style); } -/* TRANSITION */ @mixin transition($properties...) { @if length($properties) >= 1 { @@ -153,7 +156,6 @@ } } -/* KEYFRAMES */ @mixin keyframes($animation-name) { @-webkit-keyframes #{$animation-name} { @content; @@ -172,7 +174,6 @@ } } -/* ANIMATION */ @mixin animation($str) { @include css3-prefix('animation', $str); } diff --git a/app/views/admin/pages/new_public_maps.html.erb b/app/views/admin/pages/new_public_maps.html.erb index 5ff7c1f93ee3..0b395e5ca4a9 100644 --- a/app/views/admin/pages/new_public_maps.html.erb +++ b/app/views/admin/pages/new_public_maps.html.erb @@ -30,7 +30,7 @@ <% if vis[:desc] %>

<%= raw vis[:desc] %>

<% else %> - + <% end %> diff --git a/lib/assets/javascripts/cartodb/new_common/views/create/listing/dataset_item.jst.ejs b/lib/assets/javascripts/cartodb/new_common/views/create/listing/dataset_item.jst.ejs index 7e5333419cf1..06d72c19830b 100644 --- a/lib/assets/javascripts/cartodb/new_common/views/create/listing/dataset_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/new_common/views/create/listing/dataset_item.jst.ejs @@ -22,7 +22,7 @@ <% if (description && description.length > 0) { %>

<%= description %>

<% } else { %> - No description + No description <% } %>
@@ -55,16 +55,16 @@
<% if (tagsCount > 0) { %>
- <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> - <% if (i !== (l-1)) { %>,<% } %> - <% } %> - <% if (tagsCount > maxTagsToShow) { %> - and <%= tagsCount - maxTagsToShow %> more - <% } %> + <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> + <% if (i !== (l-1)) { %>,<% } %> + <% } %> + <% if (tagsCount > maxTagsToShow) { %> + and <%= tagsCount - maxTagsToShow %> more + <% } %> +
<% } else { %> - No tags + No tags <% } %>
- - \ No newline at end of file + diff --git a/lib/assets/javascripts/cartodb/new_common/views/create/listing/remote_dataset_item.jst.ejs b/lib/assets/javascripts/cartodb/new_common/views/create/listing/remote_dataset_item.jst.ejs index 4a927ee3e908..32ec0ffe09a9 100644 --- a/lib/assets/javascripts/cartodb/new_common/views/create/listing/remote_dataset_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/new_common/views/create/listing/remote_dataset_item.jst.ejs @@ -5,7 +5,7 @@ <% if (description && description.length > 0) { %>

<%= description %>

<% } else { %> - No description + No description <% } %>
@@ -30,15 +30,16 @@
<% if (tagsCount > 0) { %>
- <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> - <% if (i !== (l-1)) { %>,<% } %> - <% } %> - <% if (tagsCount > maxTagsToShow) { %> - and <%= tagsCount - maxTagsToShow %> more - <% } %> + <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> + <% if (i !== (l-1)) { %>,<% } %> + <% } %> + <% if (tagsCount > maxTagsToShow) { %> + and <%= tagsCount - maxTagsToShow %> more + <% } %> +
<% } else { %> - No tags + No tags <% } %>
- \ No newline at end of file + diff --git a/lib/assets/javascripts/cartodb/new_dashboard/views/datasets_item.jst.ejs b/lib/assets/javascripts/cartodb/new_dashboard/views/datasets_item.jst.ejs index a1afcbbbc139..90feadff0df1 100644 --- a/lib/assets/javascripts/cartodb/new_dashboard/views/datasets_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/new_dashboard/views/datasets_item.jst.ejs @@ -27,7 +27,7 @@ <% if (description && description.length > 0) { %>

<%= description %>

<% } else { %> - No description + No description <% } %>
@@ -60,15 +60,16 @@
<% if (tagsCount > 0) { %>
- <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> - <%= tags[i] %><% if (i !== (l-1)) { %>,<% } %> - <% } %> - <% if (tagsCount > maxTagsToShow) { %> - and <%= tagsCount - maxTagsToShow %> more - <% } %> + <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> + <%= tags[i] %><% if (i !== (l-1)) { %>,<% } %> + <% } %> + <% if (tagsCount > maxTagsToShow) { %> + and <%= tagsCount - maxTagsToShow %> more + <% } %> +
<% } else { %> - No tags + No tags <% } %>
- \ No newline at end of file + diff --git a/lib/assets/javascripts/cartodb/new_dashboard/views/maps_item.jst.ejs b/lib/assets/javascripts/cartodb/new_dashboard/views/maps_item.jst.ejs index 3bd82b5aa9ad..543a2dd431b5 100644 --- a/lib/assets/javascripts/cartodb/new_dashboard/views/maps_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/new_dashboard/views/maps_item.jst.ejs @@ -19,20 +19,22 @@ <% if (des) { %>

<%= des %>

<% } else { %> - No description + No description <% } %> -
+
<% if (tags_count > 0) { %> - <% for (var i = 0, l = Math.min(3,tags.length); i - <%= tags[i] %><% if (i != (l-1)) { %>,<% } %> - <% } %> - <% if (tags_count > 3) { %> - and <%= tags_count - 3%> more - <% } %> +
+ <% for (var i = 0, l = Math.min(3,tags.length); i + <%= tags[i] %><% if (i != (l-1)) { %>,<% } %> + <% } %> + <% if (tags_count > 3) { %> + and <%= tags_count - 3%> more + <% } %> +
<% } else { %> - No tags + No tags <% } %>
diff --git a/lib/assets/javascripts/cartodb/new_dashboard/views/remote_datasets_item.jst.ejs b/lib/assets/javascripts/cartodb/new_dashboard/views/remote_datasets_item.jst.ejs index ad76b78a0b7b..cb7acd47a261 100644 --- a/lib/assets/javascripts/cartodb/new_dashboard/views/remote_datasets_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/new_dashboard/views/remote_datasets_item.jst.ejs @@ -6,7 +6,7 @@ <% if (description && description.length > 0) { %>

<%= description %>

<% } else { %> - No description + No description <% } %>
@@ -31,15 +31,16 @@
<% if (tagsCount > 0) { %>
- <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> - <%= tags[i] %><% if (i !== (l-1)) { %>,<% } %> - <% } %> - <% if (tagsCount > maxTagsToShow) { %> - and <%= tagsCount - maxTagsToShow %> more - <% } %> + <% for (var i = 0, l = Math.min(maxTagsToShow, tags.length); i < l; ++i) { %> + <%= tags[i] %><% if (i !== (l-1)) { %>,<% } %> + <% } %> + <% if (tagsCount > maxTagsToShow) { %> + and <%= tagsCount - maxTagsToShow %> more + <% } %> +
<% } else { %> - No tags + No tags <% } %>
- \ No newline at end of file +