Merge branch 'master' of github.com:CartoDB/CartoAssets into forms-assets

This commit is contained in:
Emilio García
2016-01-22 13:09:14 +01:00
126 changed files with 3852 additions and 49 deletions
Binary file not shown.
File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.
Binary file not shown.
@@ -15,7 +15,7 @@
```
*/
@import '../variables/colors';
@import '../cdb-variables/colors';
.box {
width: 120px;
@@ -12,7 +12,7 @@ There is only one state 'is-visible', in order to make it visible.
```
*/
@import '../utilities/mixins';
@import '../cdb-utilities/mixins';
.CDB-Loader {
@include css3-prefix(animation, loader-progress 1000ms linear 1);
@@ -12,7 +12,7 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava
```
*/
@import '../utilities/mixins';
@import '../cdb-utilities/mixins';
.CDB-Shape-dot {
display: inline-block;
@@ -2,7 +2,7 @@
// ----------------------------------------------
/* SG
# Typography/
# Typography
```
<p class="Text Size-huge">Open Sans 26/34 Regular</p>
@@ -11,10 +11,10 @@
<p class="Text Size-medium">Open Sans 12/16 Semibold</p>
<p class="Text is-semibold Size-small">Open Sans 10/14 Semibold</p>
<p class="Text Size-small">Open Sans 10/14 Regular</p>
```
```
*/
@import '../variables/sizes';
@import '../cdb-variables/sizes';
.Text {
font-family: 'Open Sans';
@@ -47,4 +47,3 @@
font-size: $sFontSize-small;
line-height: $sLineHeight-small;
}
File diff suppressed because it is too large Load Diff
+60
View File
@@ -0,0 +1,60 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
// Resetting buttons too
button {
margin: 0;
padding: 0;
border: none;
background: transparent;
box-sizing: border-box;
outline: none;
}
dd, dt {
display: inline-block;
}