Merge pull request #2513 from CartoDB/2335-remove-lighter-font-weights

Remove lighter font weights on new dashboard
CartoDB · Mar 2, 2015 · 5ccc1f1 · 5ccc1f1
2 parents 6428aa1 + 51d6953
commit 5ccc1f1
Show file tree

Hide file tree

Showing 31 changed files with 122 additions and 121 deletions.
diff --git 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
@@ -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
@@ -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 }
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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 }
-}
diff --git 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 }
+.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
@@ -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
@@ -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
@@ -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;
-}
+}
diff --git 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);
-}
+}
diff --git 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);
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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