merge master

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cartoassets",
   "description": "Share frontend assets between different CartoDB repositories",
-  "version": "0.1.25",
+  "version": "0.1.29",
   "homepage": "https://github.com/cartodb/CartoAssets",
   "author": {
     "name": "CartoDB",

src/scss/cdb-components/forms/inputs.scss

@@ -21,6 +21,7 @@
   border-radius: $baseSize / 2;
   font-size: $sFontSize-medium;
   line-height: $sLineHeight-medium;
+  box-sizing: border-box;
 
   &:hover {
     border: 1px solid $cHoverLine;

src/scss/cdb-components/forms/legends.scss

@@ -35,37 +35,45 @@
 <br/>
 <br/>
 
-<fieldset>
+<div class="CDB-Fieldset">
-  <p class="CDB-Legend u-iBlock CDB-Text is-semibold CDB-Size-small u-rSpace--m">RADIO</p>
+  <p class="CDB-Legend CDB-Text is-semibold CDB-Size-small u-rSpace--m">RADIO</p>
-  <ul class="CDB-Text CDB-Size-medium u-iBlock">
+  <ul class="CDB-Size-medium CDB-Text CDB-Fieldset-block">
-    <li class="u-iBlock u-rSpace--xl">
+    <li class="u-rSpace--xl u-iblock">
-      <div class="u-iblock CDB-Text CDB-Size-medium u-rSpace--xl">
+      <div class="u-iblock CDB-Size-medium">
         <input class="CDB-Checkbox" type="checkbox" name="hobbies" value="Sport">
         <span class="u-iBlock CDB-Checkbox-face"></span>
         <label class="u-iBlock u-lSpace">Sport</label>
       </div>
     </li>
     <li class="u-iblock">
-      <label class="u-iblock CDB-Text CDB-Size-medium">
+      <label class="u-iblock CDB-Size-medium">
         <input class="CDB-Checkbox" type="checkbox" name="hobbies" value="Travel">
         <span class="u-iBlock CDB-Checkbox-face"></span>
         <label class="u-iBlock u-lSpace">Travel</label>
       </label>
     </li>
   </ul>
-</fieldset>
+</div>
-<fieldset class="u-tSpace-xl CDB-Text">
+<div class="u-tSpace-xl CDB-Text CDB-Fieldset">
-  <p class="CDB-Legend u-iBlock CDB-Text is-semibold CDB-Size-small u-rSpace--m">RADIO</p>
+  <p class="CDB-Legend CDB-Text is-semibold CDB-Size-small u-rSpace--m">RADIO</p>
-  <div class="u-iBlock">
+  <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText">
-    <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText">
+</div>
-  </div>
-</fieldset>
 
 ```
 */
 
 @import '../../cdb-variables/sizes';
+@import '../../cdb-utilities/mixins';
 
 .CDB-Legend {
   width: $baseSize * 12;
 }
+
+.CDB-Fieldset {
+  @include display-flex();
+  @include align-items(center);
+}
+.CDB-Fieldset-block {
+  width: 100%;
+}
+

src/scss/cdb-components/lists.scss

@@ -25,3 +25,4 @@
   display: block;
   padding: 12px 16px;
 }
+

src/scss/cdb-components/menu.scss

@@ -63,10 +63,6 @@
     </ul>
   </nav>
 </div>
-
-<br/><br/>
-<br/><br/>
-
 ```
 */
 
@@ -155,103 +151,3 @@
   }
 }
 
-
-/* SG
-# Menu/Editor
-
-
-```
-<div class="CDB-MenuEditor">
-  <div class="CDB-MenuEditor-logo">
-    <i class="CDB-IconFont CDB-IconFont-cartoFante u-actionTextColor"></i>
-  </div>
-  <nav>
-    <ul class="CDB-MenuEditor-navigation">
-      <li class="CDB-MenuEditor-navigationItem is-selected">
-        <a href="#" class="CDB-MenuEditor-navigationLink">
-          <i class="CDB-IconFont CDB-IconFont-edition CDB-MenuEditor-navigationIcon"></i>
-        </a>
-      </li>
-      <li class="CDB-MenuEditor-navigationItem">
-        <a href="#" class="CDB-MenuEditor-navigationLink">
-          <i class="CDB-IconFont CDB-IconFont-view CDB-MenuEditor-navigationIcon"></i>
-        </a>
-      </li>
-      <li class="CDB-MenuEditor-navigationItem">
-        <a href="#" class="CDB-MenuEditor-navigationLink">
-          <i class="CDB-IconFont CDB-IconFont-odyssey CDB-MenuEditor-navigationIcon"></i>
-        </a>
-      </li>
-      <li class="CDB-MenuEditor-navigationItem">
-        <a href="#" class="CDB-MenuEditor-navigationLink">
-          <i class="CDB-IconFont CDB-IconFont-settings CDB-MenuEditor-navigationIcon"></i>
-        </a>
-      </li>
-    </ul>
-  </nav>
-  <a href="http://piensaenpixel.cartodb.com" class="CDB-MenuEditor-avatar">
-    <img src="https://s3.amazonaws.com/com.cartodb.users-assets.production/production/piensaenpixel/assets/20150507074635Captura%20de%20pantalla%202015-05-07%20a%20la%28s%29%2009.46.28.png" class="CDB-MenuEditor-avatarImage">
-  </a>
-</div>
-```
-*/
-
-.CDB-MenuEditor {
-  position: relative;
-  width: 72px;
-  min-height: 450px;
-  box-sizing: border-box;
-  padding: $baseSize * 2 0;
-  background: $cBlue;
-  box-shadow: 4px 0 $baseSize * 2 rgba(0, 0, 0, 0.05);
-}
-
-.CDB-MenuEditor-navigationItem {
-  padding: 12px $baseSize * 2 12px $baseSize + 6;
-  border-left: 2px solid transparent;
-  text-align: center;
-}
-.CDB-MenuEditor-navigationItem.is-selected {
-  border-left: 2px solid #FFF;
-}
-.CDB-MenuEditor-navigationItem.is-selected .CDB-MenuEditor-navigationIcon {
-  opacity: 1;
-}
-
-.CDB-MenuEditor-navigationLink {
-  display: block;
-}
-.CDB-MenuEditor-navigationIcon {
-  color: #FFF;
-  font-size: 24px;
-  line-height: 24px;
-  opacity: 0.32;
-}
-.CDB-MenuEditor-navigationLink:hover .CDB-MenuEditor-navigationIcon {
-  opacity: 1;
-}
-
-.CDB-MenuEditor-logo {
-  width: 40px;
-  height: 40px;
-  margin: 0 auto $baseSize * 2;
-  padding: $baseSize - 2 0;
-  border-radius: $baseSize / 2;
-  background: #FFF;
-  box-sizing: border-box;
-  font-size: $baseSize * 3;
-  text-align: center;
-}
-
-.CDB-MenuEditor-avatar {
-  position: absolute;
-  bottom: $baseSize * 2;
-  left: $baseSize * 2;
-  width: 40px;
-  height: 40px;
-}
-.CDB-MenuEditor-avatarImage {
-  width: 100%;
-  border-radius: $baseSize / 2;
-}
-