From e8ec2793df7714bda7eca8b8c099cc6001a7766c Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 12:14:43 +0100 Subject: [PATCH 001/391] Yay CartoAssets --- .gitignore | 3 + .jshintrc | 13 + .styleguide | 26 + .tmp/src/scss/components/shapes.css | 1 + .tmp/src/scss/core/mixins.css | 0 .tmp/src/scss/core/normalize.css | 1 + .tmp/src/scss/core/reset.css | 1 + .tmp/src/scss/helpers/normalize.css | 1 + .tmp/src/scss/helpers/reset.css | 1 + .tmp/src/scss/variables/colors.css | 0 .tmp/src/scss/variables/sizes.css | 0 Gruntfile.js | 80 + LICENSE-MIT | 22 + README.md | 9 + dist/cartostyles.css | 1 + package.json | 46 + src/scss/.DS_Store | Bin 0 -> 6148 bytes src/scss/components/shapes.scss | 20 + src/scss/utilities/_mixins.scss | 236 + src/scss/utilities/helpers.scss | 29 + src/scss/utilities/normalize.scss | 578 ++ src/scss/utilities/reset.scss | 40 + src/scss/variables/_colors.scss | 0 src/scss/variables/_sizes.scss | 0 styleguide/_template.html | 91 + styleguide/index.html | 10133 ++++++++++++++++++++++++++ styleguide/theme.css | 122 + 27 files changed, 11454 insertions(+) create mode 100644 .gitignore create mode 100644 .jshintrc create mode 100644 .styleguide create mode 100644 .tmp/src/scss/components/shapes.css create mode 100644 .tmp/src/scss/core/mixins.css create mode 100644 .tmp/src/scss/core/normalize.css create mode 100644 .tmp/src/scss/core/reset.css create mode 100644 .tmp/src/scss/helpers/normalize.css create mode 100644 .tmp/src/scss/helpers/reset.css create mode 100644 .tmp/src/scss/variables/colors.css create mode 100644 .tmp/src/scss/variables/sizes.css create mode 100644 Gruntfile.js create mode 100644 LICENSE-MIT create mode 100644 README.md create mode 100644 dist/cartostyles.css create mode 100644 package.json create mode 100644 src/scss/.DS_Store create mode 100644 src/scss/components/shapes.scss create mode 100644 src/scss/utilities/_mixins.scss create mode 100644 src/scss/utilities/helpers.scss create mode 100644 src/scss/utilities/normalize.scss create mode 100644 src/scss/utilities/reset.scss create mode 100644 src/scss/variables/_colors.scss create mode 100644 src/scss/variables/_sizes.scss create mode 100644 styleguide/_template.html create mode 100644 styleguide/index.html create mode 100644 styleguide/theme.css diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b785247 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules +npm-debug.log +tmp diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..f57a8ff --- /dev/null +++ b/.jshintrc @@ -0,0 +1,13 @@ +{ + "curly": true, + "eqeqeq": true, + "immed": true, + "latedef": true, + "newcap": true, + "noarg": true, + "sub": true, + "undef": true, + "boss": true, + "eqnull": true, + "node": true +} diff --git a/.styleguide b/.styleguide new file mode 100644 index 0000000..0f9e8e1 --- /dev/null +++ b/.styleguide @@ -0,0 +1,26 @@ +{ + "sgComment": "SG", + "srcFolder": ".", + "outputFile": "./styleguide/index.html", + "templateFile": "./styleguide/_template.html", + "themeFile": "./styleguide/theme.css", + "highlightFolder": "./node_modules/highlight.js/styles", + "highlightStyle": "github", + "excludeDirs": [ + "target", + "node_modules" + ], + "fileExtensions": { + "scss": true, + "sass": true, + "css": true, + "less": true + }, + "walkerOptions": { + "followLinks": false + }, + "customVars": { + "sampleVar": "Hello from customVars!" + }, + "jqFile": "./node_modules/jquery/dist/jquery.js" +} diff --git a/.tmp/src/scss/components/shapes.css b/.tmp/src/scss/components/shapes.css new file mode 100644 index 0000000..e7eea9f --- /dev/null +++ b/.tmp/src/scss/components/shapes.css @@ -0,0 +1 @@ +.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px} diff --git a/.tmp/src/scss/core/mixins.css b/.tmp/src/scss/core/mixins.css new file mode 100644 index 0000000..e69de29 diff --git a/.tmp/src/scss/core/normalize.css b/.tmp/src/scss/core/normalize.css new file mode 100644 index 0000000..5556da1 --- /dev/null +++ b/.tmp/src/scss/core/normalize.css @@ -0,0 +1 @@ +html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} diff --git a/.tmp/src/scss/core/reset.css b/.tmp/src/scss/core/reset.css new file mode 100644 index 0000000..c77cca4 --- /dev/null +++ b/.tmp/src/scss/core/reset.css @@ -0,0 +1 @@ +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}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{content:'';content:none}q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0} diff --git a/.tmp/src/scss/helpers/normalize.css b/.tmp/src/scss/helpers/normalize.css new file mode 100644 index 0000000..5556da1 --- /dev/null +++ b/.tmp/src/scss/helpers/normalize.css @@ -0,0 +1 @@ +html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} diff --git a/.tmp/src/scss/helpers/reset.css b/.tmp/src/scss/helpers/reset.css new file mode 100644 index 0000000..c77cca4 --- /dev/null +++ b/.tmp/src/scss/helpers/reset.css @@ -0,0 +1 @@ +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}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{content:'';content:none}q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0} diff --git a/.tmp/src/scss/variables/colors.css b/.tmp/src/scss/variables/colors.css new file mode 100644 index 0000000..e69de29 diff --git a/.tmp/src/scss/variables/sizes.css b/.tmp/src/scss/variables/sizes.css new file mode 100644 index 0000000..e69de29 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..cae5ad6 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,80 @@ +module.exports = function(grunt) { + require('load-grunt-tasks')(grunt); + + grunt.initConfig({ + concat: { + dist: { + options: {}, + files: { + 'dist/cartostyles.css': [ + '.tmp/src/scss/**/*.css' + ] + } + } + }, + sass: { + dist: { + options: { + sourceMap: false, + outputStyle: 'compressed' + }, + files: [{ + expand: true, + src: [ + 'src/scss/**/*.scss' + ], + dest: '.tmp', + ext: '.css' + }] + } + }, + cssmin: { + dist: { + options: { + check: 'gzip' + }, + files: { + 'dist/cartostyles.css': [ + 'dist/cartostyles.css' + ] + } + } + }, + watch: { + scss: { + files: [ + 'src/scss/**/*.scss' + ], + tasks: [ + 'sass', + 'concat', + 'cssmin' + ], + options: { + spawn: false, + livereload: 35732 + } + } + } + }); + + grunt.registerTask('default', ['sass', 'concat', 'cssmin', 'watch:scss']); + +}; + +// +// var gulp = require('gulp'); +// var shell = require('gulp-shell'); +// var watch = require('gulp-watch'); +// +// gulp.task('watch', function() { +// gulp.watch('path/to/watch/for/changes/**/*.scss', ['makeStyleguide']); +// }); +// +// gulp.task('makeStyleguide', +// shell.task( +// ['styleguide'] +// ) +// ); +// +// gulp.task('default', ['watch']); diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..2653d49 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,22 @@ +Copyright (c) 2016 xavijam + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..1e6923c --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# CartoAssets + +> Share frontend assets between different CartoDB repositories + + +- CSS styleguide. +- JS styleguide. +- CSS components. +- Font icon? diff --git a/dist/cartostyles.css b/dist/cartostyles.css new file mode 100644 index 0000000..9efb436 --- /dev/null +++ b/dist/cartostyles.css @@ -0,0 +1 @@ +.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}mark{background:#ff0;color:#000}sub,sup{line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}body{margin:0;line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..27b3216 --- /dev/null +++ b/package.json @@ -0,0 +1,46 @@ +{ + "name": "cartoassets", + "description": "Share frontend assets between different CartoDB repositories", + "version": "0.1.4", + "homepage": "https://github.com/cartodb/CartoAssets", + "author": { + "name": "xavijam", + "email": "xavijam@gmail.com" + }, + "repository": { + "type": "git", + "url": "git://github.com/cartodb/CartoAssets.git" + }, + "bugs": { + "url": "https://github.com/cartodb/CartoAssets/issues" + }, + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/cartodb/CartoAssets/blob/master/LICENSE-MIT" + } + ], + "engines": { + "node": ">= 0.8.0" + }, + "devDependencies": { + "jquery": "~2.2.0", + "highlight.js": "~9.1.0", + "markdown-styleguide-generator": "~2.0.4", + "grunt-sass": "1.1.0", + "grunt-contrib-concat": "0.5.1", + "grunt-contrib-cssmin": "0.14.0", + "grunt-contrib-watch": "0.6.1", + "grunt-shell": "1.1.2", + "load-grunt-tasks": "*" + }, + "peerDependencies": { + "grunt": "~0.4.5" + }, + "keywords": [ + "library", + "CartoDB", + "share", + "assets" + ] +} diff --git a/src/scss/.DS_Store b/src/scss/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 + +``` +*/ +// Shapes styles +// ---------------------------------------------- + +.CDB-Shape-dot { + display: inline-block; + width: 8px; + min-width: 8px; + height: 8px; + border-radius: 8px; +} diff --git a/src/scss/utilities/_mixins.scss b/src/scss/utilities/_mixins.scss new file mode 100644 index 0000000..d393024 --- /dev/null +++ b/src/scss/utilities/_mixins.scss @@ -0,0 +1,236 @@ +// Mixins +// - Necessary SCSS functions +// - Browser support: +// · IE => 10 +// · Chrome => 21 +// · Sarafi => 6 +// · Firefox => 24 +// · Opera => 12 +// -------------------------------------------------- + +/* ADDS A BROWSER PREFIX TO THE PROPERTY */ +@mixin css3-prefix($property, $value) { + -webkit-#{$property}: #{$value}; + -khtml-#{$property}: #{$value}; + -moz-#{$property}: #{$value}; + -ms-#{$property}: #{$value}; + -o-#{$property}: #{$value}; + #{$property}: #{$value}; +} + +// Display inline +@mixin inline-block() { + display: inline-block; + vertical-align: middle; +} + +// Display flex functions +@mixin display-flex() { + display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ + display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ + display: -ms-flexbox; /* TWEENER - IE 10 */ + display: -webkit-flex; /* NEW - Chrome */ + display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ +} +@mixin flex($v) { + -webkit-box-flex: $v; + -moz-box-flex: $v; + -webkit-flex: $v; + -ms-flex: $v; + flex: $v; +} +@mixin flex-direction($v) { + -webkit-flex-direction: $v; + -moz-flex-direction: $v; + -ms-flex-direction: $v; + flex-direction: $v; + // IE10 doesn't support this property +} +@mixin flex-grow($v) { + -webkit-flex-grow: $v; + -moz-flex-grow: $v; + -ms-flex-grow: $v; + flex-grow: $v; + // IE10 fallback + -ms-flex: $v 0 auto; +} +@mixin flex-wrap($v) { + -webkit-flex-wrap: $v; + -moz-flex-wrap: $v; + -ms-flex-wrap: $v; + flex-wrap: $v; + // IE10 doesn't support this property +} +@mixin flex-order($v) { + -webkit-flex-order: $v; + -webkit-box-ordinal-group: $v; + -moz-box-ordinal-group: $v; + -moz-flex-order: $v; + -ms-flex-order: $v; + -ms-order: $v; + box-ordinal-group: $v; + flex-order: $v; + order: $v; +} +@mixin justify-content($v, $ie-v: "") { + -webkit-justify-content: $v; + -moz-justify-content: $v; + -ms-justify-content: $v; + justify-content: $v; + // Hello IE10 + -ms-flex-pack: if($ie-v != "", $ie-v, $v); +} +@mixin align-items($v, $ie-v: "") { + -webkit-align-items: $v; + -moz-align-items: $v; + -ms-align-items: $v; + align-items: $v; + // Hello IE10 + -ms-flex-align: if($ie-v != "", $ie-v, $v); +} +@mixin align-content($v, $ie-v: "") { + -webkit-align-content: $v; + -moz-align-content: $v; + -ms-align-content: $v; + align-content: $v; + // Hello IE10 + -ms-flex-align: if($ie-v != "", $ie-v, $v); +} + +// CSS3 typical functions +@mixin opacity($v) { + opacity:$v; + filter:alpha(opacity=($v*100)); // IE10 +} + +@mixin grayscale() { + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: url("data:image/svg+xml;utf8,#grayscale"); /* Firefox 10+, Firefox on Android */ +} + + +@mixin background-gradient($startColor: #3C3C3C, $endColor: #999999) { + background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)); + background-image: -webkit-linear-gradient(top, $startColor, $endColor); + background-image: -moz-linear-gradient(top, $startColor, $endColor); + background-image: -ms-linear-gradient(top, $startColor, $endColor); + background-image: -o-linear-gradient(top, $startColor, $endColor); + background-image: linear-gradient(top, $startColor, $endColor); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#{$startColor}', endColorStr='#{$endColor}'); +} + +@mixin background-horizontal($startColor: #3C3C3C, $endColor: #999999) { + background-color: $startColor; + background-image: -webkit-gradient(linear, left top, right top, from($startColor), to($endColor)); + background-image: -webkit-linear-gradient(left, $startColor, $endColor); + background-image: -moz-linear-gradient(left, $startColor, $endColor); + background-image: -ms-linear-gradient(left, $startColor, $endColor); + background-image: -o-linear-gradient(left, $startColor, $endColor); + background-image: linear-gradient(left, $startColor, $endColor); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#{$startColor}', endColorStr='#{$endColor}', gradientType='1'); +} + +@mixin image-2x($image, $width, $height, $x: 0, $y: 0) { + @media (min--moz-device-pixel-ratio: 1.3), + (-o-min-device-pixel-ratio: 2.6/2), + (-webkit-min-device-pixel-ratio: 1.3), + (min-device-pixel-ratio: 1.3), + (min-resolution: 1.3dppx) { + /* on retina, use image that's scaled by 2 */ + background: url($image); + background-size: $width $height; + background-position: $x $y; + } +} + +@mixin transform($params) { + @include css3-prefix('transform', $params); +} + +@mixin transform-style($style: preserve-3d) { + @include css3-prefix('transform-style', $style); +} + +@mixin transition($properties...) { + + @if length($properties) >= 1 { + @include css3-prefix('transition', $properties); + } + + @else { + @include css3-prefix('transition', $what: all, $length: 1s, $easing: ease-in-out); + } +} + + +/* FONT FACE */ +@mixin font-face($fontFamily: myFont, $eotFileSrc: 'myFont.eot', $woffFileSrc: 'myFont.woff', $ttfFileSrc: 'myFont.ttf', $svgFileSrc: 'myFont.svg', $svgFontID: '#myFont') { + @font-face { + font-family: $fontFamily; + src: url($eotFileSrc) format('eot'), + url($woffFileSrc) format('woff'), + url($ttfFileSrc) format('truetype'), + url($svgFileSrc + $svgFontID) format('svg'); + } +} + +@mixin keyframes($animation-name) { + @-webkit-keyframes #{$animation-name} { + @content; + } + @-moz-keyframes #{$animation-name} { + @content; + } + @-ms-keyframes #{$animation-name} { + @content; + } + @-o-keyframes #{$animation-name} { + @content; + } + @keyframes #{$animation-name} { + @content; + } +} + +@mixin text-overflow() { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +@mixin animation($str) { + @include css3-prefix('animation', $str); +} + +@mixin line-clamp($lines) { + height: $lines * $sLineHeight-normal; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: $lines; + overflow: hidden; + text-overflow: ellipsis; + &:after { + content: ' '; + display: block; + position: absolute; + bottom: 0; + right: 0; + height: $sLineHeight-normal; + width: 2 * $sLineHeight-normal; + @include background-horizontal(rgba(255,255,255,0), rgba(255,255,255,1)); + } +} + +@mixin media-query() { + @media only screen and (min-width: 320px) and (max-width: 960px) { + @content; + } +} +@mixin media-query-mobile() { + @media only screen and (max-width: 600px) { + @content; + } +} diff --git a/src/scss/utilities/helpers.scss b/src/scss/utilities/helpers.scss new file mode 100644 index 0000000..ac55f15 --- /dev/null +++ b/src/scss/utilities/helpers.scss @@ -0,0 +1,29 @@ +// Helper classes +// ---------------------------------------------- + +@import 'mixins'; + +.u-tSpace { + margin-top: 4px; +} +.u-tSpace-xl { + margin-top: 12px; +} +.u-rSpace { + margin-right: 4px; +} +.u-rSpace--m { + margin-right: 8px; +} +.u-rSpace--xl { + margin-right: 12px; +} +.u-lSpace { + margin-left: 4px; +} +.u-lSpace--xl { + margin-left: 12px; +} +.u-iBlock { + @include inline-block(); +} diff --git a/src/scss/utilities/normalize.scss b/src/scss/utilities/normalize.scss new file mode 100644 index 0000000..9375ee9 --- /dev/null +++ b/src/scss/utilities/normalize.scss @@ -0,0 +1,578 @@ +/* ========================================================================== + Normalize.scss settings + ========================================================================== */ +/** + * Includes legacy browser support IE6/7 + * + * Set to false if you want to drop support for IE6 and IE7 + */ + +$legacy_browser_support: false !default; + +/* Base + ========================================================================== */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ + @if $legacy_browser_support { + *font-size: 100%; /* 3 */ + } +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ + @if $legacy_browser_support { + *display: inline; + *zoom: 1; + } +} + +/** + * Prevents modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ + +a { + &:active, &:hover { + outline: 0; + }; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +@if $legacy_browser_support { + blockquote { + margin: 1em 40px; + } +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +@if $legacy_browser_support { + h2 { + font-size: 1.5em; + margin: 0.83em 0; + } + + h3 { + font-size: 1.17em; + margin: 1em 0; + } + + h4 { + font-size: 1em; + margin: 1.33em 0; + } + + h5 { + font-size: 0.83em; + margin: 1.67em 0; + } + + h6 { + font-size: 0.67em; + margin: 2.33em 0; + } +} + +/** + * Addresses styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +@if $legacy_browser_support { + + /** + * Addresses margins set differently in IE 6/7. + */ + + p, + pre { + *margin: 1em 0; + } + + /* + * Addresses CSS quotes not supported in IE 6/7. + */ + + q { + *quotes: none; + } + + /* + * Addresses `quotes` property not supported in Safari 4. + */ + + q:before, + q:after { + content: ''; + content: none; + } +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +@if $legacy_browser_support { + + /* ========================================================================== + Lists + ========================================================================== */ + + /* + * Addresses margins set differently in IE 6/7. + */ + + dl, + menu, + ol, + ul { + *margin: 1em 0; + } + + dd { + *margin: 0 0 0 40px; + } + + /* + * Addresses paddings set differently in IE 6/7. + */ + + menu, + ol, + ul { + *padding: 0 0 0 40px; + } + + /* + * Corrects list images handled incorrectly in IE 7. + */ + + nav ul, + nav ol { + *list-style: none; + *list-style-image: none; + } + +} + +/* Embedded content + ========================================================================== */ + +/** + * 1. Remove border when inside `a` element in IE 8/9/10. + * 2. Improves image quality when scaled in IE 7. + */ + +img { + border: 0; + @if $legacy_browser_support { + *-ms-interpolation-mode: bicubic; /* 2 */ + } +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + @if $legacy_browser_support { + _font-family: 'courier new', monospace; + } + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + * 4. Improves appearance and consistency in all browsers. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ + @if $legacy_browser_support { + vertical-align: baseline; /* 3 */ + *vertical-align: middle; /* 3 */ + } +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + * 4. Removes inner spacing in IE 7 without affecting normal text inputs. + * Known issue: inner spacing remains in IE 6. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ + @if $legacy_browser_support { + *overflow: visible; /* 4 */ + } +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + * Known issue: excess padding remains in IE 6. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ + } +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + box-sizing: content-box; /* 2 */ +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + * 3. Corrects text not wrapping in Firefox 3. + * 4. Corrects alignment displayed oddly in IE 6/7. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ + @if $legacy_browser_support { + white-space: normal; /* 3 */ + *margin-left: -7px; /* 4 */ + } +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/src/scss/utilities/reset.scss b/src/scss/utilities/reset.scss new file mode 100644 index 0000000..2982152 --- /dev/null +++ b/src/scss/utilities/reset.scss @@ -0,0 +1,40 @@ +/* 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, &:after { + content: ''; + content: none; } } + +q { + &:before, &:after { + content: ''; + content: none; } } + +table { + border-collapse: collapse; + border-spacing: 0; } diff --git a/src/scss/variables/_colors.scss b/src/scss/variables/_colors.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/scss/variables/_sizes.scss b/src/scss/variables/_sizes.scss new file mode 100644 index 0000000..e69de29 diff --git a/styleguide/_template.html b/styleguide/_template.html new file mode 100644 index 0000000..216806e --- /dev/null +++ b/styleguide/_template.html @@ -0,0 +1,91 @@ + + + + +{{> theme}} +{{> highlight}} +{{> jquery}} + + + +
+
    + {{#each menu}} +
  • + {{#if headings.0.name}} + {{name}} +
      + {{#each headings}} +
    • {{name}}
      • + {{/each}} +
    + {{/if}} + {{#unless headings.0.name}} + {{name}} + {{/unless}} +
    • + {{/each}} +
+
+ +
+ {{#each sections}} +
+ +
+

{{section}}{{#if heading}}/{{heading}}{{/if}}

+ {{{comment}}} +
+ + {{#if code}} +
+ {{{code}}} +
+ {{/if}} + + {{#if markup}} +
+
+{{{markup}}}
+
+
+ {{/if}} + +
+ {{/each}} +
diff --git a/styleguide/index.html b/styleguide/index.html new file mode 100644 index 0000000..038192e --- /dev/null +++ b/styleguide/index.html @@ -0,0 +1,10133 @@ + + + + + + + +
+ +
+ +
+
+ +
+

Shapes/dot

+

You may resize and change the colors of the icons with the glyph--classes. Available sizes and colors listed:

+
+ +
+ + +
+ +
+
+<button class="CDB-Shape-dot CDB-Widget-dot--navigation is-selected" data-page="3"></button>
+<button class="CDB-Shape-dot CDB-Widget-dot--navigation" data-page="3"></button>
+
+
+ +
+
diff --git a/styleguide/theme.css b/styleguide/theme.css new file mode 100644 index 0000000..df403f9 --- /dev/null +++ b/styleguide/theme.css @@ -0,0 +1,122 @@ +#styleguide { + float: left; + width: 80%; +} + +#styleguide .section { + display: none; + margin-bottom: 2em; + -webkit-box-shadow: 2px 2px 5px 0px rgba(50, 50, 50, 0.43); + -moz-box-shadow: 2px 2px 5px 0px rgba(50, 50, 50, 0.43); + box-shadow: 2px 2px 5px 0px rgba(50, 50, 50, 0.43); +} + +#styleguide .result, +#styleguide .comment { + padding: 1em; + border: 1px solid #ddd; +} + +#styleguide .result { + border-top: none; +} + +#styleguide .comment { + background-color: rgb(245, 245, 245); +} + +#styleguide .section .comment code { + color: #3fbead; + font-family: Consolas, Monaco, 'Andale Mono', monospace; + font-size: 13px; +} + +#styleguide .markup { + border: 1px solid #ddd; + border-top: none; +} + +#styleguide code, +#styleguide pre { + border: none; + font-family: Consolas, Monaco, 'Andale Mono', monospace; + font-size: 13px; + line-height: 20px; + direction: ltr; + text-align: left; + white-space: pre-wrap; + word-spacing: normal; + margin: 0; + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; +} + + +/* menu */ +#styleguide-menu { + width: calc(20% - 1em - 2px); + float: left; + margin-right: 1em; + padding: 1em 0; + + border: 1px solid #ddd; + -webkit-box-shadow: 2px 2px 5px 0px rgba(50, 50, 50, 0.43); + -moz-box-shadow: 2px 2px 5px 0px rgba(50, 50, 50, 0.43); + box-shadow: 2px 2px 5px 0px rgba(50, 50, 50, 0.43); +} + +#styleguide-menu .submenu { + display: none; + background: rgba(0, 0, 0, 0.05); +} + +#styleguide-menu .submenu.on{ + display: block; +} + +#styleguide-menu ul { + list-style-type: none; + padding: 0; + margin: 0; +} + +#styleguide-menu li { + padding: 0; + margin: 0; +} + + + +#styleguide-menu a { + display: block; + width: calc(100% - 2em + 2px); + padding: 0.3em 1em; + text-decoration: none; + color: rgba(0, 0, 0, 0.87); + +} + +#styleguide-menu ul ul a { + padding: 0.3em 1em 0.3em 2em; + width: calc(100% - 3em + 2px); +} + +#styleguide-menu a:visited, +#styleguide-menu a:hover, +#styleguide-menu a:active { + display: block; + color: rgba(0, 0, 0, 0.87); +} + +#styleguide-menu a:hover { + background-color: rgba(250, 255, 70, 0.3); +} + +#styleguide-menu a.on { + background-color: rgba(0, 0, 0, 0.1); +} From 16a41122a3bd515e116c860ecc67e2e2cc997513 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 12:49:53 +0100 Subject: [PATCH 002/391] Removed unnecessary tmp files committed --- .tmp/src/scss/core/mixins.css | 0 .tmp/src/scss/core/normalize.css | 1 - .tmp/src/scss/core/reset.css | 1 - .tmp/src/scss/helpers/normalize.css | 1 - .tmp/src/scss/helpers/reset.css | 1 - .tmp/src/scss/variables/colors.css | 0 .tmp/src/scss/variables/sizes.css | 0 7 files changed, 4 deletions(-) delete mode 100644 .tmp/src/scss/core/mixins.css delete mode 100644 .tmp/src/scss/core/normalize.css delete mode 100644 .tmp/src/scss/core/reset.css delete mode 100644 .tmp/src/scss/helpers/normalize.css delete mode 100644 .tmp/src/scss/helpers/reset.css delete mode 100644 .tmp/src/scss/variables/colors.css delete mode 100644 .tmp/src/scss/variables/sizes.css diff --git a/.tmp/src/scss/core/mixins.css b/.tmp/src/scss/core/mixins.css deleted file mode 100644 index e69de29..0000000 diff --git a/.tmp/src/scss/core/normalize.css b/.tmp/src/scss/core/normalize.css deleted file mode 100644 index 5556da1..0000000 --- a/.tmp/src/scss/core/normalize.css +++ /dev/null @@ -1 +0,0 @@ -html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} diff --git a/.tmp/src/scss/core/reset.css b/.tmp/src/scss/core/reset.css deleted file mode 100644 index c77cca4..0000000 --- a/.tmp/src/scss/core/reset.css +++ /dev/null @@ -1 +0,0 @@ -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}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{content:'';content:none}q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0} diff --git a/.tmp/src/scss/helpers/normalize.css b/.tmp/src/scss/helpers/normalize.css deleted file mode 100644 index 5556da1..0000000 --- a/.tmp/src/scss/helpers/normalize.css +++ /dev/null @@ -1 +0,0 @@ -html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} diff --git a/.tmp/src/scss/helpers/reset.css b/.tmp/src/scss/helpers/reset.css deleted file mode 100644 index c77cca4..0000000 --- a/.tmp/src/scss/helpers/reset.css +++ /dev/null @@ -1 +0,0 @@ -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}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{content:'';content:none}q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0} diff --git a/.tmp/src/scss/variables/colors.css b/.tmp/src/scss/variables/colors.css deleted file mode 100644 index e69de29..0000000 diff --git a/.tmp/src/scss/variables/sizes.css b/.tmp/src/scss/variables/sizes.css deleted file mode 100644 index e69de29..0000000 From 10df067be70e547743406c55ec4357e9851f616f Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 12:50:06 +0100 Subject: [PATCH 003/391] Ignoring dist and tmp folders --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b785247..231a8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules npm-debug.log -tmp +.tmp +dist From c33b071e38ae96512e7e6cb11e635fdbd71c868d Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 12:50:14 +0100 Subject: [PATCH 004/391] Added helpers scss --- src/scss/utilities/helpers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/utilities/helpers.scss b/src/scss/utilities/helpers.scss index ac55f15..2247981 100644 --- a/src/scss/utilities/helpers.scss +++ b/src/scss/utilities/helpers.scss @@ -1,7 +1,7 @@ // Helper classes // ---------------------------------------------- -@import 'mixins'; +@import './mixins'; .u-tSpace { margin-top: 4px; From ab3ec9cd6fe46f3836d9555521c683455310f536 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 12:50:33 +0100 Subject: [PATCH 005/391] Added necessary tasks to the Gruntfile --- Gruntfile.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- package.json | 2 ++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index cae5ad6..2d5faac 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,6 +12,32 @@ module.exports = function(grunt) { } } }, + connect: { + server: { + options: { + port: 9003, + livereload: 35732, + open: true, + hostname: '0.0.0.0', // to be able to access the server not only from localhost + base: { + path: '.' + } + } + } + }, + clean: { + dist: { + files: [{ + dot: true, + src: [ + '.sass-cache', + '.tmp', + 'dist', + '!dist/.git*' + ] + }] + } + }, sass: { dist: { options: { @@ -40,6 +66,11 @@ module.exports = function(grunt) { } } }, + shell: { + dist: { + command: 'styleguide' + } + }, watch: { scss: { files: [ @@ -58,8 +89,25 @@ module.exports = function(grunt) { } }); - grunt.registerTask('default', ['sass', 'concat', 'cssmin', 'watch:scss']); + var baseTasks = [ + 'clean', + 'sass', + 'concat', + 'cssmin' + ]; + var devTasks = baseTasks.concat([ + 'connect', + 'watch:scss' + ]); + + grunt.event.on('watch', function (action, filepath) { + grunt.task.run('shell'); + }); + + grunt.registerTask('dev', devTasks); + grunt.registerTask('build', baseTasks); + grunt.registerTask('default', baseTasks); }; // diff --git a/package.json b/package.json index 27b3216..2704ff9 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,10 @@ "highlight.js": "~9.1.0", "markdown-styleguide-generator": "~2.0.4", "grunt-sass": "1.1.0", + "grunt-contrib-clean": "0.7.0", "grunt-contrib-concat": "0.5.1", "grunt-contrib-cssmin": "0.14.0", + "grunt-contrib-connect": "0.11.2", "grunt-contrib-watch": "0.6.1", "grunt-shell": "1.1.2", "load-grunt-tasks": "*" From 27a582f5d93e181df7082a84683defe8b75cca3b Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 12:52:37 +0100 Subject: [PATCH 006/391] Removed unnecessary code --- Gruntfile.js | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2d5faac..b36b373 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -108,21 +108,4 @@ module.exports = function(grunt) { grunt.registerTask('dev', devTasks); grunt.registerTask('build', baseTasks); grunt.registerTask('default', baseTasks); -}; - -// -// var gulp = require('gulp'); -// var shell = require('gulp-shell'); -// var watch = require('gulp-watch'); -// -// gulp.task('watch', function() { -// gulp.watch('path/to/watch/for/changes/**/*.scss', ['makeStyleguide']); -// }); -// -// gulp.task('makeStyleguide', -// shell.task( -// ['styleguide'] -// ) -// ); -// -// gulp.task('default', ['watch']); +} From 4b73fe68de3395ae89e44391a29f9865debeaf9b Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 13:57:13 +0100 Subject: [PATCH 007/391] Moving tasks to files --- Gruntfile.js | 96 +++++--------------------------------------- dist/cartostyles.css | 2 +- package.json | 6 ++- tasks/clean.js | 13 ++++++ tasks/concat.js | 10 +++++ tasks/connect.js | 13 ++++++ tasks/cssmin.js | 12 ++++++ tasks/sass.js | 16 ++++++++ tasks/shell.js | 5 +++ tasks/watch.js | 16 ++++++++ 10 files changed, 100 insertions(+), 89 deletions(-) create mode 100644 tasks/clean.js create mode 100644 tasks/concat.js create mode 100644 tasks/connect.js create mode 100644 tasks/cssmin.js create mode 100644 tasks/sass.js create mode 100644 tasks/shell.js create mode 100644 tasks/watch.js diff --git a/Gruntfile.js b/Gruntfile.js index b36b373..60c06a1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,92 +1,14 @@ -module.exports = function(grunt) { +module.exports = function (grunt) { require('load-grunt-tasks')(grunt); grunt.initConfig({ - concat: { - dist: { - options: {}, - files: { - 'dist/cartostyles.css': [ - '.tmp/src/scss/**/*.css' - ] - } - } - }, - connect: { - server: { - options: { - port: 9003, - livereload: 35732, - open: true, - hostname: '0.0.0.0', // to be able to access the server not only from localhost - base: { - path: '.' - } - } - } - }, - clean: { - dist: { - files: [{ - dot: true, - src: [ - '.sass-cache', - '.tmp', - 'dist', - '!dist/.git*' - ] - }] - } - }, - sass: { - dist: { - options: { - sourceMap: false, - outputStyle: 'compressed' - }, - files: [{ - expand: true, - src: [ - 'src/scss/**/*.scss' - ], - dest: '.tmp', - ext: '.css' - }] - } - }, - cssmin: { - dist: { - options: { - check: 'gzip' - }, - files: { - 'dist/cartostyles.css': [ - 'dist/cartostyles.css' - ] - } - } - }, - shell: { - dist: { - command: 'styleguide' - } - }, - watch: { - scss: { - files: [ - 'src/scss/**/*.scss' - ], - tasks: [ - 'sass', - 'concat', - 'cssmin' - ], - options: { - spawn: false, - livereload: 35732 - } - } - } + concat: require('./tasks/concat'), + connect: require('./tasks/connect'), + clean: require('./tasks/clean'), + sass: require('./tasks/sass'), + cssmin: require('./tasks/cssmin'), + shell: require('./tasks/shell'), + watch: require('./tasks/watch') }); var baseTasks = [ @@ -108,4 +30,4 @@ module.exports = function(grunt) { grunt.registerTask('dev', devTasks); grunt.registerTask('build', baseTasks); grunt.registerTask('default', baseTasks); -} +}; diff --git a/dist/cartostyles.css b/dist/cartostyles.css index 9efb436..51331a3 100644 --- a/dist/cartostyles.css +++ b/dist/cartostyles.css @@ -1 +1 @@ -.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}mark{background:#ff0;color:#000}sub,sup{line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}body{margin:0;line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file +.CDB-Shape-button,.CDB-Shape-dot,.CDB-Shape-tooltip{width:8px;min-width:8px;height:8px;border-radius:8px;display:inline-block}.CDB-Shape-button,.CDB-Shape-dot,.CDB-Shape-tooltip,.u-iBlock{display:inline-block}.CDB-Shape-button{background:red}.CDB-Shape-tooltip{background:green}.u-tSpace{margin-top:4px}.u-tSpace-xl{margin-top:12px}.u-rSpace{margin-right:4px}.u-rSpace--m{margin-right:8px}.u-rSpace--xl{margin-right:12px}.u-lSpace{margin-left:4px}.u-lSpace--xl{margin-left:12px}.u-iBlock{vertical-align:middle}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}mark{background:#ff0;color:#000}sub,sup{line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}body{margin:0;line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file diff --git a/package.json b/package.json index 2704ff9..94aeb15 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,10 @@ "library", "CartoDB", "share", - "assets" + "assets", + "styleguide", + "shared components", + "editor", + "deep-insights" ] } diff --git a/tasks/clean.js b/tasks/clean.js new file mode 100644 index 0000000..5f08315 --- /dev/null +++ b/tasks/clean.js @@ -0,0 +1,13 @@ +module.exports = { + dist: { + files: [{ + dot: true, + src: [ + '.sass-cache', + '.tmp', + 'dist', + '!dist/.git*' + ] + }] + } +}; diff --git a/tasks/concat.js b/tasks/concat.js new file mode 100644 index 0000000..1c8846b --- /dev/null +++ b/tasks/concat.js @@ -0,0 +1,10 @@ +module.exports = { + dist: { + options: {}, + files: { + 'dist/cartostyles.css': [ + '.tmp/src/scss/**/*.css' + ] + } + } +}; diff --git a/tasks/connect.js b/tasks/connect.js new file mode 100644 index 0000000..1f986f1 --- /dev/null +++ b/tasks/connect.js @@ -0,0 +1,13 @@ +module.exports = { + server: { + options: { + port: 9003, + livereload: 35732, + open: true, + hostname: '0.0.0.0', // to be able to access the server not only from localhost + base: { + path: '.' + } + } + } +}; diff --git a/tasks/cssmin.js b/tasks/cssmin.js new file mode 100644 index 0000000..27f4ee8 --- /dev/null +++ b/tasks/cssmin.js @@ -0,0 +1,12 @@ +module.exports = { + dist: { + options: { + check: 'gzip' + }, + files: { + 'dist/cartostyles.css': [ + 'dist/cartostyles.css' + ] + } + } +}; diff --git a/tasks/sass.js b/tasks/sass.js new file mode 100644 index 0000000..a6c6152 --- /dev/null +++ b/tasks/sass.js @@ -0,0 +1,16 @@ +module.exports = { + dist: { + options: { + sourceMap: false, + outputStyle: 'compressed' + }, + files: [{ + expand: true, + src: [ + 'src/scss/**/*.scss' + ], + dest: '.tmp', + ext: '.css' + }] + } +}; diff --git a/tasks/shell.js b/tasks/shell.js new file mode 100644 index 0000000..99da8aa --- /dev/null +++ b/tasks/shell.js @@ -0,0 +1,5 @@ +module.exports = { + dist: { + command: 'styleguide' + } +}; diff --git a/tasks/watch.js b/tasks/watch.js new file mode 100644 index 0000000..d8ff37e --- /dev/null +++ b/tasks/watch.js @@ -0,0 +1,16 @@ +module.exports = { + scss: { + files: [ + 'src/scss/**/*.scss' + ], + tasks: [ + 'sass', + 'concat', + 'cssmin' + ], + options: { + spawn: false, + livereload: 35732 + } + } +}; From d5592585f3260112f1671e58f0fa7ba2117ac862 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 14:38:10 +0100 Subject: [PATCH 008/391] Moved common styles from CartoDB.js and Deep-insights to CartoAssets --- .tmp/src/scss/components/shapes.css | 2 +- src/scss/components/shapes.scss | 235 +++++++++++++++++++++++++++- src/scss/variables/_sizes.scss | 33 ++++ 3 files changed, 267 insertions(+), 3 deletions(-) diff --git a/.tmp/src/scss/components/shapes.css b/.tmp/src/scss/components/shapes.css index e7eea9f..f38d833 100644 --- a/.tmp/src/scss/components/shapes.css +++ b/.tmp/src/scss/components/shapes.css @@ -1 +1 @@ -.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px} +.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px}.CDB-Shape-threePoints{display:inline-block;position:relative;width:3px;height:16px;margin-right:-7px;margin-left:6px;padding:0 7px 0 10px;text-align:center;vertical-align:middle}.CDB-Shape-threePoints:after,.CDB-Shape-threePoints:before{display:inline-block;position:absolute;width:3px;height:3px;border-radius:50%;content:'';z-index:1}.CDB-Shape-threePoints:before{top:0;right:7px}.CDB-Shape-threePoints:after{right:7px;bottom:1px}.CDB-Shape-threePoints:hover{cursor:pointer}.CDB-Shape-threePointsItem{display:block;position:absolute;top:6px;left:7px;width:3px;height:3px;border-radius:50%}.CDB-Shape-lens{display:inline-block;position:relative;width:16px;height:16px}.CDB-Shape-lens:after,.CDB-Shape-lens:before{position:absolute;content:''}.CDB-Shape-lens:after{top:0;left:0;width:8px;height:8px;border:1px solid transparent;border-radius:10px}.CDB-Shape-lens:before{-webkit-transform:rotate(45deg);-khtml-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg);right:3px;bottom:5px;width:6px;height:1px}.CDB-Shape-lens:hover{cursor:pointer}.CDB-Shape-hamburguer{display:inline-block;position:relative;width:16px;height:2px;border:0;background:#FFF;vertical-align:middle}.CDB-Shape-hamburguer:before,.CDB-Shape-hamburguer:after{display:block;position:absolute;width:16px;height:2px;background:#FFF;content:''}.CDB-Shape-hamburguer:before{top:-6px}.CDB-Shape-hamburguer:after{bottom:-6px}.CDB-Shape-magnify{display:block;position:relative;width:32px;height:32px}.CDB-Shape-magnify:before{display:block;position:absolute;top:10px;left:10px;width:7px;height:7px;border:1px solid #636D72;border-radius:50%;content:''}.CDB-Shape-magnify:after{display:block;position:absolute;top:17px;left:19px;width:1px;height:6px;transform:rotate(314deg);background:#636D72;content:''}.CDB-Shape-Arrow{display:block;position:absolute;width:1px;height:8px;background:#32A8E6}.CDB-Shape-Arrow:before{display:block;position:absolute;top:2px;left:0;width:5px;height:1px;transform:rotate(45deg);background:#32A8E6;content:''}.CDB-Shape-Arrow:after{display:block;position:absolute;top:2px;left:-4px;width:5px;height:1px;transform:rotate(-45deg);background:#32A8E6;content:''}.CDB-Shape-Arrow--top{top:6px;right:9px;transform:rotate(45deg)}.CDB-Shape-Arrow--bottom{top:13px;left:46px;transform:rotate(-135deg)} diff --git a/src/scss/components/shapes.scss b/src/scss/components/shapes.scss index 5f2b6c1..dd89e0d 100644 --- a/src/scss/components/shapes.scss +++ b/src/scss/components/shapes.scss @@ -1,3 +1,6 @@ +// Shapes styles +// ---------------------------------------------- + /* SG # Shapes/dot @@ -8,8 +11,8 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava ``` */ -// Shapes styles -// ---------------------------------------------- + +@import '../utilities/mixins'; .CDB-Shape-dot { display: inline-block; @@ -18,3 +21,231 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava height: 8px; border-radius: 8px; } + +/* SG +# Shapes/threePoints + +Description + +``` +
+``` +*/ + +.CDB-Shape-threePoints { + display: inline-block; + position: relative; + width: 3px; + height: 16px; + margin-right: -7px; + margin-left: 6px; + padding: 0 7px 0 10px; + text-align: center; + vertical-align: middle; + + &:after, + &:before { + display: inline-block; + position: absolute; + width: 3px; + height: 3px; + border-radius: 50%; + content: ''; + z-index: 1; + } + + &:before { + top: 0; + right: 7px; + } + + &:after { + right: 7px; + bottom: 1px; + } + + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-threePointsItem { + display: block; + position: absolute; + top: 6px; + left: 7px; + width: 3px; + height: 3px; + border-radius: 50%; +} + +/* SG +# Shapes/lens + +Description + +``` +
+``` +*/ + +.CDB-Shape-lens { + display: inline-block; + position: relative; + width: 16px; + height: 16px; + + &:after, + &:before { + position: absolute; + content: ''; + } + &:after { + top: 0; + left: 0; + width: 8px; + height: 8px; + border: 1px solid transparent; + border-radius: 10px; + } + &:before { + @include css3-prefix(transform, rotate(45deg)); + right: 3px; + bottom: 5px; + width: 6px; + height: 1px; + } + + &:hover { + cursor: pointer; + } +} + +/* SG +# Shapes/hamburguer + +Description + +``` +
+``` +*/ + +.CDB-Shape-hamburguer { + display: inline-block; + position: relative; + width: 16px; + height: 2px; + border: 0; + background: #FFF; + vertical-align: middle; + + &:before, + &:after { + display: block; + position: absolute; + width: 16px; + height: 2px; + background: #FFF; + content: ''; + } + &:before { + top: -6px; + } + &:after { + bottom: -6px; + } +} + +/* SG +# Shapes/magnify + +Description + +``` +
+``` +*/ + +.CDB-Shape-magnify { + display: block; + position: relative; + width: 32px; + height: 32px; + &:before { + display: block; + position: absolute; + top: 10px; + left: 10px; + width: 7px; + height: 7px; + border: 1px solid #636D72; + border-radius: 50%; + content: ''; + } + &:after { + display: block; + position: absolute; + top: 17px; + left: 19px; + width: 1px; + height: 6px; + transform: rotate(314deg); + background: #636D72; + content: ''; + } +} + +/* SG +# Shapes/arrow + +Description + +``` +
+``` +*/ + +.CDB-Shape-Arrow { + display: block; + position: absolute; + width: 1px; + height: 8px; + background: #32A8E6; + + &:before { + display: block; + position: absolute; + top: 2px; + left: 0; + width: 5px; + height: 1px; + transform: rotate(45deg); + background: #32A8E6; + content: ''; + } + + &:after { + display: block; + position: absolute; + top: 2px; + left: -4px; + width: 5px; + height: 1px; + transform: rotate(-45deg); + background: #32A8E6; + content: ''; + } +} + +.CDB-Shape-Arrow--top { + top: 6px; + right: 9px; + transform: rotate(45deg); +} + +.CDB-Shape-Arrow--bottom { + top: 13px; + left: 46px; + transform: rotate(-135deg); +} diff --git a/src/scss/variables/_sizes.scss b/src/scss/variables/_sizes.scss index e69de29..45e15b2 100644 --- a/src/scss/variables/_sizes.scss +++ b/src/scss/variables/_sizes.scss @@ -0,0 +1,33 @@ +// Sizes variables +// ---------------------------------------------- + +// Widths +$desktopLayout: 352px; +$mobileLayout: 280px; + +// Margins +$sMargin-section: 24px; // To separate main section +$sMargin-element: 14px; // To separate elements inside a group + +// Font sizes +$sFontSize-smaller: 10px; +$sFontSize-small: 12px; +$sFontSize-normal: 14px; +$sFontSize-larger: 16px; +$sFontSize-huge: 26px; + +// Font weights +$sFontWeight-lighter: 300; +$sFontWeight-normal: 400; +$sFontWeight-semibold: 600; +$sFontWeight-bold: 700; + +// Line heights +$sLineHeight-smaller: 15px; +$sLineHeight-small: 16px; +$sLineHeight-normal: 20px; +$sLineHeight-large: 22px; +$sLineHeight-larger: 24px; +$sLineHeight-largest: 27px; +$sLineHeight-huge: 34px; +$sLineHeight-button: 15px; From 71b31c44b4beac353c535f6de4d081009faa99f5 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 14:38:41 +0100 Subject: [PATCH 009/391] New package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94aeb15..e1a0a96 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.4", + "version": "0.1.5", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", From 0df33aeaf7ec8d169f9308bd36803543e6504a18 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 14:46:59 +0100 Subject: [PATCH 010/391] Removed styleguide generated html --- .gitignore | 1 + styleguide/index.html | 10133 ---------------------------------------- 2 files changed, 1 insertion(+), 10133 deletions(-) delete mode 100644 styleguide/index.html diff --git a/.gitignore b/.gitignore index 231a8e0..cd6e3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules npm-debug.log .tmp dist +styleguide/index.html diff --git a/styleguide/index.html b/styleguide/index.html deleted file mode 100644 index 038192e..0000000 --- a/styleguide/index.html +++ /dev/null @@ -1,10133 +0,0 @@ - - - - - - - -
- -
- -
-
- -
-

Shapes/dot

-

You may resize and change the colors of the icons with the glyph--classes. Available sizes and colors listed:

-
- -
- - -
- -
-
-<button class="CDB-Shape-dot CDB-Widget-dot--navigation is-selected" data-page="3"></button>
-<button class="CDB-Shape-dot CDB-Widget-dot--navigation" data-page="3"></button>
-
-
- -
-
From 9a55074eb03c106a702177dfdbe0f65e1a719df5 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 14:47:46 +0100 Subject: [PATCH 011/391] Removed cartostyles from dist folder --- dist/cartostyles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/cartostyles.css b/dist/cartostyles.css index 51331a3..983628b 100644 --- a/dist/cartostyles.css +++ b/dist/cartostyles.css @@ -1 +1 @@ -.CDB-Shape-button,.CDB-Shape-dot,.CDB-Shape-tooltip{width:8px;min-width:8px;height:8px;border-radius:8px;display:inline-block}.CDB-Shape-button,.CDB-Shape-dot,.CDB-Shape-tooltip,.u-iBlock{display:inline-block}.CDB-Shape-button{background:red}.CDB-Shape-tooltip{background:green}.u-tSpace{margin-top:4px}.u-tSpace-xl{margin-top:12px}.u-rSpace{margin-right:4px}.u-rSpace--m{margin-right:8px}.u-rSpace--xl{margin-right:12px}.u-lSpace{margin-left:4px}.u-lSpace--xl{margin-left:12px}.u-iBlock{vertical-align:middle}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}mark{background:#ff0;color:#000}sub,sup{line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}body{margin:0;line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file +.CDB-Shape-lens:hover,.CDB-Shape-threePoints:hover{cursor:pointer}.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px}.CDB-Shape-threePoints{display:inline-block;position:relative;width:3px;height:16px;margin-right:-7px;margin-left:6px;padding:0 7px 0 10px;text-align:center;vertical-align:middle}.CDB-Shape-threePoints:after,.CDB-Shape-threePoints:before{display:inline-block;position:absolute;width:3px;height:3px;border-radius:50%;content:'';z-index:1}.CDB-Shape-threePoints:before{top:0;right:7px}.CDB-Shape-threePoints:after{right:7px;bottom:1px}.CDB-Shape-threePointsItem{display:block;position:absolute;top:6px;left:7px;width:3px;height:3px;border-radius:50%}.CDB-Shape-lens{display:inline-block;position:relative;width:16px;height:16px}.CDB-Shape-lens:after,.CDB-Shape-lens:before{position:absolute;content:''}.CDB-Shape-lens:after{top:0;left:0;width:8px;height:8px;border:1px solid transparent;border-radius:10px}.CDB-Shape-lens:before{-webkit-transform:rotate(45deg);-khtml-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg);right:3px;bottom:5px;width:6px;height:1px}.CDB-Shape-hamburguer{display:inline-block;position:relative;width:16px;height:2px;border:0;background:#FFF;vertical-align:middle}.CDB-Shape-hamburguer:after,.CDB-Shape-hamburguer:before{display:block;position:absolute;width:16px;height:2px;background:#FFF;content:''}.CDB-Shape-hamburguer:before{top:-6px}.CDB-Shape-hamburguer:after{bottom:-6px}.CDB-Shape-magnify{display:block;position:relative;width:32px;height:32px}.CDB-Shape-magnify:before{display:block;position:absolute;top:10px;left:10px;width:7px;height:7px;border:1px solid #636D72;border-radius:50%;content:''}.CDB-Shape-Arrow,.CDB-Shape-magnify:after{display:block;position:absolute;width:1px}.CDB-Shape-magnify:after{top:17px;left:19px;height:6px;transform:rotate(314deg);background:#636D72;content:''}.CDB-Shape-Arrow{height:8px;background:#32A8E6}.CDB-Shape-Arrow:after,.CDB-Shape-Arrow:before{display:block;position:absolute;top:2px;width:5px;height:1px;background:#32A8E6;content:''}.CDB-Shape-Arrow:before{left:0;transform:rotate(45deg)}.CDB-Shape-Arrow:after{left:-4px;transform:rotate(-45deg)}.CDB-Shape-Arrow--top{top:6px;right:9px;transform:rotate(45deg)}.CDB-Shape-Arrow--bottom{top:13px;left:46px;transform:rotate(-135deg)}.u-tSpace{margin-top:4px}.u-tSpace-xl{margin-top:12px}.u-rSpace{margin-right:4px}.u-rSpace--m{margin-right:8px}.u-rSpace--xl{margin-right:12px}.u-lSpace{margin-left:4px}.u-lSpace--xl{margin-left:12px}.u-iBlock{display:inline-block;vertical-align:middle}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}mark{background:#ff0;color:#000}sub,sup{line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}body{margin:0;line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file From 1325ab73648362fd589bc112547789dfc96a8f80 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 14:48:25 +0100 Subject: [PATCH 012/391] Added shell task to dev tasks --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Gruntfile.js b/Gruntfile.js index 60c06a1..3b321dd 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,6 +19,7 @@ module.exports = function (grunt) { ]; var devTasks = baseTasks.concat([ + 'shell', 'connect', 'watch:scss' ]); From 1a54b3e8977aa80a7c4c9469f9eea8de97e83c6a Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 17:36:27 +0100 Subject: [PATCH 013/391] Removed .tmp folder --- .tmp/src/scss/components/shapes.css | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .tmp/src/scss/components/shapes.css diff --git a/.tmp/src/scss/components/shapes.css b/.tmp/src/scss/components/shapes.css deleted file mode 100644 index f38d833..0000000 --- a/.tmp/src/scss/components/shapes.css +++ /dev/null @@ -1 +0,0 @@ -.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px}.CDB-Shape-threePoints{display:inline-block;position:relative;width:3px;height:16px;margin-right:-7px;margin-left:6px;padding:0 7px 0 10px;text-align:center;vertical-align:middle}.CDB-Shape-threePoints:after,.CDB-Shape-threePoints:before{display:inline-block;position:absolute;width:3px;height:3px;border-radius:50%;content:'';z-index:1}.CDB-Shape-threePoints:before{top:0;right:7px}.CDB-Shape-threePoints:after{right:7px;bottom:1px}.CDB-Shape-threePoints:hover{cursor:pointer}.CDB-Shape-threePointsItem{display:block;position:absolute;top:6px;left:7px;width:3px;height:3px;border-radius:50%}.CDB-Shape-lens{display:inline-block;position:relative;width:16px;height:16px}.CDB-Shape-lens:after,.CDB-Shape-lens:before{position:absolute;content:''}.CDB-Shape-lens:after{top:0;left:0;width:8px;height:8px;border:1px solid transparent;border-radius:10px}.CDB-Shape-lens:before{-webkit-transform:rotate(45deg);-khtml-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg);right:3px;bottom:5px;width:6px;height:1px}.CDB-Shape-lens:hover{cursor:pointer}.CDB-Shape-hamburguer{display:inline-block;position:relative;width:16px;height:2px;border:0;background:#FFF;vertical-align:middle}.CDB-Shape-hamburguer:before,.CDB-Shape-hamburguer:after{display:block;position:absolute;width:16px;height:2px;background:#FFF;content:''}.CDB-Shape-hamburguer:before{top:-6px}.CDB-Shape-hamburguer:after{bottom:-6px}.CDB-Shape-magnify{display:block;position:relative;width:32px;height:32px}.CDB-Shape-magnify:before{display:block;position:absolute;top:10px;left:10px;width:7px;height:7px;border:1px solid #636D72;border-radius:50%;content:''}.CDB-Shape-magnify:after{display:block;position:absolute;top:17px;left:19px;width:1px;height:6px;transform:rotate(314deg);background:#636D72;content:''}.CDB-Shape-Arrow{display:block;position:absolute;width:1px;height:8px;background:#32A8E6}.CDB-Shape-Arrow:before{display:block;position:absolute;top:2px;left:0;width:5px;height:1px;transform:rotate(45deg);background:#32A8E6;content:''}.CDB-Shape-Arrow:after{display:block;position:absolute;top:2px;left:-4px;width:5px;height:1px;transform:rotate(-45deg);background:#32A8E6;content:''}.CDB-Shape-Arrow--top{top:6px;right:9px;transform:rotate(45deg)}.CDB-Shape-Arrow--bottom{top:13px;left:46px;transform:rotate(-135deg)} From d0649b6db369a7154d616cc5e6f357cf862bec7d Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 17:46:09 +0100 Subject: [PATCH 014/391] Added a proposal for fonts within CartoAssets --- src/scss/utilities/fonts.scss | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/scss/utilities/fonts.scss diff --git a/src/scss/utilities/fonts.scss b/src/scss/utilities/fonts.scss new file mode 100644 index 0000000..989b8bf --- /dev/null +++ b/src/scss/utilities/fonts.scss @@ -0,0 +1,27 @@ +// Fonts +// -------------------------------------------------- + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'); +} From 719ce6e0e0033f6be9c94639abfafdb237b17b19 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 17:49:37 +0100 Subject: [PATCH 015/391] Removed CartoStyles from dist folder --- dist/cartostyles.css | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dist/cartostyles.css diff --git a/dist/cartostyles.css b/dist/cartostyles.css deleted file mode 100644 index 983628b..0000000 --- a/dist/cartostyles.css +++ /dev/null @@ -1 +0,0 @@ -.CDB-Shape-lens:hover,.CDB-Shape-threePoints:hover{cursor:pointer}.CDB-Shape-dot{display:inline-block;width:8px;min-width:8px;height:8px;border-radius:8px}.CDB-Shape-threePoints{display:inline-block;position:relative;width:3px;height:16px;margin-right:-7px;margin-left:6px;padding:0 7px 0 10px;text-align:center;vertical-align:middle}.CDB-Shape-threePoints:after,.CDB-Shape-threePoints:before{display:inline-block;position:absolute;width:3px;height:3px;border-radius:50%;content:'';z-index:1}.CDB-Shape-threePoints:before{top:0;right:7px}.CDB-Shape-threePoints:after{right:7px;bottom:1px}.CDB-Shape-threePointsItem{display:block;position:absolute;top:6px;left:7px;width:3px;height:3px;border-radius:50%}.CDB-Shape-lens{display:inline-block;position:relative;width:16px;height:16px}.CDB-Shape-lens:after,.CDB-Shape-lens:before{position:absolute;content:''}.CDB-Shape-lens:after{top:0;left:0;width:8px;height:8px;border:1px solid transparent;border-radius:10px}.CDB-Shape-lens:before{-webkit-transform:rotate(45deg);-khtml-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg);right:3px;bottom:5px;width:6px;height:1px}.CDB-Shape-hamburguer{display:inline-block;position:relative;width:16px;height:2px;border:0;background:#FFF;vertical-align:middle}.CDB-Shape-hamburguer:after,.CDB-Shape-hamburguer:before{display:block;position:absolute;width:16px;height:2px;background:#FFF;content:''}.CDB-Shape-hamburguer:before{top:-6px}.CDB-Shape-hamburguer:after{bottom:-6px}.CDB-Shape-magnify{display:block;position:relative;width:32px;height:32px}.CDB-Shape-magnify:before{display:block;position:absolute;top:10px;left:10px;width:7px;height:7px;border:1px solid #636D72;border-radius:50%;content:''}.CDB-Shape-Arrow,.CDB-Shape-magnify:after{display:block;position:absolute;width:1px}.CDB-Shape-magnify:after{top:17px;left:19px;height:6px;transform:rotate(314deg);background:#636D72;content:''}.CDB-Shape-Arrow{height:8px;background:#32A8E6}.CDB-Shape-Arrow:after,.CDB-Shape-Arrow:before{display:block;position:absolute;top:2px;width:5px;height:1px;background:#32A8E6;content:''}.CDB-Shape-Arrow:before{left:0;transform:rotate(45deg)}.CDB-Shape-Arrow:after{left:-4px;transform:rotate(-45deg)}.CDB-Shape-Arrow--top{top:6px;right:9px;transform:rotate(45deg)}.CDB-Shape-Arrow--bottom{top:13px;left:46px;transform:rotate(-135deg)}.u-tSpace{margin-top:4px}.u-tSpace-xl{margin-top:12px}.u-rSpace{margin-right:4px}.u-rSpace--m{margin-right:8px}.u-rSpace--xl{margin-right:12px}.u-lSpace{margin-left:4px}.u-lSpace--xl{margin-left:12px}.u-iBlock{display:inline-block;vertical-align:middle}html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}mark{background:#ff0;color:#000}sub,sup{line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}svg:not(:root){overflow:hidden}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}optgroup{font-weight:700}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}body{margin:0;line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file From c3f6b5b00b8f8c83765eef28c598d8dba7a479fb Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 17:51:06 +0100 Subject: [PATCH 016/391] Removed unnecessary Open Sans bold from common fonts --- src/scss/utilities/fonts.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/scss/utilities/fonts.scss b/src/scss/utilities/fonts.scss index 989b8bf..d9e991e 100644 --- a/src/scss/utilities/fonts.scss +++ b/src/scss/utilities/fonts.scss @@ -19,9 +19,3 @@ font-weight: 600; src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'); } -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'); -} From 1c3ce9d3064ba8d5a34ee9e27960afe9c4ffe90c Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 17:51:44 +0100 Subject: [PATCH 017/391] Added description to fonts stylesheet --- src/scss/utilities/fonts.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/utilities/fonts.scss b/src/scss/utilities/fonts.scss index d9e991e..1019104 100644 --- a/src/scss/utilities/fonts.scss +++ b/src/scss/utilities/fonts.scss @@ -1,4 +1,5 @@ // Fonts +// - They are being loaded from Google fonts // -------------------------------------------------- @font-face { From 05724c5df97d945c1df40631b1f4edca18dc377b Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 17:55:58 +0100 Subject: [PATCH 018/391] Removed DS_Store --- src/scss/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/scss/.DS_Store diff --git a/src/scss/.DS_Store b/src/scss/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Thu, 14 Jan 2016 17:58:23 +0100 Subject: [PATCH 019/391] Removed reset stylesheet, only taking normalize --- src/scss/utilities/reset.scss | 40 ----------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/scss/utilities/reset.scss diff --git a/src/scss/utilities/reset.scss b/src/scss/utilities/reset.scss deleted file mode 100644 index 2982152..0000000 --- a/src/scss/utilities/reset.scss +++ /dev/null @@ -1,40 +0,0 @@ -/* 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, &:after { - content: ''; - content: none; } } - -q { - &:before, &:after { - content: ''; - content: none; } } - -table { - border-collapse: collapse; - border-spacing: 0; } From 67e3f5a03bcd7f6b9af7253f409b620ae0a65f4f Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:17:00 +0100 Subject: [PATCH 020/391] Added missed baseSize variable --- src/scss/variables/_sizes.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/scss/variables/_sizes.scss b/src/scss/variables/_sizes.scss index 45e15b2..3dcbb39 100644 --- a/src/scss/variables/_sizes.scss +++ b/src/scss/variables/_sizes.scss @@ -5,6 +5,9 @@ $desktopLayout: 352px; $mobileLayout: 280px; +//Base +$baseSize: 8px; + // Margins $sMargin-section: 24px; // To separate main section $sMargin-element: 14px; // To separate elements inside a group From ed1675a17f28b3d382062116fe2e7b22c4c84545 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:17:13 +0100 Subject: [PATCH 021/391] New package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1a0a96..f8ea821 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.5", + "version": "0.1.7", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", From 919adb299ba2d629152e1bf79d7c38acf5330a7c Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:26:33 +0100 Subject: [PATCH 022/391] Adding more helpers --- src/scss/utilities/helpers.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/scss/utilities/helpers.scss b/src/scss/utilities/helpers.scss index 2247981..41eb367 100644 --- a/src/scss/utilities/helpers.scss +++ b/src/scss/utilities/helpers.scss @@ -27,3 +27,18 @@ .u-iBlock { @include inline-block(); } +.u-showDesktop { + display: block !important; +} +.u-showMobile { + display: none !important; +} + +@include media-query-mobile() { + .u-showDesktop { + display: none !important; + } + .u-showMobile { + display: block !important; + } +} From a33dc432028b6993587d10830cfc26e9e3f75318 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:27:09 +0100 Subject: [PATCH 023/391] new version of package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8ea821..66f5d9c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.7", + "version": "0.1.8", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", From 6c5911b1e05aef9943c5d9b918c1482195270fbb Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:44:00 +0100 Subject: [PATCH 024/391] Added position relative to result canvas within styleguide --- styleguide/theme.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styleguide/theme.css b/styleguide/theme.css index df403f9..c84c1f2 100644 --- a/styleguide/theme.css +++ b/styleguide/theme.css @@ -18,6 +18,7 @@ } #styleguide .result { + position: relative; border-top: none; } From e04d8c0037053b1f749039cd19a2848aad1f6db5 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:44:27 +0100 Subject: [PATCH 025/391] Added loader as a common element --- src/scss/components/loader.scss | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/scss/components/loader.scss diff --git a/src/scss/components/loader.scss b/src/scss/components/loader.scss new file mode 100644 index 0000000..7f0aeba --- /dev/null +++ b/src/scss/components/loader.scss @@ -0,0 +1,41 @@ +// Loader styles +// ---------------------------------------------- + +/* SG +# Loader + +This is the generic loader for widgets, maps, components, ... +There is only one state 'is-visible', in order to make it visible. + +``` +
+``` +*/ + +@import '../utilities/mixins'; + +.CDB-Loader { + @include css3-prefix(animation, loader-progress 1000ms linear 1); + @include opacity(0); + @include transition(opacity, 1000ms); + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 2px; + background: rgba(#3AA9E3, 1); + z-index: 10; +} +.CDB-Loader.is-visible { + @include css3-prefix(animation, loader-progress 2000ms linear infinite); + @include opacity(1); +} + +@include keyframes(loader-progress) { + 0% { + width: 0; + } + 100% { + width: 100%; + } +} From 16478d4c2878b5daa0a9cb33fca0e958bac95c99 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 18:44:56 +0100 Subject: [PATCH 026/391] New version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66f5d9c..bc21b02 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.8", + "version": "0.1.9", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", From 722634ac7c22bf30ca5591dad540ea5e4c8dad81 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 19:09:08 +0100 Subject: [PATCH 027/391] Adding HoundCI --- .hound.yml | 7 ++ .scss-lint.yml | 182 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 .hound.yml create mode 100644 .scss-lint.yml diff --git a/.hound.yml b/.hound.yml new file mode 100644 index 0000000..a36dade --- /dev/null +++ b/.hound.yml @@ -0,0 +1,7 @@ +scss: + enabled: true + config_file: .scss-lint.yml +ruby: + enabled: false +javascript: + enabled: false diff --git a/.scss-lint.yml b/.scss-lint.yml new file mode 100644 index 0000000..16a64f1 --- /dev/null +++ b/.scss-lint.yml @@ -0,0 +1,182 @@ +scss_files: 'src/scss/**/*.scss' +exclude: + - 'src/scss/utilities/normalize.scss' +linters: + BangFormat: + enabled: true + space_before_bang: true + space_after_bang: false + BemDepthf: + enabled: true + max_elements: 3 + BorderZero: + enabled: false + convention: zero + ColorKeyword: + enabled: true + severity: warning + ColorVariable: + enabled: false + severity: warning + Comment: + enabled: false + Compass::PropertyWithMixin: + enabled: false + DebugStatement: + enabled: true + DeclarationOrder: + enabled: true + DisableLinterReason: + enabled: false + DuplicateProperty: + enabled: true + ElsePlacement: + enabled: true + style: same_line + EmptyLineBetweenBlocks: + enabled: false + EmptyRule: + enabled: true + FinalNewline: + enabled: true + present: true + HexLength: + enabled: true + style: short + HexNotation: + enabled: true + style: uppercase + HexValidation: + enabled: true + IdSelector: + enabled: true + ImportantRule: + enabled: true + ImportPath: + enabled: true + leading_underscore: false + filename_extension: false + Indentation: + enabled: true + allow_non_nested_indentation: false + character: space + width: 2 + severity: warning + LeadingZero: + enabled: true + style: include_zero + MergeableSelector: + enabled: true + force_nesting: false + NameFormat: + enabled: true + # Valid cases + # - hello + # - helloMates + # - hello-buddy + # - hello-buddyOne + convention: '([a-z]*)([A-Z]+[a-z]*)*-{0,2}([a-z]([a-z]*[A-Z]*[a-z]*))(\.[a-z]+-[a-z]*[A-Z]*[a-z]*)?(:.*)*' + NestingDepth: + enabled: true + max_depth: 3 + severity: warning + PlaceholderInExtend: + enabled: false + PropertyCount: + enabled: true + include_nested: false + max_properties: 18 + severity: warning + PropertySortOrder: + enabled: true + order: smacss + ignore_unspecified: true + severity: warning + separate_groups: false + PropertySpelling: + enabled: true + extra_properties: [] + PropertyUnits: + global: ['em', 'rem', '%', 'px', 's', 'ms', 'vh'] # Allow relative units globally + properties: + border: ['px'] + line-height: ['px', ''] + margin: ['em', 'px', '%'] + QualifyingElement: + enabled: true + allow_element_with_attribute: true + allow_element_with_class: false + allow_element_with_id: false + severity: warning + SelectorDepth: + enabled: true + max_depth: 3 + severity: warning + SelectorFormat: + enabled: true + # Valid cases + # - 0..100% + # - i | em | strong | div | span | ... + # - CDB-Logo + # - CDB-LogoWadus + # - CDB-Logo--cartofante + # - CDB-LogoWadus--cartofante + # - CDB-Logo--cartofantePleased + # - CDB-Logo--cartofanteURL + # - CDB-Logo-oh + # - CDB-Logo-oh:hover + # - CDB-Logo:after + # - CDB-Logo.is-state + convention: '([0-9]+%)|([a-z]+(:.*)*)|CDB-([A-Z]+[a-z]*)([A-Z]+[a-z]*)*-{0,2}([a-z]([a-z]*[A-Z]*[a-z]*))(\.[a-z]+-[a-z]*[A-Z]*[a-z]*)?(:.*)*' + ignored_types: ['id'] + Shorthand: + enabled: true + severity: warning + SingleLinePerProperty: + enabled: true + allow_single_line_rule_sets: false + SingleLinePerSelector: + enabled: true + SpaceAfterComma: + enabled: true + SpaceAfterPropertyColon: + enabled: true + style: one_space + SpaceAfterPropertyName: + enabled: true + SpaceAfterVariableName: + enabled: true + SpaceAroundOperator: + enabled: true + style: one_space + SpaceBeforeBrace: + enabled: true + style: space + allow_single_line_padding: false + SpaceBetweenParens: + enabled: true + spaces: 0 + StringQuotes: + enabled: true + style: single_quotes + TrailingSemicolon: + enabled: true + severity: warning + TrailingZero: + enabled: true + UnnecessaryMantissa: + enabled: true + UnnecessaryParentReference: + enabled: true + UrlFormat: + enabled: true + UrlQuotes: + enabled: true + VariableForProperty: + enabled: false + properties: [] + VendorPrefixes: + enabled: false + ZeroUnit: + enabled: true + severity: warning From 87a7b570c8c55f77bcbe4f5d1b6e3caedaaa8b7a Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 19:23:10 +0100 Subject: [PATCH 028/391] Changed sizes indentation --- src/scss/variables/_sizes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/variables/_sizes.scss b/src/scss/variables/_sizes.scss index 3dcbb39..31de97a 100644 --- a/src/scss/variables/_sizes.scss +++ b/src/scss/variables/_sizes.scss @@ -32,5 +32,5 @@ $sLineHeight-normal: 20px; $sLineHeight-large: 22px; $sLineHeight-larger: 24px; $sLineHeight-largest: 27px; -$sLineHeight-huge: 34px; +$sLineHeight-huge: 34px; $sLineHeight-button: 15px; From 48038c4aee429187f5574f3ce28fd03898b8a6ad Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 19:23:28 +0100 Subject: [PATCH 029/391] Added some excluded files from scss-linting --- .scss-lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.scss-lint.yml b/.scss-lint.yml index 16a64f1..ee73a66 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -1,6 +1,8 @@ scss_files: 'src/scss/**/*.scss' exclude: - 'src/scss/utilities/normalize.scss' + - 'src/scss/utilities/helpers.scss' + - 'src/scss/variables/_sizes.scss' linters: BangFormat: enabled: true From d3462121e04b00af348d46bed3670823be2750f2 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 19:23:36 +0100 Subject: [PATCH 030/391] Added a better README --- README.md | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1e6923c..8d962c1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,24 @@ > Share frontend assets between different CartoDB repositories -- CSS styleguide. -- JS styleguide. -- CSS components. -- Font icon? +### Installation +As easy as: +- ```npm install``` + +### Build +If you want to use any of the CartoAssets components, after the installation just run: +- ```grunt build``` + +### Development +It will generate a UI documentation about the components in this repository: +- ```grunt dev``` + +### Publish a new version +In order to publish a new version of CartoAssets you need to: + +- Change version of the package. +- Be a collaborator of the [npm module](https://www.npmjs.com/cartoassets) (Send an email to xavijam[at]cartodb.com). + +If you have previous steps done: + +- ```npm publish``` From 885c440318b4adca803993d59ced83c25685d6f6 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 19:24:03 +0100 Subject: [PATCH 031/391] New version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc21b02..9a889ad 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.9", + "version": "0.1.10", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", From 8336065eb993a904e99e4a662fc9a7d1f8dfe745 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 19:29:08 +0100 Subject: [PATCH 032/391] Added npm version to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d962c1..f95bea9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# CartoAssets +# CartoAssets [![NPM version](http://img.shields.io/npm/v/cartoassets.svg)](https://www.npmjs.org/package/cartoassets) > Share frontend assets between different CartoDB repositories From 2985cb086010c1678c652d078463836f7cf5b7f1 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 21:42:38 +0100 Subject: [PATCH 033/391] Removed unnecessary .jshintrc --- .jshintrc | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .jshintrc diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index f57a8ff..0000000 --- a/.jshintrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "curly": true, - "eqeqeq": true, - "immed": true, - "latedef": true, - "newcap": true, - "noarg": true, - "sub": true, - "undef": true, - "boss": true, - "eqnull": true, - "node": true -} From 7bccbe0f302bd345861feda3a17d307271d48314 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 21:42:55 +0100 Subject: [PATCH 034/391] Fixed README typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f95bea9..a1ba66a 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,6 @@ In order to publish a new version of CartoAssets you need to: - Change version of the package. - Be a collaborator of the [npm module](https://www.npmjs.com/cartoassets) (Send an email to xavijam[at]cartodb.com). -If you have previous steps done: +If you have these previous steps done: - ```npm publish``` From 1b4d698fd900dd521c8d5d69b0766a4ec4ad76d4 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 22:17:06 +0100 Subject: [PATCH 035/391] Added gh-pages task --- .grunt/grunt-gh-pages/gh-pages/src | 1 + .styleguide | 4 ++-- Gruntfile.js | 8 +++++--- README.md | 7 ++++++- package.json | 1 + tasks/gh-pages.js | 6 ++++++ 6 files changed, 21 insertions(+), 6 deletions(-) create mode 160000 .grunt/grunt-gh-pages/gh-pages/src create mode 100644 tasks/gh-pages.js diff --git a/.grunt/grunt-gh-pages/gh-pages/src b/.grunt/grunt-gh-pages/gh-pages/src new file mode 160000 index 0000000..6fbdab3 --- /dev/null +++ b/.grunt/grunt-gh-pages/gh-pages/src @@ -0,0 +1 @@ +Subproject commit 6fbdab365c6df53c8e7d8394062e1532f3e87cba diff --git a/.styleguide b/.styleguide index 0f9e8e1..f85e8d7 100644 --- a/.styleguide +++ b/.styleguide @@ -1,7 +1,7 @@ { "sgComment": "SG", - "srcFolder": ".", - "outputFile": "./styleguide/index.html", + "srcFolder": "./src", + "outputFile": "./dist/styleguide/index.html", "templateFile": "./styleguide/_template.html", "themeFile": "./styleguide/theme.css", "highlightFolder": "./node_modules/highlight.js/styles", diff --git a/Gruntfile.js b/Gruntfile.js index 3b321dd..7f2e5c9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,18 +8,19 @@ module.exports = function (grunt) { sass: require('./tasks/sass'), cssmin: require('./tasks/cssmin'), shell: require('./tasks/shell'), - watch: require('./tasks/watch') + watch: require('./tasks/watch'), + 'gh-pages': require('./tasks/gh-pages') }); var baseTasks = [ 'clean', 'sass', 'concat', - 'cssmin' + 'cssmin', + 'shell' ]; var devTasks = baseTasks.concat([ - 'shell', 'connect', 'watch:scss' ]); @@ -31,4 +32,5 @@ module.exports = function (grunt) { grunt.registerTask('dev', devTasks); grunt.registerTask('build', baseTasks); grunt.registerTask('default', baseTasks); + grunt.registerTask('publish', ['gh-pages']); }; diff --git a/README.md b/README.md index a1ba66a..4912a51 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you want to use any of the CartoAssets components, after the installation jus It will generate a UI documentation about the components in this repository: - ```grunt dev``` -### Publish a new version +### Publish a new version in NPM In order to publish a new version of CartoAssets you need to: - Change version of the package. @@ -24,3 +24,8 @@ In order to publish a new version of CartoAssets you need to: If you have these previous steps done: - ```npm publish``` + +### Publish CartoAssets styleguide and documentation in GH-Pages +Just run this command: + +- ```grunt publish``` diff --git a/package.json b/package.json index 9a889ad..4e6c64b 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "grunt-contrib-cssmin": "0.14.0", "grunt-contrib-connect": "0.11.2", "grunt-contrib-watch": "0.6.1", + "grunt-gh-pages": "1.0.0", "grunt-shell": "1.1.2", "load-grunt-tasks": "*" }, diff --git a/tasks/gh-pages.js b/tasks/gh-pages.js new file mode 100644 index 0000000..f3a9470 --- /dev/null +++ b/tasks/gh-pages.js @@ -0,0 +1,6 @@ +module.exports = { + options: { + base: 'dist' + }, + src: '**/*' +}; From 88fd6a7c821031411c934cb6e0dae27a07e11e0a Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 22:19:06 +0100 Subject: [PATCH 036/391] Fixed cartostyles path in styleguide template --- styleguide/_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styleguide/_template.html b/styleguide/_template.html index 216806e..2576881 100644 --- a/styleguide/_template.html +++ b/styleguide/_template.html @@ -1,5 +1,5 @@ - + {{> theme}} From 8bcb650d6e357bd997c66a868f1109c4cfb0a6cd Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 22:21:09 +0100 Subject: [PATCH 037/391] Ignoring .grunt folder --- .gitignore | 1 + .grunt/grunt-gh-pages/gh-pages/src | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 160000 .grunt/grunt-gh-pages/gh-pages/src diff --git a/.gitignore b/.gitignore index cd6e3c4..138828b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ node_modules npm-debug.log .tmp dist +.grunt styleguide/index.html diff --git a/.grunt/grunt-gh-pages/gh-pages/src b/.grunt/grunt-gh-pages/gh-pages/src deleted file mode 160000 index 6fbdab3..0000000 --- a/.grunt/grunt-gh-pages/gh-pages/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6fbdab365c6df53c8e7d8394062e1532f3e87cba From 912a6d11c59adf777c048a5646f36620cf6a40bb Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 14 Jan 2016 22:21:58 +0100 Subject: [PATCH 038/391] Changes over grunt publish task --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7f2e5c9..1c69523 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -32,5 +32,5 @@ module.exports = function (grunt) { grunt.registerTask('dev', devTasks); grunt.registerTask('build', baseTasks); grunt.registerTask('default', baseTasks); - grunt.registerTask('publish', ['gh-pages']); + grunt.registerTask('publish', ['build', 'gh-pages']); }; From c1a836b9aaebf1a74c29c26f8b9849cfef685094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Garc=C3=ADa?= Date: Fri, 15 Jan 2016 12:25:29 +0100 Subject: [PATCH 039/391] first aprroach of colors --- src/scss/components/colors.scss | 135 ++++++++++++++++++++++++++++++++ src/scss/variables/_colors.scss | 31 ++++++++ 2 files changed, 166 insertions(+) create mode 100644 src/scss/components/colors.scss diff --git a/src/scss/components/colors.scss b/src/scss/components/colors.scss new file mode 100644 index 0000000..e0db196 --- /dev/null +++ b/src/scss/components/colors.scss @@ -0,0 +1,135 @@ +// Shapes styles +// ---------------------------------------------- + +/* SG +# Colors/structure + + +``` +
+
+
+
+
+
+``` +*/ + +@import '../variables/colors'; + +.box { + width: 120px; + height: 64px; + display: inline-block; + margin: 0 24px 24px 0; +} + +.Color-Blue { + background: $cBlue; +} +.Color-White { + background: $cWhite; + border: 1px solid #e5e5e5; +} +.Color-Dark { + background: $cBlack; +} + +.Color-MainDark { + background: $cMainDark; +} +.Color-SecondaryDark { + background: $cSecondaryDark; +} +.Color-SecondaryBackground { + background: $cSecondaryBackground; +} +.Color-ThirdBackground { + background: $cThirdBackground; +} + + +/* SG +# Colors/line + + +``` +
+
+
+
+``` +*/ + + +.Color-HoverLine { + background: $cHoverLine; +} +.Color-MainLine { + background: $cMainLine; +} +.Color-SecondaryLine { + background: $cSecondaryLine; +} + + +/* SG +# Colors/typography + + +``` +
+
+
+
+
+
+``` +*/ + + +.Color-Type02 { + background: $cTypo2; +} +.Color-Type03 { + background: $cTypo3; +} +.Color-Type04 { + background: $cTypo4; +} + + +/* SG +# Colors/other + + +``` +
+
+
+
+
+
+``` +*/ + +.Color-Higlight { + background: $cHighlight; +} +.Color-Alert { + background: $cAlert; +} +.Color-Public { + background: $cPublic; +} +.Color-Link { + background: $cLink; +} +.Color-Password { + background: $cPassword; +} +.Color-Error { + background: $cError; +} + + diff --git a/src/scss/variables/_colors.scss b/src/scss/variables/_colors.scss index e69de29..7c7ff2d 100644 --- a/src/scss/variables/_colors.scss +++ b/src/scss/variables/_colors.scss @@ -0,0 +1,31 @@ +// Colors variables +// ---------------------------------------------- + +// General +$cBlue: #3AA9E3; +$cBlack: #000; +$cWhite: #FFF; +$cMainDark: #2E3C43; + +//Structure +$cSecondaryDark: #282C2F; +$cSecondaryBackground: #F2F6F9; +$cThirdBackground: #F9F9F9; + +//Lines +$cHoverLine: #AAA; +$cMainLine: #DDD; +$cSecondaryLine: #EEE; + +//Typography +$cTypo2: #636D72; +$cTypo3: #979EA1; +$cTypo4: #CBCED0; + +//Others +$cHighlight: #9DE0AD; +$cAlert: #F19243; +$cPublic: #9BC63B; +$cLink: #FEB100; +$cPassword: #FB7B23; +$cError: #F15743; From 329708a65c085b9eb1929355a601acb8b1089cf2 Mon Sep 17 00:00:00 2001 From: xavijam Date: Fri, 15 Jan 2016 13:21:22 +0100 Subject: [PATCH 040/391] Updated Readme, thanks @javierarce --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4912a51..4274da6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ ### Installation As easy as: - ```npm install``` +- ```npm install -g markdown-styleguide-generator``` [StyleGenerator installation](https://www.npmjs.com/package/markdown-styleguide-generator#install) ### Build If you want to use any of the CartoAssets components, after the installation just run: @@ -15,6 +16,8 @@ If you want to use any of the CartoAssets components, after the installation jus It will generate a UI documentation about the components in this repository: - ```grunt dev``` +If you want to check the documenation, it is generated in the dist folder. + ### Publish a new version in NPM In order to publish a new version of CartoAssets you need to: From 2198e2297c93a3171350a36a6cd6ebbec0f291f9 Mon Sep 17 00:00:00 2001 From: xavijam Date: Fri, 15 Jan 2016 13:22:02 +0100 Subject: [PATCH 041/391] picky readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4274da6..67619a7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you want to use any of the CartoAssets components, after the installation jus It will generate a UI documentation about the components in this repository: - ```grunt dev``` -If you want to check the documenation, it is generated in the dist folder. +If you want to check the documenation, it is generated in the ```dist``` folder. ### Publish a new version in NPM In order to publish a new version of CartoAssets you need to: From fbed6dcc9961e9a7855883d308eb65f0eac8cf99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Garc=C3=ADa?= Date: Fri, 15 Jan 2016 13:36:27 +0100 Subject: [PATCH 042/391] add typography --- src/scss/components/colors.scss | 2 +- src/scss/components/typography.scss | 51 +++++++++++++++++++++++++++++ src/scss/variables/_sizes.scss | 26 ++++++--------- 3 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 src/scss/components/typography.scss diff --git a/src/scss/components/colors.scss b/src/scss/components/colors.scss index e0db196..53cdbda 100644 --- a/src/scss/components/colors.scss +++ b/src/scss/components/colors.scss @@ -1,4 +1,4 @@ -// Shapes styles +// Colors styles // ---------------------------------------------- /* SG diff --git a/src/scss/components/typography.scss b/src/scss/components/typography.scss new file mode 100644 index 0000000..3befe67 --- /dev/null +++ b/src/scss/components/typography.scss @@ -0,0 +1,51 @@ +// Shapes styles +// ---------------------------------------------- + +/* SG +# Typography/ + +``` +

Open Sans
+26/34 Regular

+

Open Sans
+16/22 Regular

+

Open Sans
+12/16 Semibold

+

Open Sans
+12/16 Semibold

+

Open Sans
+10/14 Semibold

+

Open Sans +10/14 Regular

+``` +*/ + +@import '../variables/sizes'; + +.Text { + font-family: 'Open Sans'; + $sFontWeight-normal: 400; + &.is-semibold { + font-weight: $sFontWeight-semibold; + } + &.is-light { + font-weight: $sFontWeight-lighter; + } +} +.Size-huge { + font-size: $sFontSize-huge; + line-height: $sLineHeight-huge; +} +.Size-large { + font-size: $sFontSize-large; + line-height: $sLineHeight-large; +} +.Size-medium { + font-size: $sFontSize-medium; + line-height: $sLineHeight-medium; +} +.Size-small { + font-size: $sFontSize-small; + line-height: $sLineHeight-small; +} + diff --git a/src/scss/variables/_sizes.scss b/src/scss/variables/_sizes.scss index 31de97a..70c38e5 100644 --- a/src/scss/variables/_sizes.scss +++ b/src/scss/variables/_sizes.scss @@ -13,24 +13,18 @@ $sMargin-section: 24px; // To separate main section $sMargin-element: 14px; // To separate elements inside a group // Font sizes -$sFontSize-smaller: 10px; -$sFontSize-small: 12px; -$sFontSize-normal: 14px; -$sFontSize-larger: 16px; -$sFontSize-huge: 26px; +$sFontSize-small: 10px; +$sFontSize-medium: 14px; +$sFontSize-large: 16px; +$sFontSize-huge: 26px; // Font weights -$sFontWeight-lighter: 300; -$sFontWeight-normal: 400; +$sFontWeight-lighter: 300; +$sFontWeight-normal: 400; $sFontWeight-semibold: 600; -$sFontWeight-bold: 700; // Line heights -$sLineHeight-smaller: 15px; -$sLineHeight-small: 16px; -$sLineHeight-normal: 20px; -$sLineHeight-large: 22px; -$sLineHeight-larger: 24px; -$sLineHeight-largest: 27px; -$sLineHeight-huge: 34px; -$sLineHeight-button: 15px; +$sLineHeight-small: 14px; +$sLineHeight-medium: 16px; +$sLineHeight-large: 22px; +$sLineHeight-huge: 34px; From cebe2b2063c7742589d165b4ba4645e88214c6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Garc=C3=ADa?= Date: Fri, 15 Jan 2016 13:38:30 +0100 Subject: [PATCH 043/391] change markup --- src/scss/components/typography.scss | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/scss/components/typography.scss b/src/scss/components/typography.scss index 3befe67..a85ce0a 100644 --- a/src/scss/components/typography.scss +++ b/src/scss/components/typography.scss @@ -5,18 +5,12 @@ # Typography/ ``` -

Open Sans
-26/34 Regular

-

Open Sans
-16/22 Regular

-

Open Sans
-12/16 Semibold

-

Open Sans
-12/16 Semibold

-

Open Sans
-10/14 Semibold

-

Open Sans -10/14 Regular

+

Open Sans 26/34 Regular

+

Open Sans 16/22 Regular

+

Open Sans 12/16 Semibold

+

Open Sans 12/16 Semibold

+

Open Sans 10/14 Semibold

+

Open Sans 10/14 Regular

``` */ From 6201059991919143208cb4436f8a5f20c76b3079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Garc=C3=ADa?= Date: Fri, 15 Jan 2016 13:44:35 +0100 Subject: [PATCH 044/391] clear template --- src/scss/components/typography.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/scss/components/typography.scss b/src/scss/components/typography.scss index a85ce0a..719a5c7 100644 --- a/src/scss/components/typography.scss +++ b/src/scss/components/typography.scss @@ -1,4 +1,4 @@ -// Shapes styles +// Typography styles // ---------------------------------------------- /* SG @@ -18,7 +18,8 @@ .Text { font-family: 'Open Sans'; - $sFontWeight-normal: 400; + $sFontWeight-normal: 400; + &.is-semibold { font-weight: $sFontWeight-semibold; } @@ -26,18 +27,22 @@ font-weight: $sFontWeight-lighter; } } + .Size-huge { font-size: $sFontSize-huge; line-height: $sLineHeight-huge; } + .Size-large { font-size: $sFontSize-large; line-height: $sLineHeight-large; } + .Size-medium { font-size: $sFontSize-medium; line-height: $sLineHeight-medium; } + .Size-small { font-size: $sFontSize-small; line-height: $sLineHeight-small; From 54720d82e4bb5378b56698d92833191647e36d4a Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 15 Jan 2016 15:07:01 +0100 Subject: [PATCH 045/391] Adds .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 138828b..2f47aa8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store node_modules npm-debug.log .tmp From 959b15bb9facb6fa09481095c3aa040a834f00c3 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Sun, 17 Jan 2016 22:19:57 +0100 Subject: [PATCH 046/391] Add copy task --- tasks/copy.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tasks/copy.js diff --git a/tasks/copy.js b/tasks/copy.js new file mode 100644 index 0000000..fd09f93 --- /dev/null +++ b/tasks/copy.js @@ -0,0 +1,7 @@ +module.exports = { + main: { + files: [ + { expand: true, cwd: 'src/', src: 'fonts/**', dest: 'dist/' }, + ] + } +}; From 6123719fedccc5b8b6268717d8c597d05d5335a4 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Sun, 17 Jan 2016 22:20:08 +0100 Subject: [PATCH 047/391] Adds gulpfile --- Gulpfile.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Gulpfile.js diff --git a/Gulpfile.js b/Gulpfile.js new file mode 100644 index 0000000..c3d5747 --- /dev/null +++ b/Gulpfile.js @@ -0,0 +1,21 @@ +var gulp = require('gulp'); +var iconfont = require('gulp-iconfont'); +var iconfontCss = require('gulp-iconfont-css'); + +gulp.task('default', function(){ + gulp.src(['./icon_font/svgs/*.svg']) + + .pipe(iconfontCss({ + fontName: 'cartoIcon', + path: './icon_font/template.scss', + targetPath: '../scss/icon-font.css.scss', + fontPath: '../../fonts/' + })) + + .pipe(iconfont({ + fontName: 'cartoIcon', + appendCodepoints: true + })) + + .pipe(gulp.dest('src/fonts/')); +}); From 1c63d3a629fb788eba9064d16ec2352d40d04f84 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Sun, 17 Jan 2016 22:20:28 +0100 Subject: [PATCH 048/391] Adds gulp & copy pkg --- package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package.json b/package.json index 4e6c64b..19b581f 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,15 @@ "grunt-contrib-clean": "0.7.0", "grunt-contrib-concat": "0.5.1", "grunt-contrib-cssmin": "0.14.0", + "grunt-contrib-copy": "~0.5.0", "grunt-contrib-connect": "0.11.2", "grunt-contrib-watch": "0.6.1", "grunt-gh-pages": "1.0.0", + "gulp": "3.8.10", + "gulp-iconfont": "1.0.0", + "gulp-iconfont-css": "0.0.9", + "gulp-install": "0.2.0", + "gulp-sketch": "0.0.7", "grunt-shell": "1.1.2", "load-grunt-tasks": "*" }, From be797b385892c922ef90540e12bdb15fbfb1b27a Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Sun, 17 Jan 2016 22:20:36 +0100 Subject: [PATCH 049/391] setup copy pkg --- Gruntfile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 1c69523..c1a8df0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,6 +7,7 @@ module.exports = function (grunt) { clean: require('./tasks/clean'), sass: require('./tasks/sass'), cssmin: require('./tasks/cssmin'), + copy: require('./tasks/copy'), shell: require('./tasks/shell'), watch: require('./tasks/watch'), 'gh-pages': require('./tasks/gh-pages') @@ -17,6 +18,7 @@ module.exports = function (grunt) { 'sass', 'concat', 'cssmin', + 'copy', 'shell' ]; From 43aadf8a730fc5c0096e848469096528991d04c7 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Sun, 17 Jan 2016 22:21:44 +0100 Subject: [PATCH 050/391] Adds icon font --- .gitignore | 1 + icon_font/README.md | 29 ++ icon_font/font.sketch | Bin 0 -> 1269760 bytes icon_font/template.scss | 38 ++ src/fonts/cartoIcon.eot | Bin 0 -> 17008 bytes src/fonts/cartoIcon.svg | 288 +++++++++++ src/fonts/cartoIcon.ttf | Bin 0 -> 16836 bytes src/fonts/cartoIcon.woff | Bin 0 -> 10716 bytes src/scss/icon-font.css.scss | 947 ++++++++++++++++++++++++++++++++++++ 9 files changed, 1303 insertions(+) create mode 100644 icon_font/README.md create mode 100644 icon_font/font.sketch create mode 100644 icon_font/template.scss create mode 100644 src/fonts/cartoIcon.eot create mode 100644 src/fonts/cartoIcon.svg create mode 100644 src/fonts/cartoIcon.ttf create mode 100644 src/fonts/cartoIcon.woff create mode 100644 src/scss/icon-font.css.scss diff --git a/.gitignore b/.gitignore index 2f47aa8..caf96cb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ npm-debug.log dist .grunt styleguide/index.html +icon_font/svgs diff --git a/icon_font/README.md b/icon_font/README.md new file mode 100644 index 0000000..95234cf --- /dev/null +++ b/icon_font/README.md @@ -0,0 +1,29 @@ +How to make changes in the CartoDB icon font +-------------------------------------------- + +If you want to edit, add or remove any icon in our new CartoDB font, you should follow these steps: + +- Check you have [Sketch](http://bohemiancoding.com/sketch/) last version. +- Open [font.sketch](http://github.com/CartoDB/cartodb/blob/master/app/assets/fonts/icon_font/font.sketch) file and make your changes + + +### Rules for your new icons: +- Size should have at max 500px of width/height. +- Place the icon accordingly with the grid. +- Icons should be completely black. +- Group the icon if it has several parts. +- Make icons exportable to SVG. +- Name your icon (layer/group) according to the pattern `icon-font_xx_Name`, where xx is a unique integer (increase it for each new icon). + + +### When you're done with changes +- Select all icons, and export them to `app/assets/fonts/icon_font/svgs` folder (option should be visible in the bottom corner in your Sketch app): + - ![screen shot 2015-01-16 at 11 40 36](https://cloud.githubusercontent.com/assets/978461/5774986/93dc90e8-9d74-11e4-8064-a478e55d392b.png) + - Take into account that ```svgs``` folder is ignored. +- Open your terminal app and go to the CartoDB root folder. +- Install your node dependencies: `npm install` +- Now we will generate the new icon fonts + stylesheet. Just run: `./node_modules/.bin/gulp` +- Check that your `icon-font.css.scss` and the `cartoIcon` fonts have been edited: + - ![screen shot 2015-01-16 at 11 02 53](https://cloud.githubusercontent.com/assets/978461/5775004/acf10faa-9d74-11e4-893c-790da626d894.png) + +All done! diff --git a/icon_font/font.sketch b/icon_font/font.sketch new file mode 100644 index 0000000000000000000000000000000000000000..4794cbd36c56c201974636ec6422ecaba7471784 GIT binary patch literal 1269760 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 +``` +*/ + +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-AvatarList { + padding-left: 12px; +} + +.CDB-AvatarList-item { + display: inline-block; + margin-left: -12px; + border: 2px solid $cWhite; + border-radius: 50%; + vertical-align: middle; +} + +.CDB-AvatarList-itemMore { + display: inline-block; + margin-left: -12px; + padding: 2px 6px; + border-left: 2px solid $cWhite; + border-radius: 50px; + background: $cSecondaryLine; + color: $cTypo2; +} + +.CDB-AvatarList-itemMedia { + width: 16px; + height: 16px; + border-radius: 50%; +} diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 5e00e7a..9c4f75a 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/src/scss/cdb-components/forms/inputs.scss @@ -15,7 +15,7 @@ @import '../../cdb-variables/colors'; .CDB-InputText { - min-width: 152px; + width: 100%; padding: 7px 8px 6px; border: 1px solid $cMainLine; border-radius: 3px; diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss new file mode 100644 index 0000000..f657ea6 --- /dev/null +++ b/src/scss/cdb-components/headers.scss @@ -0,0 +1,133 @@ +// Typography styles +// ---------------------------------------------- + +/* SG +# Headers + +``` +
+
+

Name map

+
+
    +
  • + +
    • +
  • +
      +
    • + User Name +
      • +
    • + User Name +
      • +
    • + User Name +
      • +
    • + +
      • +
    +
    • +
  • +

    Published 8 days ago

    +
    • +
+
+
+
+
+
+ + + +
+
+

Stadiums Affected

+

Rabo

+
+

populated_places

+
+
+
+
+
+ +
+ + + +
+

Basemap

+

Positron by CartoDB

+
+
+
+
+
+ +
+ + + +
+ +

populates_places

+
+
+
+
+
+ +``` +*/ + +@import '../cdb-utilities/mixins'; +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-HeaderInfo { + @include display-flex(); + + &.is-block { + display: block; + } +} + +.CDB-HeaderInfo-ListItem { + display: inline-block; + margin-right: 8px; + vertical-align: middle; + + &:last-child { + margin-right: 0; + } +} + +.CDB-HeaderInfo-Text { + color: $cTypo3; +} + +.CDB-HeaderInfo-Inner { + @include flex(1); +} + +.CDB-HeaderInfo-Back { + margin-top: 7px; +} + +.CDB-HeaderInfo-Title { + @include display-flex(); + @include align-items(center); +} + +.CDB-HeaderInfo-TitleText { + @include flex(1); + padding-right: 24px; +} + + + + diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss new file mode 100644 index 0000000..d564edb --- /dev/null +++ b/src/scss/cdb-components/tags.scss @@ -0,0 +1,48 @@ +// Typography styles +// ---------------------------------------------- + +/* SG +# Tags + +``` + + + + +``` +*/ + +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + + +.CDB-Tag { + border: 1px solid red; + padding: 0 3px; + border-radius: 2px; + + &.is-public { + border: 1px solid $cPublic; + color: $cPublic; + } + &.is-link { + border: 1px solid $cLink; + color: $cLink; + } + &.is-password { + border: 1px solid $cPassword; + color: $cPassword; + } + &.is-private { + border: 1px solid $cError; + color: $cError; + } +} diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index d9ec4aa..b02624d 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -6,10 +6,11 @@ ```

Open Sans 26/34 Regular

+

Open Sans 26/34 Light

Open Sans 16/22 Regular

Open Sans 12/16 Semibold

Open Sans 12/16 Regular

-

Open Sans 10/14 Semibold

+

Open Sans 10/14 Semibold

Open Sans 10/14 Regular

``` */ diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index cee8ce7..1cb8a7b 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -6,6 +6,9 @@ .u-tSpace { margin-top: 4px; } +.u-tSpace--m { + margin-top: 8px; +} .u-tSpace-xl { margin-top: 12px; } @@ -27,6 +30,13 @@ .u-lSpace--xl { margin-left: 12px; } +.u-bSpace { + margin-bottom: 4px; +} +.u-bSpace--m { + margin-bottom: 8px; +} + .u-iBlock { @include inline-block(); } From bff9be2be6914d34f8c4608de50db914d93a4727 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 1 Feb 2016 17:56:03 +0100 Subject: [PATCH 155/391] fix CR --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes/arrow.scss | 21 ++++++++--------- src/scss/cdb-components/shapes/close.scss | 12 +++++----- .../shapes/{subtract.scss => dash.scss} | 22 +++++++++--------- .../cdb-components/shapes/error-circle.scss | 8 +++---- 7 files changed, 31 insertions(+), 32 deletions(-) rename src/scss/cdb-components/shapes/{subtract.scss => dash.scss} (72%) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 230e56795e2952b800812dc7bff3dde5266a5d9a..05b79bf6e2c98a5763f873ff48197b13e7dd8d9a 100644 GIT binary patch delta 54 zcmZ26nQ_Hr#tAme*MH?sv|rD3a?ivMQ>Al%U61Ft`O3h}_=^DuE?srWgwdN9FmiYR E0Fr7I>;M1& delta 54 zcmZ26nQ_Hr#tAme=^^B>7+7`=G`BZmh7 DHmnob diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 48676226efff55c29589383c1d494e99602e5247..059b0812c5a4bb81bea1fa55ad1c14d4d218886e 100644 GIT binary patch delta 46 vcmew}k@3$&#tBYLC-+QrnJS(8>v}xD%~u9)#$OCTaOtW`CXC+rg~I~?&`}b5 delta 46 vcmew}k@3$&#tBYLGG8XTOqI?LNss5Z`O3h}_=^DuE?s%Y3ZplE;qU+erF0Q| diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 305080e362d45172519d05fc7547e9ad1d27592a..66453781d5b4ce6ec43c35c41fca8e183d6b2ee6 100644 GIT binary patch delta 60 zcmV-C0K@;hT)bS6dIHJ3v3#~BDLMCy@eh#8 S!N3F(1pt-_4)L>FC*cO0VjRr? diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index 6565e39..cb596d0 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -47,18 +47,17 @@ Description background: $cMainDark; content: ''; } -} + &.is-up { + top: 6px; + right: 9px; + transform: rotate(45deg); + } -.CDB-Shape-Arrow--top { - top: 6px; - right: 9px; - transform: rotate(45deg); -} - -.CDB-Shape-Arrow--bottom { - top: 13px; - left: 46px; - transform: rotate(-135deg); + &.is-down { + top: 13px; + left: 46px; + transform: rotate(-135deg); + } } .CDB-Shape-Arrow.is-blue { diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index 381dd8d..cbb8591 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -97,12 +97,12 @@ Description &::before { top: 3px; left: 6px; - height: 8px; + height: 7px; } &::after { top: 3px; - right: 7px; - height: 8px; + right: 6px; + height: 7px; } } @@ -110,12 +110,12 @@ Description &::before { top: 2px; left: 4px; - height: 6px; + height: 5px; } &::after { top: 2px; - right: 5px; - height: 6px; + right: 4px; + height: 5px; } } } diff --git a/src/scss/cdb-components/shapes/subtract.scss b/src/scss/cdb-components/shapes/dash.scss similarity index 72% rename from src/scss/cdb-components/shapes/subtract.scss rename to src/scss/cdb-components/shapes/dash.scss index 5664987..409bd20 100644 --- a/src/scss/cdb-components/shapes/subtract.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -1,5 +1,5 @@ /* SG -# Shapes/Subtract +# Shapes/Dash Description @@ -7,17 +7,17 @@ Description

16px

-
+
-
+
-
+

@@ -27,17 +27,17 @@ Description

12px

-
+
-
+
-
+
``` @@ -45,7 +45,7 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape-subtract { +.CDB-Shape-dash { position: relative; height: 100%; @@ -61,7 +61,7 @@ Description } } -.CDB-Shape-subtract.is-small { +.CDB-Shape-dash.is-small { &::before { right: 3px; @@ -69,13 +69,13 @@ Description } } -.CDB-Shape-subtract.is-blue { +.CDB-Shape-dash.is-blue { &::before { background: $cBlue; } } -.CDB-Shape-subtract.is-white { +.CDB-Shape-dash.is-white { &::before { background: $cWhite; } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index 94eea5d..5a77161 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -58,14 +58,14 @@ Description @import '../../cdb-variables/colors'; .CDB-Shape-CircleItem { - width: 14px; - height: 14px; + width: 13px; + height: 13px; border: 1px solid $cMainDark; border-radius: 50%; &.is-small { - width: 10px; - height: 10px; + width: 9px; + height: 9px; margin: 2px auto; } &.is-blue { From 1866c573afeff042b2b26567cdc6a5c5adee3946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 1 Feb 2016 18:21:22 +0100 Subject: [PATCH 156/391] Carousel css --- src/scss/cdb-components/steps/carousel.scss | 89 +++++++++++++++++++++ src/scss/cdb-components/steps/header.scss | 40 +++++++++ src/scss/cdb-utilities/helpers.scss | 3 + src/scss/cdb-variables/_sizes.scss | 4 +- 4 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 src/scss/cdb-components/steps/carousel.scss create mode 100644 src/scss/cdb-components/steps/header.scss diff --git a/src/scss/cdb-components/steps/carousel.scss b/src/scss/cdb-components/steps/carousel.scss new file mode 100644 index 0000000..ad31662 --- /dev/null +++ b/src/scss/cdb-components/steps/carousel.scss @@ -0,0 +1,89 @@ +// Step carousel styles +// ---------------------------------------------- + +/* SG +# Steps/Carousel + +``` +
+
+
1
+

Aggregation

+
+ +
+
+ None +
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-utilities/mixins'; +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; + +.CDB-Carousel { + width: 300px; + margin-left: 32px; +} + +.CDB-Carousel-selection { + color: $cTypo3; + text-transform: uppercase; +} + +.CDB-CarouselContainer { + width: 300px; + padding: $sMargin-element 0; + overflow-x: scroll; + overflow-y: hidden; + white-space: nowrap; +} + +.CDB-CarouselContainer::-webkit-scrollbar { + width: 100%; + height: 3px; + cursor: pointer; +} + +.CDB-CarouselContainer::-webkit-scrollbar-thumb { + background-color: $cSecondaryLine; + border-radius: 4px; + height: 3px; + + &:hover { + background-color: $cMainLine; + } +} + +.CDB-CarouselContainer::-webkit-scrollbar-track { + height: 1px; + background-color: $cThirdBackground; + border-top: 1px solid $cWhite; + border-bottom: 1px solid $cWhite; +} + +.CDB-CarouselCard { + @include inline-block(); + width: $baseSize * 11; + height: $baseSize * 7; + background: $cThirdBackground; + border: 1px solid $cSecondaryLine; + border-radius: 4px; + margin-right: 10px; + vertical-align: top; + + &:hover { + border: 1px solid $cMainLine; + cursor: pointer; + } +} diff --git a/src/scss/cdb-components/steps/header.scss b/src/scss/cdb-components/steps/header.scss new file mode 100644 index 0000000..4b881ac --- /dev/null +++ b/src/scss/cdb-components/steps/header.scss @@ -0,0 +1,40 @@ +// Step header styles +// ---------------------------------------------- + +/* SG +# Steps/Header + +``` +
+
1
+

Aggregation

+
+``` +*/ + +@import '../../cdb-utilities/mixins'; +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; + +.CDB-StepHeader { + width: 300px; +} + +.CDB-StepHeader-numeration { + @include inline-block(); + width: $baseSize * 3; + height: $baseSize * 3; + color: $cTypo3; + margin-right: 1px; + background-color: $cWhite; + border: 1px solid $cMainLine; + border-radius: 4px; + font-size: $sFontSize-small; + text-align: center; + line-height: $baseSize * 3; +} + +.CDB-StepHeader-title { + @include inline-block(); + color: $cMainDark; +} \ No newline at end of file diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index cee8ce7..b954334 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -21,6 +21,9 @@ .u-rSpace--xl { margin-right: 12px; } +.u-bSpace-xxxl { + margin-bottom: 40px; +} .u-lSpace { margin-left: 4px; } diff --git a/src/scss/cdb-variables/_sizes.scss b/src/scss/cdb-variables/_sizes.scss index b657ab2..69230b1 100644 --- a/src/scss/cdb-variables/_sizes.scss +++ b/src/scss/cdb-variables/_sizes.scss @@ -9,8 +9,8 @@ $mobileLayout: 280px; $baseSize: 8px; // Margins -$sMargin-section: 24px; // To separate main section -$sMargin-element: 14px; // To separate elements inside a group +$sMargin-section: 24px; // To separate main section +$sMargin-element: 14px; // To separate elements inside a group // Font sizes $sFontSize-small: 10px; From d00064ceac841e792cccfcd08eb39eaf0f4a58e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 1 Feb 2016 18:33:16 +0100 Subject: [PATCH 157/391] Input label fixes --- src/scss/cdb-components/forms/checkbox.scss | 4 +--- src/scss/cdb-components/forms/legends.scss | 16 ++++++++++------ src/scss/cdb-components/forms/radio.scss | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/scss/cdb-components/forms/checkbox.scss b/src/scss/cdb-components/forms/checkbox.scss index 0ab4e26..10d285b 100644 --- a/src/scss/cdb-components/forms/checkbox.scss +++ b/src/scss/cdb-components/forms/checkbox.scss @@ -8,17 +8,14 @@
-
-
-
``` */ @@ -31,6 +28,7 @@ height: $baseSize * 2; opacity: 0; position: absolute; + vertical-align: middle; z-index: 1; ~ .CDB-CheckboxFace { diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index f90372b..078dbb5 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -8,12 +8,12 @@
- +
- +

@@ -23,12 +23,12 @@
- +

@@ -42,14 +42,14 @@
- +
    • @@ -69,3 +69,7 @@ .CDB-Legend { width: $baseSize * 12; } + +.CDB-Label { + vertical-align: middle; +} diff --git a/src/scss/cdb-components/forms/radio.scss b/src/scss/cdb-components/forms/radio.scss index f989222..5473b53 100644 --- a/src/scss/cdb-components/forms/radio.scss +++ b/src/scss/cdb-components/forms/radio.scss @@ -29,6 +29,7 @@ height: $baseSize * 2; opacity: 0; position: absolute; + vertical-align: middle; z-index: 1; ~ .CDB-RadioFace { From 86cc3412b8176e53e35918743326da38fd203a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 1 Feb 2016 18:38:02 +0100 Subject: [PATCH 158/391] Minor fix --- src/scss/cdb-components/forms/legends.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index 078dbb5..21fcc72 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -71,5 +71,5 @@ } .CDB-Label { - vertical-align: middle; + vertical-align: middle; } From fe2439a98b0d7dc4259af873a91c0c9d24e86973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 1 Feb 2016 19:14:02 +0100 Subject: [PATCH 159/391] Minor fix --- src/scss/cdb-components/forms/legends.scss | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index 21fcc72..77075d8 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -8,12 +8,12 @@
    - +
    - +

    @@ -23,12 +23,12 @@
    - +

    @@ -42,20 +42,20 @@
    - +
  • + +
    • -

    RADIO

    +

    RADIO

    @@ -69,7 +69,3 @@ .CDB-Legend { width: $baseSize * 12; } - -.CDB-Label { - vertical-align: middle; -} From 11f333651d5b70076a9a530dc1eae1b0715be3bf Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 2 Feb 2016 09:58:47 +0100 Subject: [PATCH 160/391] fix hound --- src/scss/cdb-components/shapes/dataset.scss | 2 +- src/scss/cdb-components/tags.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 64bfb64..494918d 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -100,7 +100,7 @@ Description background: $cWhite; &:first-child { - position: relative; + position: relative; box-shadow: 3px 0 0 $cWhite; z-index: 1; } diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index d564edb..3df5a0b 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -25,7 +25,6 @@ .CDB-Tag { - border: 1px solid red; padding: 0 3px; border-radius: 2px; From ac99ac9c488dd2ea5afee88d6c3f4ff366e7d748 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 2 Feb 2016 10:36:40 +0100 Subject: [PATCH 161/391] fix padding --- src/scss/cdb-components/headers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index e2454b9..02ca1b2 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -179,7 +179,7 @@ .CDB-HeaderInfo-TitleText { @include flex(1); width: 0; - padding-right: 24px; + padding-right: 16px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; From 9504ac53f39efe542bce0a4188963bdfaae35548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 2 Feb 2016 11:47:15 +0100 Subject: [PATCH 162/391] Steps and carousel improvements --- src/scss/cdb-components/carousel.scss | 91 +++++++++++++++++++++ src/scss/cdb-components/step.scss | 64 +++++++++++++++ src/scss/cdb-components/steps/carousel.scss | 89 -------------------- src/scss/cdb-components/steps/header.scss | 40 --------- src/scss/cdb-utilities/helpers.scss | 3 + 5 files changed, 158 insertions(+), 129 deletions(-) create mode 100644 src/scss/cdb-components/carousel.scss create mode 100644 src/scss/cdb-components/step.scss delete mode 100644 src/scss/cdb-components/steps/carousel.scss delete mode 100644 src/scss/cdb-components/steps/header.scss diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss new file mode 100644 index 0000000..338c60a --- /dev/null +++ b/src/scss/cdb-components/carousel.scss @@ -0,0 +1,91 @@ +// Carousel styles +// ---------------------------------------------- + +/* SG +# Carousel + +``` +
      +
    • +
      +
      1
      +

      Aggregation

      +
      + +
      +
      +

      Histogram

      +

      Distribution of a numeric variable in a range

      +
      +
        +
      • +
      • +
      • +
      • +
      • +
      +
      +
      • +
    +``` +*/ + +@import '../cdb-utilities/mixins'; +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-Carousel { + width: 300px; + margin-left: 32px; +} + +.CDB-Carousel-selection-info { + color: $cTypo3; +} + +.CDB-Carousel-cards { + width: 300px; + padding: $sMargin-element 0; + overflow-x: scroll; + overflow-y: hidden; + white-space: nowrap; +} + +.CDB-Carousel-cards::-webkit-scrollbar { + width: 100%; + height: 3px; + cursor: pointer; +} + +.CDB-Carousel-cards::-webkit-scrollbar-thumb { + background-color: $cSecondaryLine; + border-radius: 4px; + height: 3px; + + &:hover { + background-color: $cMainLine; + } +} + +.CDB-Carousel-cards::-webkit-scrollbar-track { + height: 1px; + background-color: $cThirdBackground; + border-top: 1px solid $cWhite; + border-bottom: 1px solid $cWhite; +} + +.CDB-Carousel-card { + @include inline-block(); + width: $baseSize * 11; + height: $baseSize * 7; + background: $cThirdBackground; + border: 1px solid $cSecondaryLine; + border-radius: 4px; + margin-right: 10px; + vertical-align: top; + + &:hover { + border: 1px solid $cMainLine; + cursor: pointer; + } +} diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss new file mode 100644 index 0000000..ffb42cf --- /dev/null +++ b/src/scss/cdb-components/step.scss @@ -0,0 +1,64 @@ +// Step styles +// ---------------------------------------------- + +/* SG +# Step + +``` +
      +
    • +
      +
      1
      +

      Aggregation

      +
      +
      • +
    • +
      +
      2
      +

      Select style

      +
      +
      • +
    • +
      +
      3
      +

      Select template

      +
      +
      • +
    +``` +*/ + +@import '../cdb-utilities/mixins'; +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-Steps { + display: block; +} + +.CDB-Step { + margin-bottom: 40px; +} + +.CDB-Step-header { + width: 300px; +} + +.CDB-Step-header-numeration { + @include inline-block(); + width: $baseSize * 3; + height: $baseSize * 3; + color: $cTypo3; + margin-right: 1px; + background-color: $cWhite; + border: 1px solid $cMainLine; + border-radius: 4px; + font-size: $sFontSize-small; + text-align: center; + line-height: $baseSize * 3; +} + +.CDB-Step-header-title { + @include inline-block(); + color: $cMainDark; +} \ No newline at end of file diff --git a/src/scss/cdb-components/steps/carousel.scss b/src/scss/cdb-components/steps/carousel.scss deleted file mode 100644 index ad31662..0000000 --- a/src/scss/cdb-components/steps/carousel.scss +++ /dev/null @@ -1,89 +0,0 @@ -// Step carousel styles -// ---------------------------------------------- - -/* SG -# Steps/Carousel - -``` -
    -
    -
    1
    -

    Aggregation

    -
    - -
    -
    - None -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -``` -*/ - -@import '../../cdb-utilities/mixins'; -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; - -.CDB-Carousel { - width: 300px; - margin-left: 32px; -} - -.CDB-Carousel-selection { - color: $cTypo3; - text-transform: uppercase; -} - -.CDB-CarouselContainer { - width: 300px; - padding: $sMargin-element 0; - overflow-x: scroll; - overflow-y: hidden; - white-space: nowrap; -} - -.CDB-CarouselContainer::-webkit-scrollbar { - width: 100%; - height: 3px; - cursor: pointer; -} - -.CDB-CarouselContainer::-webkit-scrollbar-thumb { - background-color: $cSecondaryLine; - border-radius: 4px; - height: 3px; - - &:hover { - background-color: $cMainLine; - } -} - -.CDB-CarouselContainer::-webkit-scrollbar-track { - height: 1px; - background-color: $cThirdBackground; - border-top: 1px solid $cWhite; - border-bottom: 1px solid $cWhite; -} - -.CDB-CarouselCard { - @include inline-block(); - width: $baseSize * 11; - height: $baseSize * 7; - background: $cThirdBackground; - border: 1px solid $cSecondaryLine; - border-radius: 4px; - margin-right: 10px; - vertical-align: top; - - &:hover { - border: 1px solid $cMainLine; - cursor: pointer; - } -} diff --git a/src/scss/cdb-components/steps/header.scss b/src/scss/cdb-components/steps/header.scss deleted file mode 100644 index 4b881ac..0000000 --- a/src/scss/cdb-components/steps/header.scss +++ /dev/null @@ -1,40 +0,0 @@ -// Step header styles -// ---------------------------------------------- - -/* SG -# Steps/Header - -``` -
    -
    1
    -

    Aggregation

    -
    -``` -*/ - -@import '../../cdb-utilities/mixins'; -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; - -.CDB-StepHeader { - width: 300px; -} - -.CDB-StepHeader-numeration { - @include inline-block(); - width: $baseSize * 3; - height: $baseSize * 3; - color: $cTypo3; - margin-right: 1px; - background-color: $cWhite; - border: 1px solid $cMainLine; - border-radius: 4px; - font-size: $sFontSize-small; - text-align: center; - line-height: $baseSize * 3; -} - -.CDB-StepHeader-title { - @include inline-block(); - color: $cMainDark; -} \ No newline at end of file diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index b954334..00dca02 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -39,6 +39,9 @@ .u-showMobile { display: none !important; } +.u-uppercase { + text-transform: uppercase; +} @include media-query-mobile() { .u-showDesktop { From 17163ae054d2dfecc4a3e071f0c4c0a6108a7fea Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Tue, 2 Feb 2016 11:53:34 +0100 Subject: [PATCH 163/391] Adds @matallo avatar for a 700% improvement --- src/img/avatar-40x40.png | Bin 4350 -> 6665 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/img/avatar-40x40.png b/src/img/avatar-40x40.png index f002732f920e0311292a11230e224c9ae930b67f..a261d7dedc687ad1f4d98663b4b4233934e392cb 100644 GIT binary patch literal 6665 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 T8tL?S00000NkvXXu0mjfOeCT_ literal 4350 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 Date: Tue, 2 Feb 2016 12:11:08 +0100 Subject: [PATCH 164/391] Checkboxes and radios improvements --- src/scss/cdb-components/forms/checkbox.scss | 133 ++++++++++---------- src/scss/cdb-components/forms/legends.scss | 12 +- src/scss/cdb-components/forms/radio.scss | 119 +++++++++--------- 3 files changed, 125 insertions(+), 139 deletions(-) diff --git a/src/scss/cdb-components/forms/checkbox.scss b/src/scss/cdb-components/forms/checkbox.scss index 10d285b..9354059 100644 --- a/src/scss/cdb-components/forms/checkbox.scss +++ b/src/scss/cdb-components/forms/checkbox.scss @@ -7,15 +7,15 @@ ```
    - +
    - +
    - +
    ``` */ @@ -30,78 +30,71 @@ position: absolute; vertical-align: middle; z-index: 1; +} - ~ .CDB-CheckboxFace { - position: relative; - width: $baseSize * 2; - height: $baseSize * 2; - border: 1px solid $cMainLine; - border-radius: 3px; - background: $cWhite; - cursor: pointer; - box-sizing: border-box; +.CDB-Checkbox-face { + position: relative; + width: $baseSize * 2; + height: $baseSize * 2; + border: 1px solid $cMainLine; + border-radius: 3px; + background: $cWhite; + cursor: pointer; + box-sizing: border-box; - &::before, - &::after { - display: block; - position: absolute; - bottom: 3px; - width: 2px; - border-radius: 1px; - background: $cSecondaryLine; - content: ''; - } - - &::before { - right: $baseSize / 2; - height: $baseSize; - transform: rotate(45deg); - } - - &::after { - left: $baseSize / 2; - height: $baseSize - 2; - transform: rotate(-45deg); - } + &::before, + &::after { + display: block; + position: absolute; + bottom: 3px; + width: 2px; + border-radius: 1px; + background: $cSecondaryLine; + content: ''; } - &:checked { - ~ .CDB-CheckboxFace { - border: 1px solid $cBlue; - background: $cBlue; - } - - ~ .CDB-CheckboxFace::before, - ~ .CDB-CheckboxFace::after { - background: $cWhite; - } - - &:hover ~ .CDB-CheckboxFace { - border: 1px solid $cBlue; - } + &::before { + right: $baseSize / 2; + height: $baseSize; + transform: rotate(45deg); } - &:focus ~ .CDB-CheckboxFace { - border: 1px solid $cBlue; - } - - &:hover ~ .CDB-CheckboxFace { - border: 1px solid $cHoverLine; - } - - &:disabled { - ~ .CDB-CheckboxFace { - border: 1px solid $cSecondaryLine; - background: $cThirdBackground; - } - - ~ .CDB-CheckboxFace::before, - ~ .CDB-CheckboxFace::after { - background: $cWhite; - } - - &:hover ~ .CDB-CheckboxFace { - border: 1px solid $cSecondaryLine; - } + &::after { + left: $baseSize / 2; + height: $baseSize - 2; + transform: rotate(-45deg); } } + +.CDB-Checkbox:checked + .CDB-Checkbox-face { + border: 1px solid $cBlue; + background: $cBlue; + + &::before, + &::after { + background: $cWhite; + } +} + +.CDB-Checkbox:disabled + .CDB-Checkbox-face { + border: 1px solid $cSecondaryLine; + background: $cThirdBackground; + + &::before, + &::after { + background: $cWhite; + } +} + +.CDB-Checkbox:disabled:hover ~ .CDB-Checkbox-face { + border: 1px solid $cSecondaryLine; +} + +.CDB-Checkbox:checked:hover + .CDB-Checkbox-face, +.CDB-Checkbox:focus + .CDB-Checkbox-face { + border: 1px solid $cBlue; +} + +.CDB-Checkbox:hover + .CDB-Checkbox-face { + border: 1px solid $cHoverLine; +} \ No newline at end of file diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index 77075d8..d9c7317 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -7,12 +7,12 @@ ```
    - +
    - +
    @@ -22,12 +22,12 @@
    - +
    @@ -41,14 +41,14 @@
  • - +
    • diff --git a/src/scss/cdb-components/forms/radio.scss b/src/scss/cdb-components/forms/radio.scss index 5473b53..1f369f4 100644 --- a/src/scss/cdb-components/forms/radio.scss +++ b/src/scss/cdb-components/forms/radio.scss @@ -8,15 +8,15 @@ ```
    - +
    - +
    - +
    ``` */ @@ -31,67 +31,60 @@ position: absolute; vertical-align: middle; z-index: 1; +} - ~ .CDB-RadioFace { - position: relative; - width: $baseSize * 2; - height: $baseSize * 2; - border: 1px solid $cMainLine; +.CDB-Radio-face { + position: relative; + width: $baseSize * 2; + height: $baseSize * 2; + border: 1px solid $cMainLine; + border-radius: 50%; + background: $cWhite; + text-indent: 20px; + cursor: pointer; + box-sizing: border-box; + + &::before { + position: absolute; + top: 50%; + left: 50%; + width: $baseSize - 2; + height: $baseSize - 2; + margin-top: -3px; + margin-left: -3px; border-radius: 50%; - background: $cWhite; - text-indent: 20px; - cursor: pointer; - box-sizing: border-box; - - &::before { - position: absolute; - top: 50%; - left: 50%; - width: $baseSize - 2; - height: $baseSize - 2; - margin-top: -3px; - margin-left: -3px; - border-radius: 50%; - background: $cSecondaryLine; - content: ''; - } - } - - &:checked { - ~ .CDB-RadioFace { - border: 1px solid $cBlue; - background: $cBlue; - } - - ~ .CDB-RadioFace::before { - background: $cWhite; - } - - &:hover ~ .CDB-RadioFace { - border: 1px solid $cBlue; - } - } - - &:focus ~ .CDB-RadioFace { - border: 1px solid $cBlue; - } - - &:hover ~ .CDB-RadioFace { - border: 1px solid $cHoverLine; - } - - &:disabled { - ~ .CDB-RadioFace { - border: 1px solid $cSecondaryLine; - background: $cThirdBackground; - } - - ~ .CDB-RadioFace::before { - background: $cWhite; - } - - &:hover ~ .CDB-RadioFace { - border: 1px solid $cSecondaryLine; - } + background: $cSecondaryLine; + content: ''; } } + +.CDB-Radio:checked + .CDB-Radio-face { + border: 1px solid $cBlue; + background: $cBlue; + + &::before { + background: $cWhite; + } +} + +.CDB-Radio:disabled + .CDB-Radio-face { + border: 1px solid $cSecondaryLine; + background: $cThirdBackground; + + &::before { + background: $cWhite; + } +} + +.CDB-Radio:disabled:hover + .CDB-Radio-face { + border: 1px solid $cSecondaryLine; +} + +.CDB-Radio:hover + .CDB-Radio-face { + border: 1px solid $cHoverLine; +} + +.CDB-Radio:focus + .CDB-Radio-face, +.CDB-Radio:checked:hover + .CDB-Radio-face { + border: 1px solid $cBlue; +} \ No newline at end of file From 3dda1f6c639ad4825778ff7e8bf822b703740f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 2 Feb 2016 12:23:00 +0100 Subject: [PATCH 165/391] Syntax fixes --- src/scss/cdb-components/forms/checkbox.scss | 4 ++-- src/scss/cdb-components/forms/radio.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/forms/checkbox.scss b/src/scss/cdb-components/forms/checkbox.scss index 9354059..3e36b24 100644 --- a/src/scss/cdb-components/forms/checkbox.scss +++ b/src/scss/cdb-components/forms/checkbox.scss @@ -24,10 +24,10 @@ @import '../../cdb-variables/colors'; .CDB-Checkbox { + position: absolute; width: $baseSize * 2; height: $baseSize * 2; opacity: 0; - position: absolute; vertical-align: middle; z-index: 1; } @@ -97,4 +97,4 @@ .CDB-Checkbox:hover + .CDB-Checkbox-face { border: 1px solid $cHoverLine; -} \ No newline at end of file +} diff --git a/src/scss/cdb-components/forms/radio.scss b/src/scss/cdb-components/forms/radio.scss index 1f369f4..0c04d3d 100644 --- a/src/scss/cdb-components/forms/radio.scss +++ b/src/scss/cdb-components/forms/radio.scss @@ -25,10 +25,10 @@ @import '../../cdb-variables/colors'; .CDB-Radio { + position: absolute; width: $baseSize * 2; height: $baseSize * 2; opacity: 0; - position: absolute; vertical-align: middle; z-index: 1; } @@ -87,4 +87,4 @@ .CDB-Radio:focus + .CDB-Radio-face, .CDB-Radio:checked:hover + .CDB-Radio-face { border: 1px solid $cBlue; -} \ No newline at end of file +} From beaee4824b4cc0d4dbe0c7d8a5ced7d61b21a444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 2 Feb 2016 17:19:24 +0100 Subject: [PATCH 166/391] Carousel and Step header improvements --- src/scss/cdb-components/carousel.scss | 65 +++++++---------------- src/scss/cdb-components/step.scss | 74 +++++++++++++++------------ src/scss/cdb-utilities/helpers.scss | 16 ++++++ 3 files changed, 77 insertions(+), 78 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 338c60a..c20398e 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -5,24 +5,25 @@ # Carousel ``` -
      -
    • -
      -
      1
      -

      Aggregation

      +
        +
      • +
        +
        1
        + +
        +

        Aggregation

        +

        Histogram

        +

        Distribution of a numeric variable in a range

        +
        -
        -

        Histogram

        -

        Distribution of a numeric variable in a range

        -
        -
          -
        • -
        • -
        • -
        • -
        • +
            +
          • +
          • +
          • +
          • +
        • @@ -39,48 +40,20 @@ margin-left: 32px; } -.CDB-Carousel-selection-info { - color: $cTypo3; -} - -.CDB-Carousel-cards { +.CDB-Carousel-inner { width: 300px; - padding: $sMargin-element 0; overflow-x: scroll; overflow-y: hidden; white-space: nowrap; } -.CDB-Carousel-cards::-webkit-scrollbar { - width: 100%; - height: 3px; - cursor: pointer; -} - -.CDB-Carousel-cards::-webkit-scrollbar-thumb { - background-color: $cSecondaryLine; - border-radius: 4px; - height: 3px; - - &:hover { - background-color: $cMainLine; - } -} - -.CDB-Carousel-cards::-webkit-scrollbar-track { - height: 1px; - background-color: $cThirdBackground; - border-top: 1px solid $cWhite; - border-bottom: 1px solid $cWhite; -} - -.CDB-Carousel-card { +.CDB-Carousel-item { @include inline-block(); width: $baseSize * 11; height: $baseSize * 7; - background: $cThirdBackground; border: 1px solid $cSecondaryLine; border-radius: 4px; + background: $cThirdBackground; margin-right: 10px; vertical-align: top; diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index ffb42cf..84c73e3 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -6,22 +6,35 @@ ```
          -
        • +
        • -
          1
          -

          Aggregation

          +
          1
          + +
          +

          Aggregation

          +

          Heatmap

          +
          • -
        • +
        • -
          2
          -

          Select style

          +
          2
          + +
          +

          Select style

          +

          None

          +
          • -
        • +
        • -
          3
          -

          Select template

          +
          3
          + +
          +

          Type

          +

          Histogram

          +

          Distribution of a numeric variable in a range

          +
        @@ -32,33 +45,30 @@ @import '../cdb-variables/sizes'; @import '../cdb-variables/colors'; -.CDB-Steps { - display: block; -} - -.CDB-Step { +.CDB-Step-item { margin-bottom: 40px; -} - -.CDB-Step-header { width: 300px; } -.CDB-Step-header-numeration { - @include inline-block(); - width: $baseSize * 3; - height: $baseSize * 3; - color: $cTypo3; - margin-right: 1px; - background-color: $cWhite; - border: 1px solid $cMainLine; - border-radius: 4px; - font-size: $sFontSize-small; - text-align: center; - line-height: $baseSize * 3; +.CDB-Step-header { + @include display-flex(); + @include flex-direction(row); + @include align-items(flex-start, flex-start); } -.CDB-Step-header-title { - @include inline-block(); +.CDB-Step-headerNumeration { + width: $baseSize * 3; + height: $baseSize * 3; + margin-right: 1px; + border: 1px solid $cMainLine; + border-radius: 4px; + background-color: $cWhite; + color: $cTypo3; + font-size: $sFontSize-small; + line-height: $baseSize * 3; + text-align: center; +} + +.CDB-Step-headerInfo { color: $cMainDark; -} \ No newline at end of file +} diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 00dca02..ceff847 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -2,7 +2,9 @@ // ---------------------------------------------- @import './mixins'; +@import '../cdb-variables/colors'; +/* Margins */ .u-tSpace { margin-top: 4px; } @@ -21,6 +23,12 @@ .u-rSpace--xl { margin-right: 12px; } +.u-bSpace--m { + margin-bottom: 8px; +} +.u-bSpace--xl { + margin-bottom: 12px; +} .u-bSpace-xxxl { margin-bottom: 40px; } @@ -30,6 +38,8 @@ .u-lSpace--xl { margin-left: 12px; } + +/* Displays */ .u-iBlock { @include inline-block(); } @@ -39,10 +49,16 @@ .u-showMobile { display: none !important; } + +/* Text */ .u-uppercase { text-transform: uppercase; } +.u-color-cTypo3 { + color: $cTypo3; +} +/* Media queries*/ @include media-query-mobile() { .u-showDesktop { display: none !important; From 3363b72bad6ab8f393b8ea63ac9d48e151639bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 2 Feb 2016 19:13:31 +0100 Subject: [PATCH 167/391] Syntax and structure improvements --- src/scss/cdb-components/carousel.scss | 8 ++-- src/scss/cdb-components/step.scss | 51 ++++++++++++++----------- src/scss/cdb-components/typography.scss | 8 ++++ src/scss/cdb-utilities/helpers.scss | 7 ++++ 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index c20398e..9bcbe35 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -11,9 +11,9 @@
        1
        -

        Aggregation

        -

        Histogram

        -

        Distribution of a numeric variable in a range

        +

        Aggregation

        +

        Histogram

        +

        Distribution of a numeric variable in a range

      @@ -51,10 +51,10 @@ @include inline-block(); width: $baseSize * 11; height: $baseSize * 7; + margin-right: 10px; border: 1px solid $cSecondaryLine; border-radius: 4px; background: $cThirdBackground; - margin-right: 10px; vertical-align: top; &:hover { diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index 84c73e3..ac1d7c5 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -5,39 +5,45 @@ # Step ``` -
        -
      • -
        +
          +
        1. +
          1
          -

          Aggregation

          -

          Heatmap

          +

          Aggregation

          +

          Heatmap

          + +
          2. -
        2. -
          +
        3. +
          2
          -

          Select style

          -

          None

          +

          Select style

          +

          None

          + +
          4. -
        4. -
          +
        5. +
          3
          -

          Type

          -

          Histogram

          -

          Distribution of a numeric variable in a range

          +

          Type

          +

          Histogram

          +

          Distribution of a numeric variable in a range

          + +
          6. -
      + ``` */ @@ -45,11 +51,6 @@ @import '../cdb-variables/sizes'; @import '../cdb-variables/colors'; -.CDB-Step-item { - margin-bottom: 40px; - width: 300px; -} - .CDB-Step-header { @include display-flex(); @include flex-direction(row); @@ -59,7 +60,6 @@ .CDB-Step-headerNumeration { width: $baseSize * 3; height: $baseSize * 3; - margin-right: 1px; border: 1px solid $cMainLine; border-radius: 4px; background-color: $cWhite; @@ -70,5 +70,12 @@ } .CDB-Step-headerInfo { - color: $cMainDark; + width: 100%; +} + +.CDB-Step-action { + width: $baseSize * 3; + height: $baseSize * 3; + font-size: 14px; + text-align: center; } diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index d9ec4aa..a1a7e26 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -47,3 +47,11 @@ font-size: $sFontSize-small; line-height: $sLineHeight-small; } + +.CDB-FontSize-small { + font-size: $sFontSize-small; +} + +.CDB-FontSize-medium { + font-size: $sFontSize-medium; +} diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index ceff847..61f9797 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -54,10 +54,17 @@ .u-uppercase { text-transform: uppercase; } +.u-color-cBlue { + color: $cBlue; +} .u-color-cTypo3 { color: $cTypo3; } +.u-color-cMainDark { + color: $cMainDark; +} + /* Media queries*/ @include media-query-mobile() { .u-showDesktop { From ab2ad9bb1e9f67b3a8f2deed6683759abf8e80e6 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 11:10:13 +0100 Subject: [PATCH 168/391] minor fixes --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/forms/checkbox.scss | 2 +- src/scss/cdb-components/forms/inputs.scss | 4 ++-- src/scss/cdb-components/forms/sliders.scss | 6 +++--- src/scss/cdb-components/forms/toggle.scss | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index d9aff25db436abd65a4564b57cf68ec2a86c9fc6..c7d6b4a11f750b2a2824b4ca44489bd5d075ab1e 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAmex5ZK?+OK1tYrSjYhpE!3Vz=Y@ZN4&aGyY-#f=kzHGhp=Q1&kaX E09+pwod5s; delta 55 zcmZ26nQ_Hr#tAme?Mpi*+OK2oE=igAVXAb;()M_Mo39MqjK3Iw;L^F7dtvnE1&kaX E0C|NK`Tzg` diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index f61778a2a48bf4cc6baa0b97b9c434d2d5d69e3f..b7b41f0cd23b092958f3e67a511aca2e4a9024fd 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwhbFFtxbeSrhDt0@b-{va=H{&k`Ah>kBHUma){KDY@0KgLx6aWAK delta 47 wcmew}k@3$&#tDwh-6bg#U8YKRENzeHxB1Gz&G?G}2riwQxfe!n{KDY@0L*I>6951J diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index f8f872e7914b30d6824210f790094499f77353bc..05a413ed14cd228c96264cc8c759bf83d0c4ed3e 100644 GIT binary patch delta 61 zcmV-D0K)&gT)bS6c>|q0y0Lt=CMn6k%;WiOzA|t#{sM|HT)JMH0i)lP|NqVv!T1Nr T{}dWU+j Date: Wed, 3 Feb 2016 16:52:31 +0100 Subject: [PATCH 169/391] add loader and loader box --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/boxes.scss | 135 +++++++++++++++++- src/scss/cdb-components/loader.scss | 90 +++++++++++- .../cdb-components/shapes/check-circle.scss | 22 ++- src/scss/cdb-components/shapes/close.scss | 10 ++ .../cdb-components/shapes/error-circle.scss | 8 +- .../cdb-components/shapes/threePoints.scss | 1 - 9 files changed, 256 insertions(+), 10 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 3c65c524eaf9ec1fa964a007d428f4db8c59f06b..da2d66213c5133dbcf150a189e24b670d97a43ae 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAme+$&Nh+OK1tTdXwk!&K>%72NUsHeVUI8GkVV!KLdnWnlE?1&kaX E0604nUjP6A delta 55 zcmZ26nQ_Hr#tAme`)A}%v|qE~%fZ)>AnD;Px;};GO0PwC95&!@I diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 97c100843805d69e85d6ac43b917bf1766ed9317..7510e2e85c78d27a2d9245ce9856d3a61b0c7ab6 100644 GIT binary patch delta 61 zcmV-D0K)&gT)bS6c>|quBC&k7CMn6?>GAwFUm3U=e*r}pE?u7~1Eb%R|NqVv!T1Nr T|dG$gzC3CMh{J(((K@Um3U=e*r}pE?tdz52N3d|NqVv!T1Nr TVt diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 3c104b4..9c2a789 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -2,7 +2,7 @@ // ---------------------------------------------- /* SG -# Boxes/Box Dropdown +# Boxes/Dropdown ``` @@ -10,6 +10,7 @@ ``` */ +@import '../cdb-utilities/mixins'; @import '../cdb-variables/sizes'; @import '../cdb-variables/colors'; @@ -19,3 +20,135 @@ background: $cWhite; box-shadow: 0 $baseSize $baseSize * 2 0 rgba(0, 0, 0, 0.16); } + + +/* SG +# Boxes/Loader + +``` +
      +
        +
      • +
        +
        +
        +
        +
        +
        +

        Query applied. Showing 2,561 rows, Query applied. Showing 2,561 rows, Query applied. Showing 2,561 rows Query applied. Showing 2,561 rowsQuery applied. Showing 2,561 rows Query applied. Showing 2,561 rows

        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        • +
      +
      +
      +
      +
      +
      +
      +
      +
        +
      • +
        +
        +
        +
        +
        +
        +

        Finished importing populated_places_2

        +
        +
        • +
      • +
        +
        +
        +
        +

        Geocoding populated_places_2 (28%)

        +
        +
        +
        +
        +
        +
        +
        • +
      + +
      +
      +
      +
      +
      +
      +
      +
        +
      • +
        +
        +
        +
        +
        +
        +

        Error in query. Data might be outdated

        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        • +
      +
      +``` +*/ + +.CDB-BoxLoader { + padding: 0 24px; + border-top: 1px solid $cMainLine; +} + + +.CDB-BoxLoader-inner { + padding: 12px 0; + border-top: 1px solid $cMainLine; + &:first-child { + border-top: 0; + } +} + +.CDB-BoxLoader-item { + @include display-flex(); + padding: 8px 0; + color: $cTypo2; + &.is-working { + color: $cTypo3; + } +} + +.CDB-BoxLoader-info { + @include flex(1); + padding-right: 16px; +} + diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index e812aff..76ce89b 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -2,7 +2,7 @@ // ---------------------------------------------- /* SG -# Loader +# Loader/principal This is the generic loader for widgets, maps, components, ... There is only one state 'is-visible', in order to make it visible. @@ -13,6 +13,8 @@ There is only one state 'is-visible', in order to make it visible. */ @import '../cdb-utilities/mixins'; +@import '../cdb-variables/colors'; +@import '../cdb-variables/sizes'; .CDB-Loader { @include css3-prefix(animation, loader-progress 1000ms linear 1); @@ -39,3 +41,89 @@ There is only one state 'is-visible', in order to make it visible. width: 100%; } } + +/* SG +# Loader/circle + +``` +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      +``` +*/ + +.CDB-LoaderIcon { + box-sizing: border-box; + position: relative; + width: $baseSize * 2; + height: $baseSize * 2; + border: 2px solid #D8D8D8; + border-radius: 50%; + &.is-white { + border: 2px solid #636D72; + } +} + +.CDB-LoaderIcon-item { + @include css3-prefix(animation, loader-icon 1.4s linear infinite); + position: absolute; + top: -2px; + left: -2px; + width: $baseSize * 2; + height: $baseSize * 2; + border-radius: 50%; + background: linear-gradient(to right, #FFF 10%, rgba(255, 255, 255, 0) 42%); + + &::before, + &::after { + position: absolute; + top: 0; + left: 0; + content: ''; + } + + &::before { + width: 50%; + height: 50%; + border-radius: 100% 0 0; + background: #D8D8D8; + } + &::after { + right: 0; + bottom: 0; + width: 75%; + height: 75%; + margin: auto; + border-radius: 50%; + background: #FFF; + } + &.is-white { + background: linear-gradient(to right, #2E3C43 10%, rgba(255, 255, 255, 0) 42%); + &::before { + background: #636D72; + } + &::after { + background: #2E3C43; + } + } +} + + +@include keyframes(loader-icon) { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + + diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index c8bb269..f63cb76 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -100,25 +100,25 @@ Description &.is-medium { &::before { - top: 6px; + top: 5px; left: 4px; height: 4px; } &::after { - top: 4px; + top: 3px; right: 5px; - height: 7px; + height: 6px; } } &.is-small { &::before { - top: 5px; - left: 3px; + top: 4px; + left: 2px; height: 3px; } &::after { - top: 3px; + top: 2px; right: 3px; height: 5px; } @@ -143,4 +143,14 @@ Description } } +.CDB-Shape-tick.is-green { + &::before { + background: $cHighlight; + } + &::after { + background: $cHighlight; + } +} + + diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index cbb8591..40b26f6 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -137,3 +137,13 @@ Description background: $cWhite; } } + +.CDB-Shape-close.is-red { + &::before { + background: $cError; + } + &::after { + background: $cError; + } +} + diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index 5a77161..60af946 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -66,12 +66,18 @@ Description &.is-small { width: 9px; height: 9px; - margin: 2px auto; + margin: 0 auto; } &.is-blue { border: 1px solid $cBlue; } &.is-white { border: 1px solid $cWhite; + } + &.is-green { + border: 1px solid $cHighlight; + } + &.is-red { + border: 1px solid $cError; } } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 36bb47c..6bb14b9 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -104,4 +104,3 @@ Description background: $cWhite; } } - From cd027cebd201d6de3494e83bedde0737164ed180 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 16:59:08 +0100 Subject: [PATCH 170/391] fix vars --- src/scss/cdb-components/boxes.scss | 8 ++++---- src/scss/cdb-components/loader.scss | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 9c2a789..bde0f04 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -125,13 +125,13 @@ */ .CDB-BoxLoader { - padding: 0 24px; + padding: 0 $baseSize * 3; border-top: 1px solid $cMainLine; } .CDB-BoxLoader-inner { - padding: 12px 0; + padding: $baseSize + 4 0; border-top: 1px solid $cMainLine; &:first-child { border-top: 0; @@ -140,7 +140,7 @@ .CDB-BoxLoader-item { @include display-flex(); - padding: 8px 0; + padding: $baseSize 0; color: $cTypo2; &.is-working { color: $cTypo3; @@ -149,6 +149,6 @@ .CDB-BoxLoader-info { @include flex(1); - padding-right: 16px; + padding-right: $baseSize * 2; } diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index 76ce89b..42be505 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -53,8 +53,8 @@ There is only one state 'is-visible', in order to make it visible.
      -
      -
      +
      +
      ``` @@ -65,10 +65,10 @@ There is only one state 'is-visible', in order to make it visible. position: relative; width: $baseSize * 2; height: $baseSize * 2; - border: 2px solid #D8D8D8; + border: 2px solid $cMainLine; border-radius: 50%; - &.is-white { - border: 2px solid #636D72; + &.is-grey { + border: 2px solid $cTypo2; } } @@ -80,7 +80,7 @@ There is only one state 'is-visible', in order to make it visible. width: $baseSize * 2; height: $baseSize * 2; border-radius: 50%; - background: linear-gradient(to right, #FFF 10%, rgba(255, 255, 255, 0) 42%); + background: linear-gradient(to right, $cWhite 10%, rgba($cWhite, 0) 42%); &::before, &::after { @@ -94,7 +94,7 @@ There is only one state 'is-visible', in order to make it visible. width: 50%; height: 50%; border-radius: 100% 0 0; - background: #D8D8D8; + background: $cMainLine; } &::after { right: 0; @@ -103,15 +103,15 @@ There is only one state 'is-visible', in order to make it visible. height: 75%; margin: auto; border-radius: 50%; - background: #FFF; + background: $cWhite; } - &.is-white { - background: linear-gradient(to right, #2E3C43 10%, rgba(255, 255, 255, 0) 42%); + &.is-grey { + background: linear-gradient(to right, $cMainDark 10%, rgba($cWhite, 0) 42%); &::before { - background: #636D72; + background: $cTypo2; } &::after { - background: #2E3C43; + background: $cMainDark; } } } From caaa6bf3453ab4d57f1ace559278d5f00c2b347b Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 17:07:20 +0100 Subject: [PATCH 171/391] fix hound --- src/scss/cdb-components/loader.scss | 2 +- src/scss/cdb-components/shapes/error-circle.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index 42be505..4a06e0f 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -66,7 +66,7 @@ There is only one state 'is-visible', in order to make it visible. width: $baseSize * 2; height: $baseSize * 2; border: 2px solid $cMainLine; - border-radius: 50%; + border-radius: 50%; &.is-grey { border: 2px solid $cTypo2; } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index 60af946..eebeb92 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -73,7 +73,7 @@ Description } &.is-white { border: 1px solid $cWhite; - } + } &.is-green { border: 1px solid $cHighlight; } From 0c08695652ea818c130b23eb9cdebf4b4123eab9 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 19:19:42 +0100 Subject: [PATCH 172/391] add first infoBoxes --- src/scss/cdb-components/boxes.scss | 61 ++++++++++++++++++++++++++++ src/scss/cdb-components/buttons.scss | 1 - src/scss/cdb-utilities/helpers.scss | 3 ++ src/scss/cdb-variables/_colors.scss | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 3c104b4..8a60bec 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -10,6 +10,7 @@ ``` */ +@import '../cdb-utilities/mixins'; @import '../cdb-variables/sizes'; @import '../cdb-variables/colors'; @@ -19,3 +20,63 @@ background: $cWhite; box-shadow: 0 $baseSize $baseSize * 2 0 rgba(0, 0, 0, 0.16); } + +/* SG +# Boxes/Info Boxes + + +``` +
      +

      ABOUT PREVIEW MODE

      +

      He's a queer man, Captain Ahab—so some thinkbut a good one. Oh, thou'lt like him well enough; no fear, no fear

      +
        +
      • +

        CLOSE

        +
        • +
      • + +
        • +
      +
      +
      +
      +
      +
      +

      ABOUT PREVIEW MODE

      +

      He's a queer man, Captain Ahab—so some thinkbut a good one. Oh, thou'lt like him well enough; no fear, no fear

      +
        +
      • +

        CLOSE

        +
        • +
      • + +
        • +
      +
      +``` +*/ + +.CDB-InfoBox { + padding: 12px 16px; + border-radius: 4px; + background: $cThirdBackground; + &.is-alert { + background: rgba($cHighlightYellow, 0.60); + } +} + +.CDB-InfoBox-footer { + @include display-flex(); + @include align-items(center); +} + +.CDB-InfoBox-footerItem { + @include flex(1); + &.is-right { + text-align: right; + } +} diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index adb1478..0ecc069 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -146,7 +146,6 @@ Layout Component: .CDB-Button--secondary { border: 1px solid $cBlue; - background: $cWhite; color: $cBlue; &:hover { diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index cee8ce7..13b03a0 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -27,6 +27,9 @@ .u-lSpace--xl { margin-left: 12px; } +.u-bSpace--m { + margin-bottom: 8px; +} .u-iBlock { @include inline-block(); } diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index 7c7ff2d..fc0bc81 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -29,3 +29,4 @@ $cPublic: #9BC63B; $cLink: #FEB100; $cPassword: #FB7B23; $cError: #F15743; +$cHighlightYellow: #FFFFC0; From 5c5f41de31ddceda43c51e38dd18fa56226a814b Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 22:49:13 +0100 Subject: [PATCH 173/391] change modify --- src/scss/cdb-components/boxes.scss | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 8a60bec..4211c1d 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -29,16 +29,7 @@

      ABOUT PREVIEW MODE

      He's a queer man, Captain Ahab—so some thinkbut a good one. Oh, thou'lt like him well enough; no fear, no fear

      -
        -
      • -

        CLOSE

        -
        • -
      • - -
        • -
      +

      CLOSE



      @@ -50,7 +41,7 @@

    • CLOSE

      • -
    • +
    • @@ -76,7 +67,8 @@ .CDB-InfoBox-footerItem { @include flex(1); - &.is-right { - text-align: right; - } +} + +.CDB-InfoBox-footerItem--right { + text-align: right; } From 1545b89d68e6d56a9d92235418abb78497e2f9c5 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 22:56:37 +0100 Subject: [PATCH 174/391] fix bad merge --- src/scss/cdb-utilities/helpers.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 73e391a..1cb8a7b 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -30,11 +30,6 @@ .u-lSpace--xl { margin-left: 12px; } -<<<<<<< HEAD -.u-bSpace--m { - margin-bottom: 8px; -} -======= .u-bSpace { margin-bottom: 4px; } @@ -42,7 +37,6 @@ margin-bottom: 8px; } ->>>>>>> ece198db8f1ecfae1a76ecaf706f2afebec3e0d9 .u-iBlock { @include inline-block(); } From cc648bb24262b99681f0dfaadaf5b038243d0712 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Thu, 4 Feb 2016 09:56:03 +0100 Subject: [PATCH 175/391] fix hound --- src/scss/cdb-components/boxes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 4211c1d..77f6653 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -56,7 +56,7 @@ border-radius: 4px; background: $cThirdBackground; &.is-alert { - background: rgba($cHighlightYellow, 0.60); + background: rgba($cHighlightYellow, 0.6); } } From cf70003e563f2e23a593e6c39a46f1ef45681f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 11:12:40 +0100 Subject: [PATCH 176/391] Carousel & step components improvements --- src/scss/cdb-components/carousel.scss | 11 ++--------- src/scss/cdb-components/step.scss | 1 + 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 9bcbe35..fc4798d 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -18,7 +18,7 @@
      -
        +
        • @@ -36,17 +36,10 @@ @import '../cdb-variables/colors'; .CDB-Carousel { - width: 300px; + width: 100%; margin-left: 32px; } -.CDB-Carousel-inner { - width: 300px; - overflow-x: scroll; - overflow-y: hidden; - white-space: nowrap; -} - .CDB-Carousel-item { @include inline-block(); width: $baseSize * 11; diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index ac1d7c5..8e375dc 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -78,4 +78,5 @@ height: $baseSize * 3; font-size: 14px; text-align: center; + cursor: pointer; } From 7ecb73c3fa832e49967617e7edf5b7ccd46d918f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 11:14:42 +0100 Subject: [PATCH 177/391] Steps list markup minor fix --- src/scss/cdb-components/carousel.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index fc4798d..99dfe75 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -5,7 +5,7 @@ # Carousel ``` -
            +
            1. 1
              @@ -27,7 +27,7 @@
      • -
    + ``` */ From e1a767eea116338ecb6833011b15697f987ab52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 11:34:54 +0100 Subject: [PATCH 178/391] Slider border issue in Chrome fix --- src/scss/cdb-components/forms/sliders.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/forms/sliders.scss b/src/scss/cdb-components/forms/sliders.scss index 44ef2dc..a647cf3 100644 --- a/src/scss/cdb-components/forms/sliders.scss +++ b/src/scss/cdb-components/forms/sliders.scss @@ -18,7 +18,7 @@ position: relative; width: 100%; margin: -4px 0 0; - padding: 0; + padding: 0 6px; background: transparent; cursor: pointer; overflow: hidden; From 564e8d46a40ab9fc4bc730cc1bf2a33535b3c6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 12:21:33 +0100 Subject: [PATCH 179/391] Added shapes to step --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/step.scss | 12 +++++++++--- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 3c65c524eaf9ec1fa964a007d428f4db8c59f06b..01650deea1b1d7fe881627da6fa0a256b1dd1372 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAme;$HC+?bk6cP?DMWVXAbzmv}tC%~u9)#$OCTaOuW}nJ{|u0!9uG E03%Km2LJ#7 delta 55 zcmZ26nQ_Hr#tAme`)A}%v|qE~%fZ)>AnD;Px;};GO0PwC95&!@I diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 97c100843805d69e85d6ac43b917bf1766ed9317..1d8fe347a83c47eaf8c7628018099d151e6018f3 100644 GIT binary patch delta 61 zcmV-D0K)&gT)bS6c>|y#9I<@1CMj{c#qs<$Um3U=e*r}pF5UPr6Gp!&|NosUg7FWK T%fY||5(NOC(GR<`TPNWLVD1}_ delta 61 zcmV-D0K)&gT)bS6c>|dG$gzC3CMh{J(((K@Um3U=e*r}pE?tdz52N3d|NqVv!T1Nr TVt diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index 8e375dc..b98f120 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -15,7 +15,9 @@

    Heatmap

    - +
    +
    +
  • @@ -27,7 +29,9 @@

    None

    - +
    +
    +
  • @@ -40,7 +44,9 @@

    Distribution of a numeric variable in a range

    - +
    +
    +
    • From 0d571acf3f95e398ae80666f90f0261fa87b325c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 12:44:58 +0100 Subject: [PATCH 180/391] Fixed toggle arrows shape relative size and naming --- .../cdb-components/shapes/toogle-arrow.scss | 40 ++++++++++--------- src/scss/cdb-components/step.scss | 6 +-- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index 86f302a..df2911a 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -1,5 +1,5 @@ /* SG -# Shapes/Toogle Arrows +# Shapes/Toggle Arrows Description @@ -7,17 +7,17 @@ Description

    16px

    -
    +
    -
    +
    -
    +

    @@ -27,17 +27,17 @@ Description

    12px

    -
    +
    -
    +
    -
    +

    @@ -47,17 +47,17 @@ Description

    16px

    -
    +
    -
    +
    -
    +

    @@ -67,25 +67,26 @@ Description

    12px

    -
    +
    -
    +
    -
    +
    ``` */ @import '../../cdb-variables/colors'; +@import '../../cdb-variables/sizes'; -.CDB-ArrowToogle { +.CDB-ArrowToggle { position: relative; height: 100%; @@ -113,11 +114,14 @@ Description } } -.CDB-ArrowToogle.is-down { +.CDB-ArrowToggle.is-down { transform: rotate(180deg); } -.CDB-ArrowToogle.is-small { +.CDB-ArrowToggle.is-small { + width: $baseSize * 2; + height: $baseSize * 2; + &::before { left: 2px; width: 8px; @@ -128,7 +132,7 @@ Description } } -.CDB-ArrowToogle.is-blue { +.CDB-ArrowToggle.is-blue { &::before { background: $cBlue; } @@ -137,7 +141,7 @@ Description } } -.CDB-ArrowToogle.is-white { +.CDB-ArrowToggle.is-white { &::before { background: $cWhite; } diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index b98f120..460edc7 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -16,7 +16,7 @@
    -
    +
    @@ -30,7 +30,7 @@
    -
    +
    @@ -45,7 +45,7 @@
    -
    +
    From 47bddc8f82be69615f6aba755503f085015a78fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 15:24:16 +0100 Subject: [PATCH 181/391] Textarea component --- src/scss/cdb-components/forms/textarea.scss | 43 +++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/scss/cdb-components/forms/textarea.scss diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss new file mode 100644 index 0000000..1f5b134 --- /dev/null +++ b/src/scss/cdb-components/forms/textarea.scss @@ -0,0 +1,43 @@ +// Textarea styles +// ---------------------------------------------- + +/* SG +# Forms/Textareas + +``` + + + +``` +*/ + +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; +@import '../../cdb-utilities/mixins'; + +.CDB-InputTextarea { + width: 100%; + padding: 7px 8px 6px; + border: 1px solid $cMainLine; + border-radius: $baseSize / 2; + font-size: $sFontSize-medium; + line-height: $sLineHeight-medium; + + &:hover { + border: 1px solid $cHoverLine; + } + &:focus { + border: 1px solid $cBlue; + outline-color: transparent; + outline-style: none; + } + &:disabled { + border-color: $cSecondaryLine; + background: $cThirdBackground; + } + &.has-error { + border: 1px solid rgba($cError, 0.48); + background: rgba($cError, 0.04); + color: $cError; + } +} From 6a7171a3e54d7a1d922d3af527c1794ace2b40dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 15:26:19 +0100 Subject: [PATCH 182/391] Textarea naming fix --- src/scss/cdb-components/forms/textarea.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss index 1f5b134..a095a37 100644 --- a/src/scss/cdb-components/forms/textarea.scss +++ b/src/scss/cdb-components/forms/textarea.scss @@ -5,9 +5,9 @@ # Forms/Textareas ``` - - - + + + ``` */ @@ -15,7 +15,7 @@ @import '../../cdb-variables/colors'; @import '../../cdb-utilities/mixins'; -.CDB-InputTextarea { +.CDB-Textarea { width: 100%; padding: 7px 8px 6px; border: 1px solid $cMainLine; From 4979ba0e8f6039f09b8d716f9c2470912916d543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 4 Feb 2016 16:26:54 +0100 Subject: [PATCH 183/391] Color input component --- .../cdb-components/forms/color_input.scss | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/scss/cdb-components/forms/color_input.scss diff --git a/src/scss/cdb-components/forms/color_input.scss b/src/scss/cdb-components/forms/color_input.scss new file mode 100644 index 0000000..2f74051 --- /dev/null +++ b/src/scss/cdb-components/forms/color_input.scss @@ -0,0 +1,48 @@ +// Color input styles +// ---------------------------------------------- + +/* SG +# Forms/Color input + +``` +
    +

    COLOR

    +
    +
    + +
    +
    +
    + ``` +*/ + +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; +@import '../../cdb-utilities/mixins'; + +.CDB-ColorInput { + @include display-flex(); + @include align-items(center); + width: $baseSize * 20; + height: $baseSize * 4; + padding: $baseSize; + border: 1px solid $cMainLine; + border-radius: $baseSize / 2; + box-sizing: border-box; + cursor: pointer; + + &:hover { + border: 1px solid $cHoverLine; + } + &:focus { + border: 1px solid $cBlue; + } +} + +.CDB-ColorInput-colorBar { + @include inline-block(); + width: 100%; + height: $baseSize / 2; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: $baseSize; +} From 2d404429eff5a2d8496d3a51a6c6e1ef1872d50e Mon Sep 17 00:00:00 2001 From: saleiva Date: Thu, 4 Feb 2016 18:39:23 +0100 Subject: [PATCH 184/391] Changing Threepoints usage markup to Button instead of div. --- .../cdb-components/shapes/threePoints.scss | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 36bb47c..a2e2c41 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -7,29 +7,29 @@ Description

    16px

    -
    +
    +
    -
    +
    +
    -
    +
    +

    @@ -39,29 +39,29 @@ Description

    12px

    -
    +
    +
    -
    +
    +
    -
    +
    +
    ``` @@ -104,4 +104,3 @@ Description background: $cWhite; } } - From b82bd5dbad06725c5a1ae6ba5047ded51680f1d7 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Thu, 4 Feb 2016 19:57:38 +0100 Subject: [PATCH 185/391] fix hound --- src/scss/cdb-components/boxes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 4395c8b..948afe5 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -201,4 +201,4 @@ .CDB-InfoBox-footerItem--right { text-align: right; -} \ No newline at end of file +} From b0166e9cadc0306c9cf06fe9bf10021db5dddd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 5 Feb 2016 10:42:47 +0100 Subject: [PATCH 186/391] Several improvements, reduced PR to just carousel component --- src/scss/cdb-components/carousel.scss | 52 +++++------ .../cdb-components/shapes/toogle-arrow.scss | 36 ++++---- src/scss/cdb-components/step.scss | 88 ------------------- src/scss/cdb-utilities/helpers.scss | 18 ---- src/scss/cdb-variables/_sizes.scss | 4 +- 5 files changed, 47 insertions(+), 151 deletions(-) delete mode 100644 src/scss/cdb-components/step.scss diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 99dfe75..651c82d 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -5,29 +5,15 @@ # Carousel ``` -
      -
    1. -
      -
      1
      - -
      -

      Aggregation

      -

      Histogram

      -

      Distribution of a numeric variable in a range

      -
      -
      - -
      -
        -
      • -
      • -
      • -
      • -
      • -
      -
      -
      2. -
    +
    +
      +
    • +
    • +
    • +
    • +
    • +
    +
    ``` */ @@ -37,21 +23,37 @@ .CDB-Carousel { width: 100%; - margin-left: 32px; + font-size: 0; } .CDB-Carousel-item { @include inline-block(); width: $baseSize * 11; height: $baseSize * 7; - margin-right: 10px; border: 1px solid $cSecondaryLine; border-radius: 4px; background: $cThirdBackground; vertical-align: top; + box-sizing: border-box; + + &:not(:last-child) { + margin-right: 8px; + } &:hover { border: 1px solid $cMainLine; cursor: pointer; } + + &.is-selected { + border: 2px solid $cBlue; + } +} + +.CDB-Carousel-headerDetails { + color: $cTypo3; + + &.is-uppercase { + text-transform: uppercase; + } } diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index df2911a..b0c22cd 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -1,5 +1,5 @@ /* SG -# Shapes/Toggle Arrows +# Shapes/Toogle Arrows Description @@ -7,17 +7,17 @@ Description

    16px

    -
    +
    -
    +
    -
    +

    @@ -27,17 +27,17 @@ Description

    12px

    -
    +
    -
    +
    -
    +

    @@ -47,17 +47,17 @@ Description

    16px

    -
    +
    -
    +
    -
    +

    @@ -67,17 +67,17 @@ Description

    12px

    -
    +
    -
    +
    -
    +
    ``` @@ -86,7 +86,7 @@ Description @import '../../cdb-variables/colors'; @import '../../cdb-variables/sizes'; -.CDB-ArrowToggle { +.CDB-ArrowToogle { position: relative; height: 100%; @@ -114,11 +114,11 @@ Description } } -.CDB-ArrowToggle.is-down { +.CDB-ArrowToogle.is-down { transform: rotate(180deg); } -.CDB-ArrowToggle.is-small { +.CDB-ArrowToogle.is-small { width: $baseSize * 2; height: $baseSize * 2; @@ -132,7 +132,7 @@ Description } } -.CDB-ArrowToggle.is-blue { +.CDB-ArrowToogle.is-blue { &::before { background: $cBlue; } @@ -141,7 +141,7 @@ Description } } -.CDB-ArrowToggle.is-white { +.CDB-ArrowToogle.is-white { &::before { background: $cWhite; } diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss deleted file mode 100644 index 460edc7..0000000 --- a/src/scss/cdb-components/step.scss +++ /dev/null @@ -1,88 +0,0 @@ -// Step styles -// ---------------------------------------------- - -/* SG -# Step - -``` -
      -
    1. -
      -
      1
      - -
      -

      Aggregation

      -

      Heatmap

      -
      - -
      -
      -
      -
      -
      2. -
    2. -
      -
      2
      - -
      -

      Select style

      -

      None

      -
      - -
      -
      -
      -
      -
      3. -
    3. -
      -
      3
      - -
      -

      Type

      -

      Histogram

      -

      Distribution of a numeric variable in a range

      -
      - -
      -
      -
      -
      -
      4. -
    -``` -*/ - -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - -.CDB-Step-header { - @include display-flex(); - @include flex-direction(row); - @include align-items(flex-start, flex-start); -} - -.CDB-Step-headerNumeration { - width: $baseSize * 3; - height: $baseSize * 3; - border: 1px solid $cMainLine; - border-radius: 4px; - background-color: $cWhite; - color: $cTypo3; - font-size: $sFontSize-small; - line-height: $baseSize * 3; - text-align: center; -} - -.CDB-Step-headerInfo { - width: 100%; -} - -.CDB-Step-action { - width: $baseSize * 3; - height: $baseSize * 3; - font-size: 14px; - text-align: center; - cursor: pointer; -} diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index c5895d8..062c420 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -35,9 +35,6 @@ .u-bSpace--xl { margin-bottom: 12px; } -.u-bSpace-xxxl { - margin-bottom: 40px; -} .u-lSpace { margin-left: 4px; } @@ -56,21 +53,6 @@ display: none !important; } -/* Text */ -.u-uppercase { - text-transform: uppercase; -} -.u-color-cBlue { - color: $cBlue; -} -.u-color-cTypo3 { - color: $cTypo3; -} - -.u-color-cMainDark { - color: $cMainDark; -} - /* Media queries*/ @include media-query-mobile() { .u-showDesktop { diff --git a/src/scss/cdb-variables/_sizes.scss b/src/scss/cdb-variables/_sizes.scss index 69230b1..b657ab2 100644 --- a/src/scss/cdb-variables/_sizes.scss +++ b/src/scss/cdb-variables/_sizes.scss @@ -9,8 +9,8 @@ $mobileLayout: 280px; $baseSize: 8px; // Margins -$sMargin-section: 24px; // To separate main section -$sMargin-element: 14px; // To separate elements inside a group +$sMargin-section: 24px; // To separate main section +$sMargin-element: 14px; // To separate elements inside a group // Font sizes $sFontSize-small: 10px; From 547f68db963f3241b78988fe26618043ca00a3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 5 Feb 2016 10:57:11 +0100 Subject: [PATCH 187/391] Step component --- src/scss/cdb-components/step.scss | 72 +++++++++++++++++++++++++ src/scss/cdb-components/typography.scss | 8 +++ 2 files changed, 80 insertions(+) create mode 100644 src/scss/cdb-components/step.scss diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss new file mode 100644 index 0000000..be490c5 --- /dev/null +++ b/src/scss/cdb-components/step.scss @@ -0,0 +1,72 @@ +// Step styles +// ---------------------------------------------- + +/* SG +# Step + +``` +
      +
    1. +
      +
      1
      + +
      +

      Type

      +

      Histogram

      +

      Distribution of a numeric variable in a range

      +
      + +
      +
      +
      +
      +
      2. +
    +``` +*/ + +@import '../cdb-utilities/mixins'; +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-Step-header { + @include display-flex(); + @include flex-direction(row); + @include align-items(flex-start, flex-start); +} + +.CDB-Step-headerNumeration { + width: $baseSize * 3; + height: $baseSize * 3; + border: 1px solid $cMainLine; + border-radius: 4px; + background-color: $cWhite; + color: $cTypo3; + font-size: $sFontSize-small; + line-height: $baseSize * 3; + text-align: center; +} + +.CDB-Step-headerInfo { + width: 100%; +} + +.CDB-Step-headerTitle { + color: $cMainDark; +} + +.CDB-Step-headerDetails { + color: $cTypo3; + + &.is-uppercase { + text-transform: uppercase; + } +} + +.CDB-Step-action { + width: $baseSize * 3; + height: $baseSize * 3; + font-size: 14px; + text-align: center; + cursor: pointer; +} diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index b02624d..a9b844b 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -48,3 +48,11 @@ font-size: $sFontSize-small; line-height: $sLineHeight-small; } + +.CDB-FontSize-small { + font-size: $sFontSize-small; +} + +.CDB-FontSize-medium { + font-size: $sFontSize-medium; +} From 93dde16d987c7e654721014b490db6d385bb9f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 5 Feb 2016 10:57:50 +0100 Subject: [PATCH 188/391] Minor fix --- src/scss/cdb-components/typography.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index a9b844b..b02624d 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -48,11 +48,3 @@ font-size: $sFontSize-small; line-height: $sLineHeight-small; } - -.CDB-FontSize-small { - font-size: $sFontSize-small; -} - -.CDB-FontSize-medium { - font-size: $sFontSize-medium; -} From 927584918e0641b9f5cf5c630ea93f024bfeea96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 5 Feb 2016 11:12:55 +0100 Subject: [PATCH 189/391] Minor fix --- src/scss/cdb-components/shapes/toogle-arrow.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index b0c22cd..9df580f 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -119,9 +119,6 @@ Description } .CDB-ArrowToogle.is-small { - width: $baseSize * 2; - height: $baseSize * 2; - &::before { left: 2px; width: 8px; From 610ef9b3fecb4f3ed3ea0ede64199f62a4bda3dd Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 5 Feb 2016 16:10:41 +0100 Subject: [PATCH 190/391] fix assets --- .../cdb-components/shapes/threePoints.scss | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index a2e2c41..48038e3 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -6,31 +6,31 @@ Description ```

    16px

    -
    - -
    +
    +
    -
    - -
    +
    +
    -
    - -
    +
    +

    @@ -38,31 +38,31 @@ Description

    12px

    -
    - -
    +
    +
    -
    - -
    +
    +
    -
    - -
    +
    + ``` */ From 515112a35a1ac0bd340f02c4467b3debd5d2adbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20=C3=81lvarez=20Medina?= Date: Fri, 5 Feb 2016 16:24:31 +0100 Subject: [PATCH 191/391] Added gulp instructions for installation --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cefbc3e..95fb4ff 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ ### Installation As easy as: -- ```npm install``` +- ```npm install --global gulp-cli``` [Gulp installation](https://github.com/gulpjs/gulp) - ```npm install -g markdown-styleguide-generator``` [StyleGenerator installation](https://www.npmjs.com/package/markdown-styleguide-generator#install) +- ```npm install``` ### Build If you want to use any of the CartoAssets components, after the installation just run: From 071c568baeaf0057e63681c28f2f408f5cf49f5f Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 5 Feb 2016 16:43:17 +0100 Subject: [PATCH 192/391] Closes #57 --- src/scss/cdb-utilities/fonts.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scss/cdb-utilities/fonts.scss b/src/scss/cdb-utilities/fonts.scss index 7684a09..b36e4b9 100644 --- a/src/scss/cdb-utilities/fonts.scss +++ b/src/scss/cdb-utilities/fonts.scss @@ -6,20 +6,20 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), - url('themes.googleusercontent.com/static/fonts/opensans/v8/DXI1ORHCpsQm3Vp6mXoaTeY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); + src: local('Open Sans Light'), local('OpenSans-Light'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), + url('//themes.googleusercontent.com/static/fonts/opensans/v8/DXI1ORHCpsQm3Vp6mXoaTeY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; src: local('Open Sans'), local('OpenSans'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), - url('themes.googleusercontent.com/static/fonts/opensans/v8/u-WUoqrET9fUeobQW7jkRbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); + url('//themes.googleusercontent.com/static/fonts/opensans/v8/u-WUoqrET9fUeobQW7jkRbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), - url('themes.googleusercontent.com/static/fonts/opensans/v8/MTP_ySUJH_bn48VBG8sNSuY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), + url('//themes.googleusercontent.com/static/fonts/opensans/v8/MTP_ySUJH_bn48VBG8sNSuY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); } From 5151d8c604f7473cca2944ba49bebe0b40a480ea Mon Sep 17 00:00:00 2001 From: saleiva Date: Fri, 5 Feb 2016 16:43:50 +0100 Subject: [PATCH 193/391] Adding is-upper class to typography --- src/scss/cdb-components/typography.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index b02624d..67b7f34 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -9,6 +9,7 @@

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    +

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    @@ -27,6 +28,9 @@ &.is-light { font-weight: $sFontWeight-lighter; } + &.is-upper { + text-transform: uppercase; + } } .CDB-Size-huge { From 5182f60f65be82578efc0ccecc9a284961e0b4f6 Mon Sep 17 00:00:00 2001 From: saleiva Date: Fri, 5 Feb 2016 16:44:06 +0100 Subject: [PATCH 194/391] Revert "Adding is-upper class to typography" This reverts commit 5151d8c604f7473cca2944ba49bebe0b40a480ea. --- src/scss/cdb-components/typography.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 67b7f34..b02624d 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -9,7 +9,6 @@

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    -

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    @@ -28,9 +27,6 @@ &.is-light { font-weight: $sFontWeight-lighter; } - &.is-upper { - text-transform: uppercase; - } } .CDB-Size-huge { From 9f671180795deeb8f47e15d3aa2c505df3ccaaf5 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 5 Feb 2016 16:44:06 +0100 Subject: [PATCH 195/391] Adds // --- src/scss/cdb-utilities/fonts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-utilities/fonts.scss b/src/scss/cdb-utilities/fonts.scss index b36e4b9..d201ace 100644 --- a/src/scss/cdb-utilities/fonts.scss +++ b/src/scss/cdb-utilities/fonts.scss @@ -13,7 +13,7 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), + src: local('Open Sans'), local('OpenSans'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), url('//themes.googleusercontent.com/static/fonts/opensans/v8/u-WUoqrET9fUeobQW7jkRbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); } @font-face { From ecefc7517c17de68370dcd767d7d39dbbe93063b Mon Sep 17 00:00:00 2001 From: saleiva Date: Fri, 5 Feb 2016 16:45:33 +0100 Subject: [PATCH 196/391] is-upper --- src/scss/cdb-components/typography.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index b02624d..67b7f34 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -9,6 +9,7 @@

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    +

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    @@ -27,6 +28,9 @@ &.is-light { font-weight: $sFontWeight-lighter; } + &.is-upper { + text-transform: uppercase; + } } .CDB-Size-huge { From 928663d7e49021f003bf91fe76e9e73b4316d940 Mon Sep 17 00:00:00 2001 From: saleiva Date: Fri, 5 Feb 2016 16:43:50 +0100 Subject: [PATCH 197/391] Adding is-upper class to typography --- src/scss/cdb-components/typography.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index b02624d..67b7f34 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -9,6 +9,7 @@

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    +

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    @@ -27,6 +28,9 @@ &.is-light { font-weight: $sFontWeight-lighter; } + &.is-upper { + text-transform: uppercase; + } } .CDB-Size-huge { From 95278659e99f1bfc498eab0a895f8a9c7bfe06ef Mon Sep 17 00:00:00 2001 From: saleiva Date: Fri, 5 Feb 2016 16:46:20 +0100 Subject: [PATCH 198/391] Revert "Adding is-upper class to typography" This reverts commit 5151d8c604f7473cca2944ba49bebe0b40a480ea. --- src/scss/cdb-components/typography.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 67b7f34..b02624d 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -9,7 +9,6 @@

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    -

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    @@ -28,9 +27,6 @@ &.is-light { font-weight: $sFontWeight-lighter; } - &.is-upper { - text-transform: uppercase; - } } .CDB-Size-huge { From f12ee38ca054c43acffe7d5d583bdedaf7dc02b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 10:52:18 +0100 Subject: [PATCH 199/391] Carousel component: syntax minor fixes --- src/scss/cdb-components/carousel.scss | 16 +++------------- src/scss/cdb-components/shapes/toogle-arrow.scss | 1 - src/scss/cdb-utilities/helpers.scss | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 651c82d..e34aaf7 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -25,7 +25,6 @@ width: 100%; font-size: 0; } - .CDB-Carousel-item { @include inline-block(); width: $baseSize * 11; @@ -44,16 +43,7 @@ border: 1px solid $cMainLine; cursor: pointer; } - - &.is-selected { - border: 2px solid $cBlue; - } -} - -.CDB-Carousel-headerDetails { - color: $cTypo3; - - &.is-uppercase { - text-transform: uppercase; - } } +.CDB-Carousel-item.is-selected { + border: 2px solid $cBlue; +} \ No newline at end of file diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index 9df580f..86f302a 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -84,7 +84,6 @@ Description */ @import '../../cdb-variables/colors'; -@import '../../cdb-variables/sizes'; .CDB-ArrowToogle { position: relative; diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 062c420..57626c0 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -2,7 +2,6 @@ // ---------------------------------------------- @import './mixins'; -@import '../cdb-variables/colors'; /* Margins */ .u-tSpace { From 924fc5231869244f55d84dc118cd037e161a2405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 11:03:14 +0100 Subject: [PATCH 200/391] Textarea component: syntax minor fix --- src/scss/cdb-components/forms/textarea.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss index a095a37..3c1cb5d 100644 --- a/src/scss/cdb-components/forms/textarea.scss +++ b/src/scss/cdb-components/forms/textarea.scss @@ -35,9 +35,9 @@ border-color: $cSecondaryLine; background: $cThirdBackground; } - &.has-error { - border: 1px solid rgba($cError, 0.48); - background: rgba($cError, 0.04); - color: $cError; - } } +.CDB-Textarea.has-error { + border: 1px solid rgba($cError, 0.48); + background: rgba($cError, 0.04); + color: $cError; + } From 8ee48342f273002f895b95971c5e7e451ddcbb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 11:15:56 +0100 Subject: [PATCH 201/391] Carousel component: minor fix --- src/scss/cdb-components/carousel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index e34aaf7..91e2549 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -46,4 +46,4 @@ } .CDB-Carousel-item.is-selected { border: 2px solid $cBlue; -} \ No newline at end of file +} From 6e4ba3fe3195746b0182b31558d702bfcd2622de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 11:27:14 +0100 Subject: [PATCH 202/391] Carousel component: CartoIcon fix --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 01650deea1b1d7fe881627da6fa0a256b1dd1372..0b83194ca36ab0569001ad8dc7307df38619af0b 100644 GIT binary patch delta 54 zcmZ26nQ_Hr#tAme+OuOP+OKE&IcegDsnW5twd471zA|t#{$c=vOE+UeVD#n%j2s>S DL0c2b delta 54 zcmZ26nQ_Hr#tAme;$HC+?bkCY$xQq(RXW~FJf7d?D+4#s;RgNL9k~Di delta 67 zcmV-J0KEUaT)bS6a|ts5001`opduWxe6}Vjak|Cv{5D@1xEX%|MHnvK_%IVjzbXI! ZohyRz50J~jzyuNn0H4thyR%y-;ReD79P Date: Mon, 8 Feb 2016 11:41:46 +0100 Subject: [PATCH 203/391] Carousel component: syntax fix --- src/scss/cdb-components/carousel.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 91e2549..be22b9d 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -47,3 +47,4 @@ .CDB-Carousel-item.is-selected { border: 2px solid $cBlue; } + From 6ef85bd46f69ce3d375763bb468d30d5747da08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 12:03:45 +0100 Subject: [PATCH 204/391] Step component: syntax minor fix --- src/scss/cdb-components/step.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index be490c5..50f44a3 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -34,7 +34,6 @@ @include flex-direction(row); @include align-items(flex-start, flex-start); } - .CDB-Step-headerNumeration { width: $baseSize * 3; height: $baseSize * 3; @@ -46,15 +45,12 @@ line-height: $baseSize * 3; text-align: center; } - .CDB-Step-headerInfo { width: 100%; } - .CDB-Step-headerTitle { color: $cMainDark; } - .CDB-Step-headerDetails { color: $cTypo3; @@ -62,7 +58,6 @@ text-transform: uppercase; } } - .CDB-Step-action { width: $baseSize * 3; height: $baseSize * 3; From e8e7ebe04ae3bf8c2e00c7b41e1a50c081cc9f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 14:36:03 +0100 Subject: [PATCH 205/391] Carousel component: css fixes --- src/scss/cdb-components/carousel.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index be22b9d..30f5256 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -29,14 +29,14 @@ @include inline-block(); width: $baseSize * 11; height: $baseSize * 7; + margin-right: 8px; border: 1px solid $cSecondaryLine; border-radius: 4px; background: $cThirdBackground; - vertical-align: top; box-sizing: border-box; - &:not(:last-child) { - margin-right: 8px; + &:last-child { + margin-right: 0; } &:hover { From c54528bf6a566c94d03efe6857d5b12d8ced0b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 15:07:25 +0100 Subject: [PATCH 206/391] Step component: flex elements fix --- src/scss/cdb-components/step.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss index 50f44a3..42f29f5 100644 --- a/src/scss/cdb-components/step.scss +++ b/src/scss/cdb-components/step.scss @@ -44,9 +44,10 @@ font-size: $sFontSize-small; line-height: $baseSize * 3; text-align: center; + box-sizing: border-box; } .CDB-Step-headerInfo { - width: 100%; + @include flex-grow(2); } .CDB-Step-headerTitle { color: $cMainDark; From 8bdc4c712b8275d683e026e75f024be7468b7978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 15:23:14 +0100 Subject: [PATCH 207/391] Step component: added to headers stylesheet --- src/scss/cdb-components/headers.scss | 53 +++++++++++++++++++++- src/scss/cdb-components/step.scss | 68 ---------------------------- 2 files changed, 52 insertions(+), 69 deletions(-) delete mode 100644 src/scss/cdb-components/step.scss diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index 02ca1b2..790850e 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -47,9 +47,11 @@ +


    +
    @@ -85,6 +87,7 @@

    populates_places

    +


    @@ -111,6 +114,7 @@

    Positron by CartoDB

    +


    @@ -130,10 +134,28 @@

    populates_places

    +


    +
    +
    1
    + +
    +

    Type

    +

    Histogram

    +

    Distribution of a numeric variable in a range

    +
    + +
    +
    +
    +
    + +
    +
    +
    ``` */ @@ -191,5 +213,34 @@ vertical-align: middle; } +/* Steps header */ +.CDB-Step-header { + @include display-flex(); + @include flex-direction(row); + @include align-items(flex-start, flex-start); +} +.CDB-Step-headerNumeration { + width: $baseSize * 3; + height: $baseSize * 3; + border: 1px solid $cMainLine; + border-radius: 4px; + background-color: $cWhite; + color: $cTypo3; + font-size: $sFontSize-small; + line-height: $baseSize * 3; + text-align: center; + box-sizing: border-box; +} +.CDB-Step-headerInfo { + @include flex-grow(2); +} +.CDB-Step-headerTitle { + color: $cMainDark; +} +.CDB-Step-headerDetails { + color: $cTypo3; - + &.is-uppercase { + text-transform: uppercase; + } +} diff --git a/src/scss/cdb-components/step.scss b/src/scss/cdb-components/step.scss deleted file mode 100644 index 42f29f5..0000000 --- a/src/scss/cdb-components/step.scss +++ /dev/null @@ -1,68 +0,0 @@ -// Step styles -// ---------------------------------------------- - -/* SG -# Step - -``` -
      -
    1. -
      -
      1
      - -
      -

      Type

      -

      Histogram

      -

      Distribution of a numeric variable in a range

      -
      - -
      -
      -
      -
      -
      2. -
    -``` -*/ - -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - -.CDB-Step-header { - @include display-flex(); - @include flex-direction(row); - @include align-items(flex-start, flex-start); -} -.CDB-Step-headerNumeration { - width: $baseSize * 3; - height: $baseSize * 3; - border: 1px solid $cMainLine; - border-radius: 4px; - background-color: $cWhite; - color: $cTypo3; - font-size: $sFontSize-small; - line-height: $baseSize * 3; - text-align: center; - box-sizing: border-box; -} -.CDB-Step-headerInfo { - @include flex-grow(2); -} -.CDB-Step-headerTitle { - color: $cMainDark; -} -.CDB-Step-headerDetails { - color: $cTypo3; - - &.is-uppercase { - text-transform: uppercase; - } -} -.CDB-Step-action { - width: $baseSize * 3; - height: $baseSize * 3; - font-size: 14px; - text-align: center; - cursor: pointer; -} From 2024f616ec19ed859ad5710a372607f23057dbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 16:57:27 +0100 Subject: [PATCH 208/391] Step component: improvements --- src/scss/cdb-components/headers.scss | 60 ++++++++++------------------ 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index 790850e..48662fc 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -139,17 +139,24 @@

    -
    -
    1
    +
    +
    1
    -
    -

    Type

    -

    Histogram

    -

    Distribution of a numeric variable in a range

    -
    +
    +
    +

    Type

    + +
    + +
    +
    +
    +     +
    +
    -
    -
    +

    Histogram

    +

    Distribution of a numeric variable in a range

    @@ -170,7 +177,6 @@ display: block; } } - .CDB-HeaderInfo-ListItem { display: inline-block; margin-right: 8px; @@ -180,24 +186,23 @@ margin-right: 0; } } - .CDB-HeaderInfo-Text { color: $cTypo3; + + &.is-uppercase { + text-transform: uppercase; + } } - .CDB-HeaderInfo-Inner { @include flex(1); } - .CDB-HeaderInfo-Back { margin-top: 7px; } - .CDB-HeaderInfo-Title { @include display-flex(); @include align-items(center); } - .CDB-HeaderInfo-TitleText { @include flex(1); width: 0; @@ -206,20 +211,12 @@ white-space: nowrap; overflow: hidden; } - .CDB-HeaderInfo-ActionsItem { display: inline-block; margin-left: 4px; vertical-align: middle; } - -/* Steps header */ -.CDB-Step-header { - @include display-flex(); - @include flex-direction(row); - @include align-items(flex-start, flex-start); -} -.CDB-Step-headerNumeration { +.CDB-HeaderNumeration { width: $baseSize * 3; height: $baseSize * 3; border: 1px solid $cMainLine; @@ -227,20 +224,7 @@ background-color: $cWhite; color: $cTypo3; font-size: $sFontSize-small; - line-height: $baseSize * 3; + line-height: 23px; text-align: center; box-sizing: border-box; } -.CDB-Step-headerInfo { - @include flex-grow(2); -} -.CDB-Step-headerTitle { - color: $cMainDark; -} -.CDB-Step-headerDetails { - color: $cTypo3; - - &.is-uppercase { - text-transform: uppercase; - } -} From 124aaff389f0a086c8d353ce40b1d01a3d5761ba Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 8 Feb 2016 17:01:29 +0100 Subject: [PATCH 209/391] add first commit --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/typography.scss | 4 +++- src/scss/cdb-utilities/defaults.css.scss | 4 ++++ src/scss/cdb-utilities/helpers.scss | 12 ++++++++++++ src/scss/cdb-variables/_colors.scss | 1 + 7 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 0b83194ca36ab0569001ad8dc7307df38619af0b..bed146d60ed603d2c89833c2745248449cdfbf44 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAme_f0$}+OK0?t+Qj|hpEz@Cimm{ZN4&aGyY-#f=l;GpTp?Q3m7>( E0B30xq5uE@ delta 55 zcmZ26nQ_Hr#tAme+OuOP+OK0?@N?3{4^yRMXKTmv+k9o( E0AHpQY5)KL diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 4caa8b4d390117aeed4eb1655de4da216edbf5a4..b2a25acc7f4c42df0161ecb44568a43fcf8fdc90 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwht95ovbeSscX>vcF-{va=H{&k`Ah>j|^f`>)_=Up*0Ld^D6951J delta 47 wcmew}k@3$&#tDwh3w}Kyc}1ObCqL_=Up*0L?iP6aWAK diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index c80206041e67c10db007e2385d40ab6ab3b63509..7a1125b31a23762222c63368070fe9aec38e71e9 100644 GIT binary patch delta 67 zcmV-J0KEUaT)bS6a|ts5001`ot1P&&e6}Vj9un5^{5D@1xEX%|MHnvKD}4^5-<1FV Z&K1G<2gv1MU;>E(0EZ6`3bR`$;Re7v8}0xA delta 67 zcmV-J0KEUaT)bS6a|tp4001`op!t%qe6}VjF?H?n{5D@1xEX%|MHnvKj0u6!Z_59F Z=Zawb1LSfrFo8q?h|3Oc0JB>s;RgNL9k~Di diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 67b7f34..10ee568 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -10,7 +10,9 @@

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    Open Sans 12/16 Semibold Uppercase

    -

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    ``` diff --git a/src/scss/cdb-utilities/defaults.css.scss b/src/scss/cdb-utilities/defaults.css.scss index c7998f1..6996513 100644 --- a/src/scss/cdb-utilities/defaults.css.scss +++ b/src/scss/cdb-utilities/defaults.css.scss @@ -3,6 +3,10 @@ @import '../cdb-variables/colors'; +body { + color: $cTypoMain; +} + a { color: $cBlue; text-decoration: none; diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 1cb8a7b..01b7a79 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -2,6 +2,7 @@ // ---------------------------------------------- @import './mixins'; +@import '../cdb-variables/colors'; .u-tSpace { margin-top: 4px; @@ -36,6 +37,17 @@ .u-bSpace--m { margin-bottom: 8px; } +.u-textSecondary { + color: $cTypo2; +} +.u-textSubtitle { + color: $cTypo3; +} +.u-textDisabled { + color: $cTypo4; +} + + .u-iBlock { @include inline-block(); diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index fc0bc81..bd1a9e4 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -18,6 +18,7 @@ $cMainLine: #DDD; $cSecondaryLine: #EEE; //Typography +$cTypoMain: #2E3C43; $cTypo2: #636D72; $cTypo3: #979EA1; $cTypo4: #CBCED0; From 820a4dad4205bd555fa077c6f8232785bd218017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 17:46:57 +0100 Subject: [PATCH 210/391] Dropdown component --- src/scss/cdb-components/forms/dropdowns.scss | 117 +++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 src/scss/cdb-components/forms/dropdowns.scss diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss new file mode 100644 index 0000000..59ab81b --- /dev/null +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -0,0 +1,117 @@ +// Dropdown styles +// ---------------------------------------------- + +/* SG +# Forms/Dropdowns + +``` +
    + +
    +
    +
      +
    • + + + +
      • +
    • + + + +
      • +
    • + + + +
      • +
    • + + + +
      • +
    • + + + +
      • +
    +
    + +
    +
      +
    • + selected +
      • +
    • + active +
      • +
    • + disabled +
      • +
    • + disabled +
      • +
    +
    +
    +
    +``` +*/ + +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; + +.CDB-DropdownContainer { + position: relative; + height: 250px; +} +.CDB-Dropdown { + height: 200px; + position: absolute; + top: 40px; + font-size: 0; +} +.CDB-Dropdown-calculations { + display: inline-block; + width: $baseSize * 11; + height: 100%; + padding: $sMargin-element; + border-right: 1px solid $cMainLine; + border-radius: 3px 0 0 3px; + background-color: $cSecondaryBackground; + box-sizing: border-box; +} +.CDB-Dropdown-calculationsElement { + font-size: $sFontSize-small; + + &:not(:last-child) { + margin-bottom: $sLineHeight-medium; + } +} +.CDB-Dropdown-options { + display: inline-block; + width: $baseSize * 20; + border-radius: 0 3px 3px 0; + background-color: $cWhite; + vertical-align: top; +} +.CDB-Dropdown-optionsElement { + padding: 12px 10px; + border-bottom: 1px solid $cMainLine; + color: $cBlue; + + &:last-child { + border-bottom: 0; + } + &:hover { + background-color: rgba(157, 224, 173, 0.2); + cursor: pointer; + } +} +.CDB-Dropdown-optionsElement.is-selected { + color: $cBlack; +} +.CDB-Dropdown-optionsElement.is-disabled { + color: $cTypo4; +} From f38377fa9eb98802cca82226daf5147fe4835885 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 8 Feb 2016 17:48:03 +0100 Subject: [PATCH 211/391] use helpers --- src/scss/cdb-components/avatars.scss | 3 +-- src/scss/cdb-components/headers.scss | 8 ++------ src/scss/cdb-components/menu.scss | 5 ++--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/avatars.scss index 62a6fe4..c78be1f 100644 --- a/src/scss/cdb-components/avatars.scss +++ b/src/scss/cdb-components/avatars.scss @@ -16,7 +16,7 @@ User Name
  • - +
    • ``` @@ -44,7 +44,6 @@ border-left: 2px solid $cWhite; border-radius: 50px; background: $cSecondaryLine; - color: $cTypo2; } .CDB-AvatarList-itemMedia { diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index 02ca1b2..17980ac 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -43,7 +43,7 @@
  • -

    Published 8 days ago

    +

    Published 8 days ago

    • @@ -108,7 +108,7 @@
    -

    Positron by CartoDB

    +

    Positron by CartoDB


    @@ -159,10 +159,6 @@ } } -.CDB-HeaderInfo-Text { - color: $cTypo3; -} - .CDB-HeaderInfo-Inner { @include flex(1); } diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index bcf7e13..3880e39 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -18,10 +18,10 @@ POP-UP @@ -125,7 +125,6 @@ .CDB-NavSubmenu-Status { margin-left: 2px; - color: $cTypo4; } .CDB-Navmenu.is-dark { From d81f93054328266e62ce5d48e5bf7c7defb4cf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Feb 2016 17:54:20 +0100 Subject: [PATCH 212/391] Step component: minor fix --- src/scss/cdb-components/headers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index 48662fc..00a72b9 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -156,7 +156,7 @@

    Histogram

    -

    Distribution of a numeric variable in a range

    +

    Distribution of a numeric variable in a range

    From 961dc2ef1bcc92f1924fb1fb88c74ad473fb4621 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 14:47:28 +0100 Subject: [PATCH 213/391] add new threePoints --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes/add.scss | 4 ++ .../cdb-components/shapes/threePoints.scss | 57 +++++++++++++++++- 5 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 0b83194ca36ab0569001ad8dc7307df38619af0b..28a728f668b7bb6868a5eb55ed54f0c854830ce5 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAme(>q-z+OK0?+Y~eL!&GUP>>|HeVUI8GkVV!KM2PcEae*3m7>( E0BOM$ssI20 delta 55 zcmZ26nQ_Hr#tAme+OuOP+OK0?@N?3{4^yRMXKTmv+k9o( E0AHpQY5)KL diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 4caa8b4d390117aeed4eb1655de4da216edbf5a4..cc04eb4e989a4c83cfa7d2cd11882b7f015d57ca 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwhYnx&wx=fXJ>6{+VZ}XLboADO|5L~*yU?+^;_=Up*0Lo(%6951J delta 47 wcmew}k@3$&#tDwh3w}Kyc}1ObCqL_=Up*0L?iP6aWAK diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index c80206041e67c10db007e2385d40ab6ab3b63509..8d1d6c8d8df5c64c4795d13aa825252ca29ed532 100644 GIT binary patch delta 67 zcmV-J0KEUaT)bS6a|ts5001`ot%6*!e6}Vj&N-js`E9;3a5Me_iZEQdzhEbfepCMc ZJ68nbA0U^5fe9oE0JDS;4YOM(;RfrE97+HH delta 67 zcmV-J0KEUaT)bS6a|tp4001`op!t%qe6}VjF?H?n{5D@1xEX%|MHnvKj0u6!Z_59F Z=Zawb1LSfrFo8q?h|3Oc0JB>s;RgNL9k~Di diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index 570d5b4..54f4c84 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -49,6 +49,10 @@ Description width: 16px; height: 16px; text-align: center; + &.is-medium { + width: 24px; + height: 24px; + } &:hover { cursor: pointer; } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 48038e3..5bb29af 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -4,6 +4,41 @@ Description ``` +

    24px

    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +

    16px

    -

    Positron by CartoDB

    +

    Positron by CartoDB

    @@ -155,8 +155,8 @@ -

    Histogram

    -

    Distribution of a numeric variable in a range

    +

    Histogram

    +

    Distribution of a numeric variable in a range

    diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 3880e39..c0c8a04 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -18,10 +18,10 @@ POP-UP diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 291c0b0..b0ff817 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -11,8 +11,8 @@

    Open Sans 12/16 Semibold

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    -

    Open Sans 12/16 Regular

    -

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    ``` diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 01b7a79..aa9c3ec 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -37,13 +37,21 @@ .u-bSpace--m { margin-bottom: 8px; } + +// Colors +// Main Text Color is default color +// ---------------------------------------------- + +.u-mainTextColor { + color: $cMainDark; +} .u-textSecondary { color: $cTypo2; } -.u-textSubtitle { +.u-aux1TextColor { color: $cTypo3; } -.u-textDisabled { +.u-aux2TextColor { color: $cTypo4; } From cf97094b8c224e6266bfa193652e7afe8e1f5e8a Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 16:54:05 +0100 Subject: [PATCH 215/391] fix pr --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/headers.scss | 8 ++++---- src/scss/cdb-components/menu.scss | 4 ++-- src/scss/cdb-components/typography.scss | 4 ++-- src/scss/cdb-utilities/helpers.scss | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 3049b66ca2785f0a99ae49c4cd0f0af8a2b7b327..dcdd55ab0be4f13acd70d48c51d384ce9888cfe3 100644 GIT binary patch delta 54 zcmZ26nQ_Hr#tAme;_sX%+OKE2AT#m9RB7jT;_>`8Um3U=e=z{TrTfQc!syKl7&$xu DL^KrP delta 54 zcmZ26nQ_Hr#tAme%bi>%+OKC?dS&8=snRY^%j5ZNzA|t#{$c=vOZPXG!syKl7&$xu DOXC#A diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 91b115ff9ccf30adb68b3e51f647bbd8446bae74..3fed9de7d31b9b03ed5b3736774c00e57e43f6cc 100644 GIT binary patch delta 46 vcmew}k@3$&#tBYL7i1>7OqF(iCmzpl^Ob>{@fQOST)KaJCXC+rg~I~?tqu}q delta 46 vcmew}k@3$&#tBYLORr3HnJVq#v^<{Q<|_j?<1YpvxO9J0DU9Cug~I~?xY814 diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index d2ad4809e2e495f620c097547fa3305fa8ea897f..bc80aec19be85f7911df131db1f873631099c4de 100644 GIT binary patch delta 60 zcmV-C0K@;hT)bS6dIHcKv3#~BDNYxQ! delta 60 zcmV-C0K@;hT)bS6dIF`?v3#~BDb8xl@%%Pl8MqmL0Yw-t-QQFSqu-SO|IQV`_y@@4 SU|<4?0swYY4s)|xC*cN{@*I@_ diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index a449eb5..8c046da 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -43,7 +43,7 @@
  • -

    Published 8 days ago

    +

    Published 8 days ago

    • @@ -111,7 +111,7 @@ -

    Positron by CartoDB

    +

    Positron by CartoDB

    @@ -155,8 +155,8 @@ -

    Histogram

    -

    Distribution of a numeric variable in a range

    +

    Histogram

    +

    Distribution of a numeric variable in a range

    diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index c0c8a04..c2bd83d 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -18,10 +18,10 @@ POP-UP diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index b0ff817..810cf0c 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -11,8 +11,8 @@

    Open Sans 12/16 Semibold

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    -

    Open Sans 12/16 Regular

    -

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    ``` diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index aa9c3ec..9a201d8 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -48,10 +48,10 @@ .u-textSecondary { color: $cTypo2; } -.u-aux1TextColor { +.u-altTextColor { color: $cTypo3; } -.u-aux2TextColor { +.u-hintTextColor { color: $cTypo4; } From f2652106b3bd27185a85bec44d07fff9498890af Mon Sep 17 00:00:00 2001 From: Maria Checa Date: Tue, 9 Feb 2016 16:55:40 +0100 Subject: [PATCH 216/391] Carousel component: inside elements horizontal and vertically centered --- src/scss/cdb-components/carousel.scss | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 30f5256..0db7835 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -7,11 +7,11 @@ ```
      -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    ``` @@ -22,11 +22,15 @@ @import '../cdb-variables/colors'; .CDB-Carousel { + @include display-flex(); + @include justify-content(flex-start); width: 100%; font-size: 0; } -.CDB-Carousel-item { - @include inline-block(); +.CDB-CarouselItem { + @include display-flex(); + @include align-items(center); + @include justify-content(center); width: $baseSize * 11; height: $baseSize * 7; margin-right: 8px; @@ -38,13 +42,11 @@ &:last-child { margin-right: 0; } - &:hover { border: 1px solid $cMainLine; cursor: pointer; } } -.CDB-Carousel-item.is-selected { +.CDB-CarouselItem.is-selected { border: 2px solid $cBlue; } - From 45c90f9cd9ef799744ce2c3b3186bc83ff18263e Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 17:17:14 +0100 Subject: [PATCH 217/391] change vars --- src/scss/cdb-components/avatars.scss | 2 +- src/scss/cdb-components/colors.scss | 6 +++--- src/scss/cdb-components/forms/toggle.scss | 2 +- src/scss/cdb-components/loader.scss | 4 ++-- src/scss/cdb-components/menu.scss | 6 +++--- src/scss/cdb-components/shapes/add.scss | 8 ++++---- src/scss/cdb-components/shapes/arrow.scss | 6 +++--- src/scss/cdb-components/shapes/check-circle.scss | 6 +++--- src/scss/cdb-components/shapes/close.scss | 4 ++-- src/scss/cdb-components/shapes/dash.scss | 2 +- src/scss/cdb-components/shapes/dataset.scss | 8 ++++---- src/scss/cdb-components/shapes/error-circle.scss | 2 +- src/scss/cdb-components/shapes/hamburguer.scss | 2 +- src/scss/cdb-components/shapes/magnify.scss | 4 ++-- src/scss/cdb-components/shapes/move.scss | 4 ++-- src/scss/cdb-components/shapes/threePoints.scss | 2 +- src/scss/cdb-components/shapes/toogle-arrow.scss | 4 ++-- src/scss/cdb-components/typography.scss | 2 +- src/scss/cdb-utilities/helpers.scss | 4 ++-- src/scss/cdb-variables/_colors.scss | 10 +++++----- 20 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/avatars.scss index c78be1f..772a210 100644 --- a/src/scss/cdb-components/avatars.scss +++ b/src/scss/cdb-components/avatars.scss @@ -16,7 +16,7 @@ User Name
  • - +
    • ``` diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/colors.scss index 1fac96d..f5d73d4 100644 --- a/src/scss/cdb-components/colors.scss +++ b/src/scss/cdb-components/colors.scss @@ -18,9 +18,9 @@ @import '../cdb-variables/colors'; .box { + display: inline-block; width: 120px; height: 64px; - display: inline-block; margin: 0 24px 24px 0; } @@ -28,15 +28,15 @@ background: $cBlue; } .Color-White { + border: 1px solid #E5E5E5; background: $cWhite; - border: 1px solid #e5e5e5; } .Color-Dark { background: $cBlack; } .Color-MainDark { - background: $cMainDark; + background: $cMainBgColor; } .Color-SecondaryDark { background: $cSecondaryDark; diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss index e6dd65b..81c3670 100644 --- a/src/scss/cdb-components/forms/toggle.scss +++ b/src/scss/cdb-components/forms/toggle.scss @@ -49,7 +49,7 @@ } &:checked + .CDB-ToggleFace { - background: $cMainDark; + background: $cMainBgColor; &::before { right: 2px; diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index 07e066b..ae9d543 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -105,12 +105,12 @@ This is the generic loader for widgets, maps, components, ... background: $cWhite; } &.is-grey { - background: linear-gradient(to right, $cMainDark 10%, rgba($cWhite, 0) 42%); + background: linear-gradient(to right, $cMainBgColor 10%, rgba($cWhite, 0) 42%); &::before { background: $cTypo2; } &::after { - background: $cMainDark; + background: $cMainBgColor; } } } diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index c2bd83d..7327574 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -97,8 +97,8 @@ } .CDB-NavMenu-Item.is-active .CDB-NavMenu-Link { - border-bottom: 1px solid $cMainDark; - color: $cMainDark; + border-bottom: 1px solid $cMainBgColor; + color: $cMainBgColor; } .CDB-NavSubmenu { @@ -119,7 +119,7 @@ .CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-Link { border-bottom: 1px solid $cTypo3; - color: $cMainDark; + color: $cMainBgColor; } } diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index 570d5b4..a172077 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -65,7 +65,7 @@ Description bottom: 7px; left: 0; height: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -76,7 +76,7 @@ Description bottom: 0; left: 7px; width: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } @@ -90,7 +90,7 @@ Description bottom: 7px; left: 4px; height: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -101,7 +101,7 @@ Description bottom: 3px; left: 8px; width: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index cb596d0..172fcda 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -22,7 +22,7 @@ Description position: relative; width: 1px; height: 8px; - background: $cMainDark; + background: $cMainBgColor; &::before { display: block; @@ -32,7 +32,7 @@ Description width: 5px; height: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -44,7 +44,7 @@ Description width: 5px; height: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &.is-up { diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index f63cb76..4d1ac0c 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 14px; height: 14px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; &.is-small { @@ -86,7 +86,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &::after { @@ -94,7 +94,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index 40b26f6..f25e7bf 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -55,7 +55,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &::after { @@ -63,7 +63,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } diff --git a/src/scss/cdb-components/shapes/dash.scss b/src/scss/cdb-components/shapes/dash.scss index 409bd20..361a6b8 100644 --- a/src/scss/cdb-components/shapes/dash.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -56,7 +56,7 @@ Description bottom: 7px; left: 2px; height: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 494918d..8612383 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -95,7 +95,7 @@ Description width: 9px; height: 9px; margin-left: -10px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; background: $cWhite; @@ -132,15 +132,15 @@ Description .CDB-Shape-Dataset.is-white { .CDB-Shape-DatasetItem { border: 1px solid $cHoverLine; - background: $cMainDark; + background: $cMainBgColor; &:first-child { - box-shadow: 3px 0 $cMainDark; + box-shadow: 3px 0 $cMainBgColor; } } } .CDB-Shape-Dataset.is-white.is-small { .CDB-Shape-DatasetItem:first-child { - box-shadow: 2px 0 $cMainDark; + box-shadow: 2px 0 $cMainBgColor; } } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index eebeb92..ee1a4bb 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 13px; height: 13px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; &.is-small { diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/hamburguer.scss index 7b8ceff..4bd02e8 100644 --- a/src/scss/cdb-components/shapes/hamburguer.scss +++ b/src/scss/cdb-components/shapes/hamburguer.scss @@ -43,7 +43,7 @@ Description .CDB-Shape-hamburguerItem { height: $baseSize / 4; margin-bottom: $baseSize / 4; - background: $cMainDark; + background: $cMainBgColor; &:last-child { margin-bottom: 0; diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index 7f4f2f0..9bb2128 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -58,7 +58,7 @@ Description left: 0; width: 11px; height: 11px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; content: ''; } @@ -71,7 +71,7 @@ Description width: 1px; height: 7px; transform: rotate(314deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index e1f423b..d5ea9e1 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -101,7 +101,7 @@ Description display: inline-block; width: 3px; height: 3px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -110,7 +110,7 @@ Description width: 3px; height: 3px; margin-left: 2px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 48038e3..4757bb8 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -77,7 +77,7 @@ Description width: 2px; height: 2px; margin-bottom: 5px; - background: $cMainDark; + background: $cMainBgColor; &:last-child { margin-bottom: 0; } diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index 86f302a..d5b5fde 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -97,7 +97,7 @@ Description width: 10px; height: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &::after { @@ -108,7 +108,7 @@ Description width: 10px; height: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 810cf0c..74c0127 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -10,7 +10,7 @@

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    Open Sans 12/16 Semibold Uppercase

    -

    Open Sans 12/16 Regular

    +

    Open Sans 12/16 Regular

    Open Sans 12/16 Regular

    Open Sans 12/16 Regular

    Open Sans 10/14 Semibold

    diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 9a201d8..b21de94 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -43,9 +43,9 @@ // ---------------------------------------------- .u-mainTextColor { - color: $cMainDark; + color: $cMainTextColor; } -.u-textSecondary { +.u-secondaryTextColor { color: $cTypo2; } .u-altTextColor { diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index bd1a9e4..fb8f9ee 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -5,7 +5,7 @@ $cBlue: #3AA9E3; $cBlack: #000; $cWhite: #FFF; -$cMainDark: #2E3C43; +$cMainBgColor: #2E3C43; //Structure $cSecondaryDark: #282C2F; @@ -18,10 +18,10 @@ $cMainLine: #DDD; $cSecondaryLine: #EEE; //Typography -$cTypoMain: #2E3C43; -$cTypo2: #636D72; -$cTypo3: #979EA1; -$cTypo4: #CBCED0; +$cMainTextColor: #2E3C43; +$cSecondaryTextColor: #636D72; +$cAltTextColor: #979EA1; +$cHintTextColor: #CBCED0; //Others $cHighlight: #9DE0AD; From 1da800ecef7c8793f370ad58a5bf29a1b9d8209a Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 17:25:28 +0100 Subject: [PATCH 218/391] fix vars --- src/scss/cdb-components/colors.scss | 2 +- src/scss/cdb-components/forms/toggle.scss | 2 +- src/scss/cdb-components/loader.scss | 4 ++-- src/scss/cdb-components/menu.scss | 6 +++--- src/scss/cdb-components/shapes/add.scss | 8 ++++---- src/scss/cdb-components/shapes/arrow.scss | 6 +++--- src/scss/cdb-components/shapes/check-circle.scss | 6 +++--- src/scss/cdb-components/shapes/close.scss | 4 ++-- src/scss/cdb-components/shapes/dash.scss | 2 +- src/scss/cdb-components/shapes/dataset.scss | 8 ++++---- src/scss/cdb-components/shapes/error-circle.scss | 2 +- src/scss/cdb-components/shapes/hamburguer.scss | 2 +- src/scss/cdb-components/shapes/magnify.scss | 4 ++-- src/scss/cdb-components/shapes/move.scss | 4 ++-- src/scss/cdb-components/shapes/threePoints.scss | 2 +- src/scss/cdb-components/shapes/toogle-arrow.scss | 4 ++-- src/scss/cdb-utilities/helpers.scss | 2 +- src/scss/cdb-variables/_colors.scss | 10 +++++----- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/colors.scss index f5d73d4..555cb3a 100644 --- a/src/scss/cdb-components/colors.scss +++ b/src/scss/cdb-components/colors.scss @@ -36,7 +36,7 @@ } .Color-MainDark { - background: $cMainBgColor; + background: $cMainBg; } .Color-SecondaryDark { background: $cSecondaryDark; diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss index 81c3670..b37f458 100644 --- a/src/scss/cdb-components/forms/toggle.scss +++ b/src/scss/cdb-components/forms/toggle.scss @@ -49,7 +49,7 @@ } &:checked + .CDB-ToggleFace { - background: $cMainBgColor; + background: $cMainBg; &::before { right: 2px; diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index ae9d543..44403cc 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -105,12 +105,12 @@ This is the generic loader for widgets, maps, components, ... background: $cWhite; } &.is-grey { - background: linear-gradient(to right, $cMainBgColor 10%, rgba($cWhite, 0) 42%); + background: linear-gradient(to right, $cMainBg 10%, rgba($cWhite, 0) 42%); &::before { background: $cTypo2; } &::after { - background: $cMainBgColor; + background: $cMainBg; } } } diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 7327574..0ab42f8 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -97,8 +97,8 @@ } .CDB-NavMenu-Item.is-active .CDB-NavMenu-Link { - border-bottom: 1px solid $cMainBgColor; - color: $cMainBgColor; + border-bottom: 1px solid $cMainBg; + color: $cMainBg; } .CDB-NavSubmenu { @@ -119,7 +119,7 @@ .CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-Link { border-bottom: 1px solid $cTypo3; - color: $cMainBgColor; + color: $cMainBg; } } diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index a172077..a6b78ec 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -65,7 +65,7 @@ Description bottom: 7px; left: 0; height: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -76,7 +76,7 @@ Description bottom: 0; left: 7px; width: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } @@ -90,7 +90,7 @@ Description bottom: 7px; left: 4px; height: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -101,7 +101,7 @@ Description bottom: 3px; left: 8px; width: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index 172fcda..295cd40 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -22,7 +22,7 @@ Description position: relative; width: 1px; height: 8px; - background: $cMainBgColor; + background: $cMainBg; &::before { display: block; @@ -32,7 +32,7 @@ Description width: 5px; height: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -44,7 +44,7 @@ Description width: 5px; height: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &.is-up { diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index 4d1ac0c..cf2b1f1 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 14px; height: 14px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; &.is-small { @@ -86,7 +86,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &::after { @@ -94,7 +94,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index f25e7bf..473f7dc 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -55,7 +55,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &::after { @@ -63,7 +63,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } diff --git a/src/scss/cdb-components/shapes/dash.scss b/src/scss/cdb-components/shapes/dash.scss index 361a6b8..8c3bdeb 100644 --- a/src/scss/cdb-components/shapes/dash.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -56,7 +56,7 @@ Description bottom: 7px; left: 2px; height: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 8612383..0639597 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -95,7 +95,7 @@ Description width: 9px; height: 9px; margin-left: -10px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; background: $cWhite; @@ -132,15 +132,15 @@ Description .CDB-Shape-Dataset.is-white { .CDB-Shape-DatasetItem { border: 1px solid $cHoverLine; - background: $cMainBgColor; + background: $cMainBg; &:first-child { - box-shadow: 3px 0 $cMainBgColor; + box-shadow: 3px 0 $cMainBg; } } } .CDB-Shape-Dataset.is-white.is-small { .CDB-Shape-DatasetItem:first-child { - box-shadow: 2px 0 $cMainBgColor; + box-shadow: 2px 0 $cMainBg; } } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index ee1a4bb..5ed5ffc 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 13px; height: 13px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; &.is-small { diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/hamburguer.scss index 4bd02e8..d5d2bc4 100644 --- a/src/scss/cdb-components/shapes/hamburguer.scss +++ b/src/scss/cdb-components/shapes/hamburguer.scss @@ -43,7 +43,7 @@ Description .CDB-Shape-hamburguerItem { height: $baseSize / 4; margin-bottom: $baseSize / 4; - background: $cMainBgColor; + background: $cMainBg; &:last-child { margin-bottom: 0; diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index 9bb2128..bec21d4 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -58,7 +58,7 @@ Description left: 0; width: 11px; height: 11px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; content: ''; } @@ -71,7 +71,7 @@ Description width: 1px; height: 7px; transform: rotate(314deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index d5ea9e1..db5a45f 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -101,7 +101,7 @@ Description display: inline-block; width: 3px; height: 3px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -110,7 +110,7 @@ Description width: 3px; height: 3px; margin-left: 2px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 4757bb8..a184921 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -77,7 +77,7 @@ Description width: 2px; height: 2px; margin-bottom: 5px; - background: $cMainBgColor; + background: $cMainBg; &:last-child { margin-bottom: 0; } diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index d5b5fde..90381da 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -97,7 +97,7 @@ Description width: 10px; height: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &::after { @@ -108,7 +108,7 @@ Description width: 10px; height: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index b21de94..4a0d90c 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -43,7 +43,7 @@ // ---------------------------------------------- .u-mainTextColor { - color: $cMainTextColor; + color: $cMainText; } .u-secondaryTextColor { color: $cTypo2; diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index fb8f9ee..bc31a89 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -5,7 +5,7 @@ $cBlue: #3AA9E3; $cBlack: #000; $cWhite: #FFF; -$cMainBgColor: #2E3C43; +$cMainBg: #2E3C43; //Structure $cSecondaryDark: #282C2F; @@ -18,10 +18,10 @@ $cMainLine: #DDD; $cSecondaryLine: #EEE; //Typography -$cMainTextColor: #2E3C43; -$cSecondaryTextColor: #636D72; -$cAltTextColor: #979EA1; -$cHintTextColor: #CBCED0; +$cMainText: #2E3C43; +$cSecondaryText: #636D72; +$cAltText: #979EA1; +$cHintText: #CBCED0; //Others $cHighlight: #9DE0AD; From 7eec29696335caa943cb6ded7307c1f22309dc97 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 17:48:57 +0100 Subject: [PATCH 219/391] fix cr --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/boxes.scss | 4 ++-- src/scss/cdb-components/colors.scss | 6 +++--- src/scss/cdb-components/forms/toggle.scss | 2 +- src/scss/cdb-components/headers.scss | 2 +- src/scss/cdb-components/loader.scss | 4 ++-- src/scss/cdb-components/menu.scss | 14 +++++++------- src/scss/cdb-components/shapes/dots.scss | 2 +- src/scss/cdb-utilities/defaults.css.scss | 2 +- src/scss/cdb-utilities/helpers.scss | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index dcdd55ab0be4f13acd70d48c51d384ce9888cfe3..60e5afa7dded206dbc68f2408afb3f6430b80a3d 100644 GIT binary patch delta 52 zcmZ26nQ_Hr#tAk|)f*?;ZD4wrHSxnVsg2d~{5D@1xEX&j0KujE*ABqw%?lVgJODxR B6@UN$ delta 52 zcmZ26nQ_Hr#tAk|;_oKfZD6_}Gx5VTsdwV>{5D@1xEX&j0KujE$7jOm%?lVgJOCpv B6j}fP diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 3fed9de7d31b9b03ed5b3736774c00e57e43f6cc..4279ce37fc62f7e17efb41b68afa49da758612b6 100644 GIT binary patch delta 45 ucmew}k@3$&#tBYL@3JPkOq1GJ9nWv`m4Tb_7XuJnx_|8ejNbT#!vg@diW4FL delta 45 ucmew}k@3$&#tBYL7i1>7Op|&i9?x&{m4Tb_7XuJnx_^8ojNbT#!vg@GkP;&R diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index bc80aec19be85f7911df131db1f873631099c4de..cf2d67c9cbbd752b885ef2e20854f151ab639848 100644 GIT binary patch delta 59 zcmV-B0L1^iT)bS6dIIihv3$2CC{wP-^V@u7;AZ><6k)h@|Jnf<{igi?cdiJ=KR_-A R0~1IT0KnxClCxVU;RcV995Mg^ delta 59 zcmV-B0L1^iT)bS6dIHcKv3$2CC>M+4`E9;3a5Me_iZEQde|#p4epCMcJ68nbA0U^5 Rfe9oE0I Date: Tue, 9 Feb 2016 18:01:02 +0100 Subject: [PATCH 220/391] Carousel component: minor fix --- src/scss/cdb-components/carousel.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scss/cdb-components/carousel.scss b/src/scss/cdb-components/carousel.scss index 0db7835..7342266 100644 --- a/src/scss/cdb-components/carousel.scss +++ b/src/scss/cdb-components/carousel.scss @@ -25,7 +25,6 @@ @include display-flex(); @include justify-content(flex-start); width: 100%; - font-size: 0; } .CDB-CarouselItem { @include display-flex(); From 3c96d80ae6cf84779fde555de049634c8b56dc00 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 18:04:21 +0100 Subject: [PATCH 221/391] fix cr --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes .../cdb-components/shapes/threePoints.scss | 52 ++++++++---------- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 28a728f668b7bb6868a5eb55ed54f0c854830ce5..747a5fe1b302f08e75e3b48b167411c202181101 100644 GIT binary patch delta 54 zcmZ26nQ_Hr#tAmeo0mFIv|rEk#c$$=snX6%H^=kad}ZKf{KWtSm+s%(1fw@EVC3)s E0Bn~QGXMYp delta 54 zcmZ26nQ_Hr#tAme(>q-z+OKD7ikbLfsS DNjen$ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index cc04eb4e989a4c83cfa7d2cd11882b7f015d57ca..0860a3508a4adce11074a3e92223e532f9f2b3c7 100644 GIT binary patch delta 46 vcmew}k@3$&#tBYLU;HMzOqF(Cx;dWT<|_j?<1YpvxOD&KCK$c(3x@{)#gY?c delta 46 vcmew}k@3$&#tBYLO)(Q)rb@eXPLJoe`O3h}_=^DuF5O?S6Gm_R!r=h`ti=*$ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 8d1d6c8d8df5c64c4795d13aa825252ca29ed532..fc3a8b4ee530a74a8bf7d7a52b8dbb02542c1ca8 100644 GIT binary patch delta 60 zcmV-C0K@;hT)bS6dII!Lv3#~BDNddI@%%Pl8MqmL0Yw-t-M_gBM!zZl|D7v>@eh#8 S!N3F(1pu3M52>?TC*cNj^c%ha delta 60 zcmV-C0K@;hT)bS6dIEx6v3#~BDb6{c Date: Tue, 9 Feb 2016 18:19:06 +0100 Subject: [PATCH 222/391] fix nesting --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes/add.scss | 15 ++++++++------- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 747a5fe1b302f08e75e3b48b167411c202181101..355a86bcd8465e0e4a7a36d670fd515b2103e0a8 100644 GIT binary patch delta 52 zcmZ26nQ_Hr#tAk|=ci1x+raeaz{C&Jq^6vY=ePOFz|HuJ0SGSLzxx_SZ(hL2;Q;_+ CwHCGj delta 52 zcmZ26nQ_Hr#tAk|o0m?s+rae2Z{mk(QcE|-^V@u7;AZ^A00fur-`oVFH!oo1@Bjcx CmKCf3 diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 0860a3508a4adce11074a3e92223e532f9f2b3c7..53a07ce2e0fa51d8706ab74d951cc7344b00f9db 100644 GIT binary patch delta 45 ucmew}k@3$&#tBYLe-2D^nI<*md_2F+R|amzUkpHS>Hgi7fA{5D@1xEX%|MHnvKzxx_SzbXI!ohyRz50J~j RzyuNn0H`| Date: Tue, 9 Feb 2016 18:22:23 +0100 Subject: [PATCH 223/391] fix cr --- src/scss/cdb-components/shapes/add.scss | 2 +- src/scss/cdb-components/shapes/threePoints.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index a2e80b5..ac5616b 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -50,7 +50,7 @@ Description height: 16px; text-align: center; } -.CDB-Shape .is-medium { +.CDB-Shape--medium { width: 24px; height: 24px; } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index fe268d6..2eecdf4 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -6,7 +6,7 @@ Description ```

    24px

    -
    -
    -
    -

    Histogram

    +

    Histogram

    Distribution of a numeric variable in a range

    diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 74c0127..bff3796 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -9,7 +9,7 @@

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    -

    Open Sans 12/16 Semibold Uppercase

    +

    Open Sans 12/16 Semibold Uppercase

    Open Sans 12/16 Regular

    Open Sans 12/16 Regular

    Open Sans 12/16 Regular

    @@ -30,9 +30,6 @@ &.is-light { font-weight: $sFontWeight-lighter; } - &.is-upper { - text-transform: uppercase; - } } .CDB-Size-huge { diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 95d2cb4..024830e 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -73,6 +73,11 @@ display: none !important; } +/* Decoration */ +.u-upperCase { + text-transform: uppercase; +} + /* Media queries*/ @include media-query-mobile() { .u-showDesktop { From ff637c7b36b4cf466eaa0d8e58adce53c94b8477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 16 Feb 2016 14:10:59 +0100 Subject: [PATCH 233/391] Dropdown component: improvements --- src/scss/cdb-components/forms/dropdowns.scss | 60 +++++++++++--------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index 01d3495..7b51912 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -10,27 +10,27 @@
      -
    • +
      • -
    • +
      • -
    • +
      • -
    • +
      • -
    • +
    • @@ -38,20 +38,12 @@
    -
    +
      -
    • - selected -
      • -
    • - active -
      • -
    • - disabled -
      • -
    • - disabled -
      • +
    • selected
      • +
    • active
      • +
    • disabled
      • +
    • disabled
    @@ -62,6 +54,7 @@ @import '../../cdb-utilities/mixins'; @import '../../cdb-variables/sizes'; @import '../../cdb-variables/colors'; +@import '../../cdb-utilities/mixins'; .CDB-DropdownContainer { position: relative; @@ -72,33 +65,31 @@ @include flex-direction(row); position: absolute; top: 40px; - height: 200px; + max-height: 200px; } .CDB-Dropdown-calculations { - display: inline-block; - width: $baseSize * 11; - height: 100%; padding: $sMargin-element; border-right: 1px solid $cMainLine; - border-radius: 3px 0 0 3px; + border-radius: 4px 0 0 4px; background-color: $cSecondaryBackground; box-sizing: border-box; } .CDB-Dropdown-calculationsElement { + margin-bottom: $sLineHeight-medium; font-size: $sFontSize-small; - &:not(:last-child) { - margin-bottom: $sLineHeight-medium; + &:last-child { + margin-bottom: 0; } } .CDB-Dropdown-options { - display: inline-block; width: $baseSize * 20; - border-radius: 0 3px 3px 0; + border-radius: 0 4px 4px 0; background-color: $cWhite; vertical-align: top; } .CDB-Dropdown-optionsElement { + @include text-overflow(); padding: 12px 10px; border-bottom: 1px solid $cMainLine; color: $cBlue; @@ -114,6 +105,21 @@ .CDB-Dropdown-optionsElement.is-selected { color: $cBlack; } +.CDB-Dropdown-optionsElement.is-disabled { + color: $cTypo4; + + &:hover { + background-color: transparent; + cursor: default; + } +} +background-color: rgba(157, 224, 173, 0.2); + cursor: pointer; + } +} +.CDB-Dropdown-optionsElement.is-selected { + color: $cBlack; +} .CDB-Dropdown-optionsElement.is-disabled { color: $cTypo4; } From 0da897e3b7d56a96e5360550e3c49847c3429b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 16 Feb 2016 14:16:51 +0100 Subject: [PATCH 234/391] Dropdown component: improvements --- src/scss/cdb-components/forms/dropdowns.scss | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index 7b51912..a62a826 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -76,6 +76,7 @@ } .CDB-Dropdown-calculationsElement { margin-bottom: $sLineHeight-medium; + color: $cMainDark; font-size: $sFontSize-small; &:last-child { @@ -103,7 +104,7 @@ } } .CDB-Dropdown-optionsElement.is-selected { - color: $cBlack; + color: $cMainDark; } .CDB-Dropdown-optionsElement.is-disabled { color: $cTypo4; @@ -113,13 +114,3 @@ cursor: default; } } -background-color: rgba(157, 224, 173, 0.2); - cursor: pointer; - } -} -.CDB-Dropdown-optionsElement.is-selected { - color: $cBlack; -} -.CDB-Dropdown-optionsElement.is-disabled { - color: $cTypo4; -} From 7cb07e435df0ccaf480557ddf1cba2e200a03062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 16 Feb 2016 14:40:22 +0100 Subject: [PATCH 235/391] Textarea component: minor fix --- src/scss/cdb-components/forms/textarea.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss index 3c1cb5d..e69e455 100644 --- a/src/scss/cdb-components/forms/textarea.scss +++ b/src/scss/cdb-components/forms/textarea.scss @@ -13,7 +13,6 @@ @import '../../cdb-variables/sizes'; @import '../../cdb-variables/colors'; -@import '../../cdb-utilities/mixins'; .CDB-Textarea { width: 100%; From 0ba08fd8de429f1da73bf8b67835f91e81e74edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 16 Feb 2016 14:58:00 +0100 Subject: [PATCH 236/391] Dropdown component: minor fixes --- src/scss/cdb-components/forms/dropdowns.scss | 70 +++++++++----------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index a62a826..aedd0b0 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -8,44 +8,40 @@
    -
    -
      -
    • - - - -
      • -
    • - - - -
      • -
    • - - - -
      • -
    • - - - -
      • -
    • - - - -
      • -
    -
    +
      +
    • + + + +
      • +
    • + + + +
      • +
    • + + + +
      • +
    • + + + +
      • +
    • + + + +
      • +
    -
    -
      -
    • selected
      • -
    • active
      • -
    • disabled
      • -
    • disabled
      • -
    -
    +
      +
    • selected
      • +
    • active
      • +
    • disabled
      • +
    • disabled
      • +
    ``` From 0aeaa4e90497d067d6e510bd747a0aa8f16fe4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 16 Feb 2016 15:02:22 +0100 Subject: [PATCH 237/391] Dropdown component: solved errors after merging master changes --- src/scss/cdb-components/forms/dropdowns.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index aedd0b0..cc3cdab 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -72,7 +72,7 @@ } .CDB-Dropdown-calculationsElement { margin-bottom: $sLineHeight-medium; - color: $cMainDark; + color: $cMainBg; font-size: $sFontSize-small; &:last-child { @@ -100,10 +100,10 @@ } } .CDB-Dropdown-optionsElement.is-selected { - color: $cMainDark; + color: $cMainBg; } .CDB-Dropdown-optionsElement.is-disabled { - color: $cTypo4; + color: $cHintText; &:hover { background-color: transparent; From 161af4654f442d5b84127aaeed03a0172c176870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 16 Feb 2016 15:03:00 +0100 Subject: [PATCH 238/391] Dropdown component: minor fix --- src/scss/cdb-components/forms/dropdowns.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index cc3cdab..871bd49 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -50,7 +50,6 @@ @import '../../cdb-utilities/mixins'; @import '../../cdb-variables/sizes'; @import '../../cdb-variables/colors'; -@import '../../cdb-utilities/mixins'; .CDB-DropdownContainer { position: relative; From 3d14a09b12251a2568edd71f0a2217728a71078c Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Tue, 16 Feb 2016 16:47:33 +0100 Subject: [PATCH 239/391] Closes #70 --- src/scss/cdb-components/menu.scss | 56 ++++++++++++++----------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index e5cbc89..3a1d132 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -9,24 +9,24 @@
    From 444cb84331e658805ba316af0bf9587649cbe818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 18 Feb 2016 14:34:02 +0100 Subject: [PATCH 244/391] Color bar component: improvements and gradient border fix --- src/scss/cdb-components/forms/color_bar.scss | 100 ++++++++++-------- .../cdb-components/forms/option_input.scss | 2 +- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 13f556b..76dd2c7 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -6,99 +6,107 @@ ```
    - - - - - - + + + + + +
    - - - - - - + + + + + +
    - - - - - - + + + + + +
    - - - - - - +
    - -
    - -
    - +
    ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; @import '../../cdb-utilities/mixins'; .CDB-ColorBarContainer { @include display-flex(); @include flex-direction(row); + max-width: 215px; } .CDB-ColorBar { + position: relative; width: 100%; - height: $baseSize / 2; - border: 1px solid rgba(0, 0, 0, 0.2); + height: 6px; border-radius: 6px; + &::after { + content:""; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + } &:last-child { margin-right: 0; } } -.CDB-ColorBar.CDB-ColorBar--small { - width: $baseSize * 2; -} -.CDB-ColorBar.CDB-ColorBar--med { - width: 29px; -} -.CDB-ColorBar.CDB-ColorBar--long { - width: $baseSize * 12; -} .CDB-ColorBar.CDB-ColorBar--compacted { - border-right: 0; - border-left: 0; border-radius: 0; + &::after { + border-width: 1px 0; + border-radius: 0; + } &:first-child { - border-left: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px 0 0 6px; + &::after { + border-width: 1px 0 1px 1px; + border-radius: 6px 0 0 6px; + } } &:last-child { - border-right: 1px solid rgba(0, 0, 0, 0.2); border-radius: 0 6px 6px 0; + &::after { + border-width: 1px 1px 1px 0; + border-radius: 0 6px 6px 0; + } } } .CDB-ColorBar.CDB-ColorBar--uBorder { border-radius: 2px; + &::after { + border-radius: 2px; + } &:first-child { border-radius: 6px 2px 2px 6px; + &::after { + border-radius: 6px 2px 2px 6px; + } } &:last-child { border-radius: 2px 6px 6px 2px; + &:after { + border-radius: 2px 6px 6px 2px; + } } } diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 47e34cd..ca2e43a 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -9,7 +9,7 @@
    - +
    From bde6ec4559093ba84f5515afc14709d0278bcc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 18 Feb 2016 20:02:29 +0100 Subject: [PATCH 245/391] Option input component: improvements --- src/scss/cdb-components/forms/color_bar.scss | 61 ++++++++-------- .../cdb-components/forms/option_input.scss | 73 +++++++++++++++++-- 2 files changed, 96 insertions(+), 38 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 76dd2c7..1b2ab1c 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -5,40 +5,40 @@ # Forms/Color bar ``` -
    - - - - - - -
    +
      +
    • +
    • +
    • +
    • +
    • +
    • +
    -
    - - - - - - -
    +
      +
    • +
    • +
    • +
    • +
    • +
    • +
    -
    - - - - - - -
    +
      +
    • +
    • +
    • +
    • +
    • +
    • +
    -
    - -
    +
      +
    • +
    -
    - -
    +
      +
    • +
    ``` */ @@ -47,6 +47,7 @@ .CDB-ColorBarContainer { @include display-flex(); @include flex-direction(row); + width: 100%; max-width: 215px; } .CDB-ColorBar { diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index ca2e43a..4cc8d86 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -5,15 +5,46 @@ # Forms/Option input ``` -
    - -
    -
    - -
    +
    +
    + 8px
    -
    - ``` + +
    + solid +
    + +
      +
    • +
    + + +
    +
      +
    • +
    +
    + +
    +
      +
    • +
    • +
    • +
    • +
    • +
    • +
    +
    + +
    +
      +
    • +
    • +
    • +
    • +
    +
    +``` */ @import '../../cdb-variables/sizes'; @@ -23,6 +54,7 @@ .CDB-OptionInput { @include display-flex(); @include align-items(center); + @include align-content(center); width: $baseSize * 20; height: $baseSize * 4; padding: $baseSize; @@ -41,3 +73,28 @@ .CDB-OptionInput.is-active { border: 1px solid $cBlue; } +.CDB-OptionInput-element { + @include display-flex(); + @include align-content(center); + color: $cMainBg; + font-size: $sFontSize-medium; + box-sizing: content-box; + + &::after { + content: "·"; + color: $cHintText; + padding: 9px; + } + &:last-child { + &::after { + content: ""; + padding: 0; + } + } +} +.CDB-OptionInput--text { + padding: 9px 0; +} +.CDB-OptionInput--text.is-active { + border-bottom: 1px solid $cMainBg; +} From 89f0e13faecd3d223817c2bbb63c459670a5d7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 18 Feb 2016 20:05:07 +0100 Subject: [PATCH 246/391] Color bar component: style fixes --- src/scss/cdb-components/forms/color_bar.scss | 4 ++-- src/scss/cdb-components/forms/option_input.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 1b2ab1c..95e4edb 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -57,7 +57,6 @@ border-radius: 6px; &::after { - content:""; position: absolute; top: 0; right: 0; @@ -65,6 +64,7 @@ left: 0; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; + content:""; } &:last-child { margin-right: 0; @@ -106,7 +106,7 @@ } &:last-child { border-radius: 2px 6px 6px 2px; - &:after { + &::after { border-radius: 2px 6px 6px 2px; } } diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 4cc8d86..f6fb9eb 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -81,14 +81,14 @@ box-sizing: content-box; &::after { - content: "·"; color: $cHintText; padding: 9px; + content: "·"; } &:last-child { &::after { - content: ""; padding: 0; + content: ""; } } } From 3a2513e2a2e727b546c39b3cdfa0e1f16814af8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 18 Feb 2016 20:06:30 +0100 Subject: [PATCH 247/391] Color bar & option input components: syntax fixes --- src/scss/cdb-components/forms/color_bar.scss | 2 +- src/scss/cdb-components/forms/option_input.scss | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 95e4edb..9e577d3 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -64,7 +64,7 @@ left: 0; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; - content:""; + content: ''; } &:last-child { margin-right: 0; diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index f6fb9eb..4b57d49 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -13,7 +13,7 @@
    solid
    - +
    @@ -81,14 +81,14 @@ box-sizing: content-box; &::after { - color: $cHintText; padding: 9px; - content: "·"; + color: $cHintText; + content: '·'; } &:last-child { &::after { padding: 0; - content: ""; + content: ''; } } } From ff89163f588f88eb920838cfc4e3a0979fe38b83 Mon Sep 17 00:00:00 2001 From: Maria Checa Date: Fri, 19 Feb 2016 16:35:49 +0100 Subject: [PATCH 248/391] Input option markup improvements --- .../cdb-components/forms/option_input.scss | 79 ++++++++++++------- 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 4b57d49..443e0bd 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -5,43 +5,59 @@ # Forms/Option input ``` -
    -
    - 8px -
    +
    +
      +
    • + 8px +
      • -
      - solid -
      - -
        -
      • +
      • + solid +
        • + +
      • +
          +
        • +
        +
    -
      -
    • +
        +
      • +
          +
        • +
        +
    -
      -
    • -
    • -
    • -
    • -
    • -
    • +
        +
      • +
          +
        • +
        • +
        • +
        • +
        • +
        • +
        +
    -
      -
    • -
    • -
    • -
    • +
        +
      • +
          +
        • +
        • +
        • +
        • +
        +
    ``` @@ -53,11 +69,9 @@ .CDB-OptionInput { @include display-flex(); - @include align-items(center); @include align-content(center); width: $baseSize * 20; height: $baseSize * 4; - padding: $baseSize; border: 1px solid $cMainLine; border-radius: $baseSize / 2; box-sizing: border-box; @@ -73,8 +87,15 @@ .CDB-OptionInput.is-active { border: 1px solid $cBlue; } -.CDB-OptionInput-element { +.CDB-OptionInput-container { @include display-flex(); + @include align-items(center); + @include align-content(center); + margin: 0 $baseSize; +} +.CDB-OptionInput-option { + @include display-flex(); + @include align-items(center); @include align-content(center); color: $cMainBg; font-size: $sFontSize-medium; @@ -92,9 +113,7 @@ } } } -.CDB-OptionInput--text { +.CDB-OptionInput-option.is-active > .CDB-OptionInput-optionContent { padding: 9px 0; -} -.CDB-OptionInput--text.is-active { border-bottom: 1px solid $cMainBg; } From 9e0a1d463e3866a69a675343cc8c9a86c966b2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 22 Feb 2016 12:46:12 +0100 Subject: [PATCH 249/391] Input option component: flexbox fixed --- src/scss/cdb-components/forms/option_input.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 443e0bd..1709d26 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -14,7 +14,7 @@
  • solid
    • - +
    • +``` +*/ + +.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; + + &.is-selected { + border-left: 2px solid #FFF; + .CDB-MenuEditor-navigationLink { + opacity: 1; + } + } +} + +.CDB-MenuEditor-navigationLink { + display: block; + height: 24px; + color: #FFF; + font-size: 24px; + opacity: 0.32; +} +.CDB-MenuEditor-navigationLink:hover { + 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-AvatarEditor { + position: absolute; + bottom: $baseSize * 2; + left: $baseSize * 2; + width: 40px; + height: 40px; +} +.CDB-AvatarEditor-img { + width: 100%; + border-radius: $baseSize / 2; +} + diff --git a/src/scss/cdb-icon-font.scss b/src/scss/cdb-icon-font.scss index 9b56a11..f94d288 100644 --- a/src/scss/cdb-icon-font.scss +++ b/src/scss/cdb-icon-font.scss @@ -119,6 +119,30 @@ All available icons in CartoDB. +
    + +

    edition

    +
    + + +
    + +

    view

    +
    + + +
    + +

    clock

    +
    + + +
    + +

    settings

    +
    + +

    wizard

    @@ -716,441 +740,461 @@ All available icons in CartoDB. } -.CDB-IconFont-wizard::before { +.CDB-IconFont-edition::before { content: '\E00E'; } -.CDB-IconFont-info::before { +.CDB-IconFont-view::before { content: '\E00F'; } -.CDB-IconFont-fork::before { +.CDB-IconFont-clock::before { content: '\E010'; } -.CDB-IconFont-facebook::before { +.CDB-IconFont-settings::before { content: '\E011'; } -.CDB-IconFont-folder::before { +.CDB-IconFont-wizard::before { content: '\E012'; } -.CDB-IconFont-dropbox::before { +.CDB-IconFont-info::before { content: '\E013'; } -.CDB-IconFont-cloud::before { +.CDB-IconFont-fork::before { content: '\E014'; } -.CDB-IconFont-step::before { +.CDB-IconFont-facebook::before { content: '\E015'; } -.CDB-IconFont-addDocument::before { +.CDB-IconFont-folder::before { content: '\E016'; } -.CDB-IconFont-arrowNext::before { +.CDB-IconFont-dropbox::before { content: '\E017'; } -.CDB-IconFont-arrowPrev::before { +.CDB-IconFont-cloud::before { content: '\E018'; } -.CDB-IconFont-close::before { +.CDB-IconFont-step::before { content: '\E019'; } -.CDB-IconFont-cartoFante::before { +.CDB-IconFont-addDocument::before { content: '\E01A'; } -.CDB-IconFont-lock::before { +.CDB-IconFont-arrowNext::before { content: '\E01B'; } -.CDB-IconFont-cartoDB::before { +.CDB-IconFont-arrowPrev::before { content: '\E01C'; } -.CDB-IconFont-lens::before { +.CDB-IconFont-close::before { content: '\E01D'; } -.CDB-IconFont-closeLimits::before { +.CDB-IconFont-cartoFante::before { content: '\E01E'; } -.CDB-IconFont-defaultUser::before { +.CDB-IconFont-lock::before { content: '\E01F'; } -.CDB-IconFont-cockroach::before { +.CDB-IconFont-cartoDB::before { content: '\E020'; } -.CDB-IconFont-floppy::before { +.CDB-IconFont-lens::before { content: '\E021'; } -.CDB-IconFont-trash::before { +.CDB-IconFont-closeLimits::before { content: '\E022'; } -.CDB-IconFont-wifi::before { +.CDB-IconFont-defaultUser::before { content: '\E023'; } -.CDB-IconFont-unlock::before { +.CDB-IconFont-cockroach::before { content: '\E024'; } -.CDB-IconFont-unlockWithEllipsis::before { +.CDB-IconFont-floppy::before { content: '\E025'; } -.CDB-IconFont-gift::before { +.CDB-IconFont-trash::before { content: '\E026'; } -.CDB-IconFont-people::before { +.CDB-IconFont-wifi::before { content: '\E027'; } -.CDB-IconFont-play::before { +.CDB-IconFont-unlock::before { content: '\E028'; } -.CDB-IconFont-add::before { +.CDB-IconFont-unlockWithEllipsis::before { content: '\E029'; } -.CDB-IconFont-map::before { +.CDB-IconFont-gift::before { content: '\E02A'; } -.CDB-IconFont-anchor::before { +.CDB-IconFont-people::before { content: '\E02B'; } -.CDB-IconFont-key::before { +.CDB-IconFont-play::before { content: '\E02C'; } -.CDB-IconFont-calendar::before { +.CDB-IconFont-add::before { content: '\E02D'; } -.CDB-IconFont-document::before { +.CDB-IconFont-map::before { content: '\E02E'; } -.CDB-IconFont-eye::before { +.CDB-IconFont-anchor::before { content: '\E02F'; } -.CDB-IconFont-marker::before { +.CDB-IconFont-key::before { content: '\E030'; } -.CDB-IconFont-progressBar::before { +.CDB-IconFont-calendar::before { content: '\E031'; } -.CDB-IconFont-book::before { +.CDB-IconFont-document::before { content: '\E032'; } -.CDB-IconFont-notes::before { +.CDB-IconFont-eye::before { content: '\E033'; } -.CDB-IconFont-rectangles::before { +.CDB-IconFont-marker::before { content: '\E034'; } -.CDB-IconFont-mountain::before { +.CDB-IconFont-progressBar::before { content: '\E035'; } -.CDB-IconFont-points::before { +.CDB-IconFont-book::before { content: '\E036'; } -.CDB-IconFont-snake::before { +.CDB-IconFont-notes::before { content: '\E037'; } -.CDB-IconFont-boss::before { +.CDB-IconFont-rectangles::before { content: '\E038'; } -.CDB-IconFont-rocket::before { +.CDB-IconFont-mountain::before { content: '\E039'; } -.CDB-IconFont-barometer::before { +.CDB-IconFont-points::before { content: '\E03A'; } -.CDB-IconFont-dollar::before { +.CDB-IconFont-snake::before { content: '\E03B'; } -.CDB-IconFont-email::before { +.CDB-IconFont-boss::before { content: '\E03C'; } -.CDB-IconFont-label::before { +.CDB-IconFont-rocket::before { content: '\E03D'; } -.CDB-IconFont-outside::before { +.CDB-IconFont-barometer::before { content: '\E03E'; } -.CDB-IconFont-jigsaw::before { +.CDB-IconFont-dollar::before { content: '\E03F'; } -.CDB-IconFont-tools::before { +.CDB-IconFont-email::before { content: '\E040'; } -.CDB-IconFont-question::before { +.CDB-IconFont-label::before { content: '\E041'; } -.CDB-IconFont-layerStack::before { +.CDB-IconFont-outside::before { content: '\E042'; } -.CDB-IconFont-alarm::before { +.CDB-IconFont-jigsaw::before { content: '\E043'; } -.CDB-IconFont-cloudDownArrow::before { +.CDB-IconFont-tools::before { content: '\E044'; } -.CDB-IconFont-pencil::before { +.CDB-IconFont-question::before { content: '\E045'; } -.CDB-IconFont-fountainPen::before { +.CDB-IconFont-layerStack::before { content: '\E046'; } -.CDB-IconFont-emptyDoc::before { +.CDB-IconFont-alarm::before { content: '\E047'; } -.CDB-IconFont-mergeArrow::before { +.CDB-IconFont-cloudDownArrow::before { content: '\E048'; } -.CDB-IconFont-mergeColumns::before { +.CDB-IconFont-pencil::before { content: '\E049'; } -.CDB-IconFont-mergeSpatial::before { +.CDB-IconFont-fountainPen::before { content: '\E04A'; } -.CDB-IconFont-globe::before { +.CDB-IconFont-emptyDoc::before { content: '\E04B'; } -.CDB-IconFont-chevronDown::before { +.CDB-IconFont-mergeArrow::before { content: '\E04C'; } -.CDB-IconFont-streets::before { +.CDB-IconFont-mergeColumns::before { content: '\E04D'; } -.CDB-IconFont-keys::before { +.CDB-IconFont-mergeSpatial::before { content: '\E04E'; } -.CDB-IconFont-facebookSquare::before { +.CDB-IconFont-globe::before { content: '\E04F'; } -.CDB-IconFont-fullscreen::before { +.CDB-IconFont-chevronDown::before { content: '\E050'; } -.CDB-IconFont-rArrowLight::before { +.CDB-IconFont-streets::before { content: '\E051'; } -.CDB-IconFont-share::before { +.CDB-IconFont-keys::before { content: '\E052'; } -.CDB-IconFont-linkedin::before { +.CDB-IconFont-facebookSquare::before { content: '\E053'; } -.CDB-IconFont-calendarBlank::before { +.CDB-IconFont-fullscreen::before { content: '\E054'; } -.CDB-IconFont-creativeCommons::before { +.CDB-IconFont-rArrowLight::before { content: '\E055'; } -.CDB-IconFont-bubble::before { +.CDB-IconFont-share::before { content: '\E056'; } -.CDB-IconFont-bars::before { +.CDB-IconFont-linkedin::before { content: '\E057'; } -.CDB-IconFont-arrowMenuLight::before { +.CDB-IconFont-calendarBlank::before { content: '\E058'; } -.CDB-IconFont-tieFighter::before { +.CDB-IconFont-creativeCommons::before { content: '\E059'; } -.CDB-IconFont-ray::before { +.CDB-IconFont-bubble::before { content: '\E05A'; } -.CDB-IconFont-markup::before { +.CDB-IconFont-bars::before { content: '\E05B'; } -.CDB-IconFont-table::before { +.CDB-IconFont-arrowMenuLight::before { content: '\E05C'; } -.CDB-IconFont-airlock::before { +.CDB-IconFont-tieFighter::before { content: '\E05D'; } -.CDB-IconFont-pin::before { +.CDB-IconFont-ray::before { content: '\E05E'; } -.CDB-IconFont-attache::before { +.CDB-IconFont-markup::before { content: '\E05F'; } -.CDB-IconFont-download::before { +.CDB-IconFont-table::before { content: '\E060'; } -.CDB-IconFont-group::before { +.CDB-IconFont-airlock::before { content: '\E061'; } -.CDB-IconFont-dashboard::before { +.CDB-IconFont-pin::before { content: '\E062'; } -.CDB-IconFont-spinner::before { +.CDB-IconFont-attache::before { content: '\E063'; } -.CDB-IconFont-mapsearch::before { +.CDB-IconFont-download::before { content: '\E064'; } -.CDB-IconFont-rArrow::before { +.CDB-IconFont-group::before { content: '\E065'; } + + +.CDB-IconFont-dashboard::before { + content: '\E066'; +} + + +.CDB-IconFont-spinner::before { + content: '\E067'; +} + + +.CDB-IconFont-mapsearch::before { + content: '\E068'; +} + + +.CDB-IconFont-rArrow::before { + content: '\E069'; +} From 137e5d28d0ceee563b3c27ff5134d89012ab123c Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 22 Feb 2016 16:44:00 +0100 Subject: [PATCH 252/391] change markup --- src/scss/cdb-components/menu.scss | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 10e265b..6a049dd 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -169,22 +169,22 @@ @@ -210,23 +210,24 @@ padding: 12px $baseSize * 2 12px $baseSize + 6; border-left: 2px solid transparent; text-align: center; - - &.is-selected { - border-left: 2px solid #FFF; - .CDB-MenuEditor-navigationLink { - opacity: 1; - } - } +} +.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; - height: 24px; +} +.CDB-MenuEditor-navigationIcon { color: #FFF; font-size: 24px; + line-height: 24px; opacity: 0.32; } -.CDB-MenuEditor-navigationLink:hover { +.CDB-MenuEditor-navigationLink:hover .CDB-MenuEditor-navigationIcon { opacity: 1; } From 5cdfb1e328047b5bee462c5242bbe07096a8f1cb Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 22 Feb 2016 16:54:08 +0100 Subject: [PATCH 253/391] change icon and fix hound --- icon-font/font.sketch | Bin 1474560 -> 1474560 bytes ...06_Clock.svg => icon-font_106_Odyssey.svg} | 4 ++-- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.svg | 2 +- src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12420 -> 12424 bytes src/scss/cdb-components/menu.scss | 2 +- src/scss/cdb-icon-font.scss | 6 +++--- 8 files changed, 7 insertions(+), 7 deletions(-) rename icon-font/svgs/{icon-font_106_Clock.svg => icon-font_106_Odyssey.svg} (92%) diff --git a/icon-font/font.sketch b/icon-font/font.sketch index 3d9442ffa281a4ee542687f8df3bb37e94517768..602bec5ec6beadeb5877308c5d383117aae47a65 100644 GIT binary patch delta 11674 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 delta 11623 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 diff --git a/icon-font/svgs/icon-font_106_Clock.svg b/icon-font/svgs/icon-font_106_Odyssey.svg similarity index 92% rename from icon-font/svgs/icon-font_106_Clock.svg rename to icon-font/svgs/icon-font_106_Odyssey.svg index a00343d..8564f89 100644 --- a/icon-font/svgs/icon-font_106_Clock.svg +++ b/icon-font/svgs/icon-font_106_Odyssey.svg @@ -1,12 +1,12 @@ - icon-font_106_Clock + icon-font_106_Odyssey Created with Sketch. - + diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 1749d4934bc5ac04be71761462d35e64ea7a5871..ae8470b22428b62ea78ffabdd51fbf15566d1a62 100644 GIT binary patch delta 101 zcmaDbi}ArM#tAkok$vGt6CKtuN&lGmA%89o9mBbqwn8o|2R2CPfR&M^`n#K+QWt}A{ delta 102 zcmaDbi}ArM#tAkoZ|hE5Pjpzv#Md+NLky4hpGl_}7@Rp67&uo=j$qW0u|8e*HlE++ zD+4#7`=G`ql=4(aAtCTo^D!xUP-*6fmytBPJVLs=3lO9>`V*{00_}0 AD*ylh diff --git a/src/fonts/cartoIcon.svg b/src/fonts/cartoIcon.svg index d37ec85..ddb32c5 100644 --- a/src/fonts/cartoIcon.svg +++ b/src/fonts/cartoIcon.svg @@ -52,7 +52,7 @@ - m!I^`Bfpg8oH99gz;eCeO%Mn0q1EUEC2ui delta 92 zcmdlolX1&T#tBYLd_5CgVtBOwOghED;LO3mz`1JT8XXzy({*p-`E9;3a5Mg50D?;& qo?V2|8^5@?hzMsU=jZ9B<>!^e8yc9!JLlvlXK(g%O=D+bU;qFpTOlm~ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index b961f05713ee3e7424bf9f00fffdd7673a0f7f17..bca20ae0a566902021c957ba3264275b1cbaa9c8 100644 GIT binary patch delta 1194 zcmV;b1XcTlVTfT2cTYw}00961001zEkql=EG5`PoHv7;U_>p{X2~Ge239PWTeW$VX zQ79^-u*AZ6ew(ih+>F0~A`F*4ylsckZ_59F=Zawb1LSfrFo8q?hD{GJ0JCo?*8+d{ z-KO`QmOa_+Z5wb7+i{GY^qvZkL1B@oR%=54`f4G`H+*0D@ku-L=FQ9#jZ=-)?{wq; ze~%jtoWcuu5vTDIUdAhU6|doSyn#3I7T(4goW(hu#|2!(C0xc8T*Wn9#|^xLcX1Q% z;eC975AhK`#wYj`pW$gkSJ0e#7th1ApQ#5dMZh9|H^_af}hh zP7@8rLe9uow>y&hQ}+stBQh0NN9hfkk*}L zP)Y}8Uh+#V+8WEjO7eh#>#UXjeJHkTe}!jXQ-SqdhKFD50#v+T}0d&N*%rc#hBE9sjjoOW7ww_3~U z`8hee!jOzMhQqcQR8y%Pt0fF*!&)=nlTX&*a0TyMdBSpqQJt%ltQlcUTYfrBS7;|0 zhcKZXKXZ(In67TNH~F;|?MPiRs$sUuv7@HStsUglmdBzh+)*hlBO8A;Y0IawMhwPG z!6=|^VP>-hD5l~dN4MYUkd4-T(B96ePcu+^-x%j#`LV^ z{Nsc=3&}I2KBb*V%fx?w+zlB7uoa^Qp>6|!W6 zl7MzirJYckP&^=u9oDqBl@ynW1BYVe&tFvkeow3V0xem*0wbBuCWr>pK&HREsfpJ17p(i z!zS%WE<;~sc(B5^Oi@jB$xp)7NpB{c5?s1gMB9bwOU9-Z*YOieoNK zUR%f9JDwQw90_e(Q_a}Et<8 delta 1190 zcmV;X1X=rtVT54}cTYw}00961001zAkql=EGXMYpHv7;HjFEhA2}u9|392jnlFG64 zQ79_wQ$eip{5D@1xEX%|MHnu9cy92 z5AWjxe29!a2JQTha>cGjQeN(-ciwp|srWDq7rZczLWO%f~yQ(O7gqVM}3TfS0 z1|@W4<|V(B(#}{8CL0XOsBKlh-!J3^hURoUSI$Yx7`2*B8VD<0+sySE-l9D<8oPc~ z^fx#jQ0K|4Fjk)9Xy`MV+1ka3Iz#1@(Q6lDdZ6U|Jcp8%bekMYsVALNdQ`4mrHATY zVTVkRR*P=w6T^{!y2f%nS|NXR#X$Crneb?lzgG;UWg4~OWgUI z(oQJN^2Y%k8l@fgjX0#9785RB9Qn*8-?%vTb~BhrKDlv1p0Jrp?ZK?OVR?>> zI#Z#zr^Pw#iM}k@*d|T7Te(sVxnxO;ZmUr#=Iq0Twv+GdzKN#v6( zr1k#0X30rysKQRKGU(}Y*Z#L$NY0@iFg;KOYg>|e*H{Vc&p4BumbUKafiX$_ut__T z%g~n@-df>1rl_X6%R z>XKETrq7+R_fLQ2-vLhDS6UTCIq+dL&zX~5ma}{x7{9DZy|ItMM9Jz`L{H>U=_?Ek zp6}9jA@t-LJMwF0rLX+4mu5OOnoncq=d-F`HC9s=*VD*r%953{?n_-QDYBZfl#Z3` z)~Mv`o@I0-7CcqH+}LWy>dTvSEY{!D+*^mTwQI3px!*=M#ha0bwB`ILj=3~>Z5?y( zcw)$N#I$QoHDmjhC)D
  • - +
  • diff --git a/src/scss/cdb-icon-font.scss b/src/scss/cdb-icon-font.scss index f94d288..7f12248 100644 --- a/src/scss/cdb-icon-font.scss +++ b/src/scss/cdb-icon-font.scss @@ -132,8 +132,8 @@ All available icons in CartoDB.
    - -

    clock

    + +

    odyssey

    @@ -750,7 +750,7 @@ All available icons in CartoDB. } -.CDB-IconFont-clock::before { +.CDB-IconFont-odyssey::before { content: '\E010'; } From 73a3675b5fd066781d0b98819ba9868703d372fd Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 22 Feb 2016 17:12:18 +0100 Subject: [PATCH 254/391] fix CR --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/menu.scss | 8 ++++---- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index ae8470b22428b62ea78ffabdd51fbf15566d1a62..4f461cd8bf57861cb8fba6b79bb5a4455f2f77b4 100644 GIT binary patch delta 52 zcmaDbi}ArM#tAk|wRIEiHZUnaoA_axR9$U6zs*+$ZpL2>Kyc~9$2u6jc>&`AZva6Q B72E&- delta 52 zcmaDbi}ArM#tAk|k$n^GHZV#5nD}9uR9|E~zs*+$ZpL2>Kyc~9+jbbec>&`AZvZ_U B703Vp diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 5ef3b1a6a4205f65c633cedcca96657279cd3847..c23969acb99ae6bb4560fb8edfa35a32938ec3bb 100644 GIT binary patch delta 45 ucmdlolX1&T#tBYL%FiacOp~gsjpw)d%D~O|ivb8OefU@hqc?sz;0*wd!xFIo delta 45 ucmdlolX1&T#tBYL(my7;Oq1%1jOVxc%D~O|ivb8OeR$grqc?sz;0*wdHxjV` diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index bca20ae0a566902021c957ba3264275b1cbaa9c8..e3e9849615c66858ef0074eaf7b90f7930778e4c 100644 GIT binary patch delta 66 zcmV-I0KNZ+VTfUna|ts5001`o&?Dxte9I^(z^U>4HeVUI8Givq7%qMISO=rul>h(E Y6~Xui$mL*Q0*L|uh`SFuvu`OG2hm3yzyJUM delta 66 zcmV-I0KNZ+VTfUna|tp4001`o&>Q%%e9I^(#KL%fo39MqjK6>)43|E`DfkXj@O%E^tvu`OG2k+V(>Hq)$ diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 9b88eea..0d0c91c 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -189,8 +189,8 @@
    • - - + +
    ``` @@ -243,14 +243,14 @@ text-align: center; } -.CDB-AvatarEditor { +.CDB-MenuEditor-avatar { position: absolute; bottom: $baseSize * 2; left: $baseSize * 2; width: 40px; height: 40px; } -.CDB-AvatarEditor-img { +.CDB-MenuEditor-avatarImage { width: 100%; border-radius: $baseSize / 2; } From e9bdd7017c97406a553af1c9da78471659cce211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 22 Feb 2016 17:13:50 +0100 Subject: [PATCH 255/391] Option input content: fixes --- src/scss/cdb-components/forms/option_input.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 1d41e53..0e37183 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -88,6 +88,7 @@ border-radius: $baseSize / 2; box-sizing: border-box; cursor: pointer; + vertical-align: middle; &:hover { border: 1px solid $cHoverLine; @@ -115,7 +116,7 @@ box-sizing: content-box; &::after { - padding: 9px; + padding: 0 9px; color: $cHintText; content: '·'; } @@ -129,6 +130,9 @@ } } .CDB-OptionInput-optionContent { + @include display-flex(); + @include align-items(center); + height: 100%; color: $cMainBg; &:hover { @@ -136,6 +140,5 @@ } } .CDB-OptionInput-option.is-active > .CDB-OptionInput-optionContent { - padding: 9px 0; border-bottom: 1px solid $cMainBg; } From 475376be43f4893d5103db92bd4072a4ad7bcb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 22 Feb 2016 18:09:52 +0100 Subject: [PATCH 256/391] Option input component: ninja fixes --- src/scss/cdb-components/forms/color_bar.scss | 35 ++++++++++++------- .../cdb-components/forms/option_input.scss | 14 ++++---- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 9e577d3..59672e2 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -6,21 +6,21 @@ ```
      -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +
      -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +
      @@ -70,6 +70,13 @@ margin-right: 0; } } +.CDB-ColorBar.CDB-ColorBar--sMargin { + margin-right: 4px; + + &:last-child { + margin-right: 0; + } +} .CDB-ColorBar.CDB-ColorBar--compacted { border-radius: 0; @@ -92,7 +99,8 @@ } } } -.CDB-ColorBar.CDB-ColorBar--uBorder { +.CDB-ColorBar.CDB-ColorBar--sRadius { + margin-right: 2px; border-radius: 2px; &::after { @@ -105,6 +113,7 @@ } } &:last-child { + margin-right: 0; border-radius: 2px 6px 6px 2px; &::after { border-radius: 2px 6px 6px 2px; diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 0e37183..3886b06 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -5,23 +5,23 @@ # Forms/Option input ``` -
    • - solid +
    • - +
    - +
  • - +
    • - + +
  • +
    • -
  • - +
  • +
    • -
  • -
    • -
    +
    + +
      -
    • - +
    • +
      • -
    • -
    - - - +
    + +
    +
    + + + +
    +
    + + ``` */ @@ -82,7 +84,7 @@ @import '../../cdb-utilities/mixins'; .CDB-OptionInput { - width: $baseSize * 20; + width: 100%; height: $baseSize * 4; border: 1px solid $cMainLine; border-radius: $baseSize / 2; @@ -106,7 +108,7 @@ @include align-items(center); margin: 0 $baseSize; } -.CDB-OptionInput-option { +.CDB-OptionInput-item { @include display-flex(); @include align-items(center); @include align-content(center); @@ -129,7 +131,7 @@ } } } -.CDB-OptionInput-optionContent { +.CDB-OptionInput-content { @include display-flex(); @include align-items(center); height: 100%; @@ -141,6 +143,6 @@ text-decoration: none; } } -.CDB-OptionInput-option.is-active > .CDB-OptionInput-optionContent { +.CDB-OptionInput-item.is-active > .CDB-OptionInput-content { border-bottom: 1px solid $cMainBg; } From fdc9b62cb55995da9e8162c537f2638f94d41c0b Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Tue, 23 Feb 2016 10:15:22 +0100 Subject: [PATCH 259/391] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 489ae06..9875bc6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.25", + "version": "0.1.26", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", From 33608a1197403293714e3dc586836c42247613f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 23 Feb 2016 10:51:27 +0100 Subject: [PATCH 260/391] Color bar component: minor fixes --- src/scss/cdb-components/forms/color_bar.scss | 2 +- .../cdb-components/forms/option_input.scss | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 9e41642..0bfd1ff 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -111,4 +111,4 @@ .CDB-ColorBar.CDB-ColorBar--spaceSmall:last-child { margin-right: 0; border-radius: 3px 6px 6px 3px; -} \ No newline at end of file +} diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index b609508..4e0cd11 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -53,12 +53,12 @@ @@ -69,10 +69,10 @@ From bbc4f383c8a68f25ff53f87dca4ee87ca72d0d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 23 Feb 2016 11:03:30 +0100 Subject: [PATCH 261/391] Color bar component: minor fix --- src/scss/cdb-components/forms/color_bar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 0bfd1ff..87c5c15 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -63,6 +63,7 @@ height: 6px; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; + box-sizing: border-box; &:last-child { margin-right: 0; From 231e72cfd94abe6baf4c67b0c677a283eee07fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 23 Feb 2016 11:10:43 +0100 Subject: [PATCH 262/391] Option input component: minor fix --- src/scss/cdb-components/forms/option_input.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 4e0cd11..2325393 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -118,7 +118,7 @@ box-sizing: content-box; &::after { - padding: 0 9px; + padding: 0 6px; color: $cHintText; content: '·'; } From b7847b25ab2a9cf7a9e717e4bcf1c03803af29b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 23 Feb 2016 11:23:49 +0100 Subject: [PATCH 263/391] Color bar & option input component: minor improvements --- src/scss/cdb-components/forms/color_bar.scss | 17 +++++++++-------- src/scss/cdb-components/forms/option_input.scss | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/scss/cdb-components/forms/color_bar.scss b/src/scss/cdb-components/forms/color_bar.scss index 87c5c15..6c2efc6 100644 --- a/src/scss/cdb-components/forms/color_bar.scss +++ b/src/scss/cdb-components/forms/color_bar.scss @@ -50,6 +50,7 @@ ``` */ +@import '../../cdb-variables/sizes'; @import '../../cdb-utilities/mixins'; .CDB-ColorBarContainer { @@ -60,9 +61,9 @@ .CDB-ColorBar { position: relative; width: 100%; - height: 6px; + height: $baseSize - 2; border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; + border-radius: $baseSize - 2; box-sizing: border-box; &:last-child { @@ -79,12 +80,12 @@ bottom: 0; left: 0; border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; + border-radius: $baseSize - 2; content: ''; } } .CDB-ColorBar.CDB-ColorBar--spaceMedium { - margin-right: 4px; + margin-right: $baseSize / 2; &:last-child { margin-right: 0; @@ -96,20 +97,20 @@ } .CDB-ColorBar.CDB-ColorBar--spaceless:first-child { border-width: 1px 0 1px 1px; - border-radius: 6px 0 0 6px; + border-radius: $baseSize - 2 0 0 $baseSize - 2; } .CDB-ColorBar.CDB-ColorBar--spaceless:last-child { border-width: 1px 1px 1px 0; - border-radius: 0 6px 6px 0; + border-radius: 0 $baseSize - 2 $baseSize - 2 0; } .CDB-ColorBar.CDB-ColorBar--spaceSmall { margin-right: 2px; border-radius: 2px; } .CDB-ColorBar.CDB-ColorBar--spaceSmall:first-child { - border-radius: 6px 3px 3px 6px; + border-radius: $baseSize - 2 3px 3px $baseSize - 2; } .CDB-ColorBar.CDB-ColorBar--spaceSmall:last-child { margin-right: 0; - border-radius: 3px 6px 6px 3px; + border-radius: 3px $baseSize - 2 $baseSize - 2 3px; } diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 2325393..8bcc2c2 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -118,7 +118,7 @@ box-sizing: content-box; &::after { - padding: 0 6px; + padding: 0 $baseSize - 2; color: $cHintText; content: '·'; } From d91131ae1697023374b0523e7ea78e0b820e35e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 23 Feb 2016 11:39:19 +0100 Subject: [PATCH 264/391] Input option component: minor improvements --- src/scss/cdb-components/forms/option_input.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 8bcc2c2..b56f6ad 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -89,7 +89,6 @@ border: 1px solid $cMainLine; border-radius: $baseSize / 2; box-sizing: border-box; - cursor: pointer; vertical-align: middle; &:hover { @@ -126,8 +125,7 @@ width: 100%; &::after { - padding: 0; - content: ''; + display: none; } } } From 78829e693cf95b5e8646e2917ddb4ff404fc63a4 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 23 Feb 2016 13:48:27 +0100 Subject: [PATCH 265/391] use flexbox for forms --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/forms/inputs.scss | 1 + src/scss/cdb-components/forms/legends.scss | 34 +++++++++++++-------- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 4f461cd8bf57861cb8fba6b79bb5a4455f2f77b4..7c041fd67c9dc3d89dfb7223bf3145e2c23f7714 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmeE5m{(+OK22WPV}dhpE!RVJqYLZN4&aGyY-#f=eHN7sKey3m6Z0 F0|1Y57h3=T delta 55 zcmaDbi}ArM#tAmewRPbW?bk71P<}S?!&K?;y4rYto39MqjK3Iw;L?YWbufDK0>%U0 E0FOc!TL1t6 diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index c23969acb99ae6bb4560fb8edfa35a32938ec3bb..5c1ab9f2b8af39cd35faeb0156097d9c67ab847a 100644 GIT binary patch delta 47 wcmdlolX1&T#tDwhm&`9rbeSq09JVr^-{va=H{&k`Ah`7LcQK6K_~n2%0Ku9Q*Z=?k delta 47 wcmdlolX1&T#tDwh7nGk(beSq0URN8>Z}XLboADO|5M283u?|LW{Bpn>0Ku9Q*Z=?k diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index e3e9849615c66858ef0074eaf7b90f7930778e4c..2ae2e07295f28d245aa4fdcd9956467050e10f15 100644 GIT binary patch delta 59 zcmV-B0L1@@VTfUnc>~fn(6M~VC?_DzgYo<}Um3U=e*r}pE`9u645Qza|NqVv!T1Nr R~ZR=CORrC?~MMsqy?aUm3U=e*r}pE`9h|2czGV|NqVv!T1Nr RN8^Hho diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 4c5b843..6559fe0 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/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; diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index d9c7317..20483ae 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -35,37 +35,45 @@

    -
    -

    RADIO

    -
      -
    • -
      +
      +

      RADIO

      +
        +
      • +
      • -
      -
    -
    -

    RADIO

    -
    - -
    -
    +
    +
    +

    RADIO

    + +
    ``` */ @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%; +} + From 528684e56afb8ffc713b08d17feab9b1f78a57de Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 23 Feb 2016 16:32:51 +0100 Subject: [PATCH 266/391] add fake styles --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/forms/selects.scss | 41 +++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 4f461cd8bf57861cb8fba6b79bb5a4455f2f77b4..24a7919ed93c008db4aae7f544384aa46d3fbc14 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmebIXG!+OK22v^;F$hpEy*<#XftZN4&aGyY-#f=i!_&0zHA1&jy0 E0e*xPaR2}S delta 55 zcmaDbi}ArM#tAmewRPbW?bk71P<}S?!&K?;y4rYto39MqjK3Iw;L?YWbufDK0>%U0 E0FOc!TL1t6 diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index c23969acb99ae6bb4560fb8edfa35a32938ec3bb..0983811406dbafe16084f78b3b5a05981569e390 100644 GIT binary patch delta 47 wcmdlolX1&T#tDwhmzIZ3beSq0R6aMJ-{va=H{&k`Ah`6&*bGK*{Bpn>0Ix9-+5i9m delta 47 wcmdlolX1&T#tDwh7nGk(beSq0URN8>Z}XLboADO|5M283u?|LW{Bpn>0Ku9Q*Z=?k diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index e3e9849615c66858ef0074eaf7b90f7930778e4c..3b22183b33fce5c755fa035a4668dff4e25856bb 100644 GIT binary patch delta 67 zcmV-J0KET*VTfUna|tp4001`o(x+Cje99;(K(DRw{5D@1xEX%|MHnu9GB$(JZ_59F Z=Zawb1LSfrFo8q?TiOjq0JCo?83)9k8=C+C delta 67 zcmV-J0KET*VTfUna|ts5001`o&?Dxte99;(u)wMD{5D@1xEX%|MHnu9_*e&{-<1FV Z&K1G<2gv1MU;>E(0EoK}I + + + ``` */ +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; + .CDB-Select { position: relative; } @@ -28,3 +40,32 @@ position: absolute; top: 40px; } + +.CDB-SelectFake { + -webkit-appearance: none; + appearance: none; + width: 100%; + padding: 7px 8px 6px; + border: 1px solid $cMainLine; + border-radius: $baseSize / 2; + background: $cWhite; + font-size: $sFontSize-medium; + line-height: $sLineHeight-medium; + + &:hover { + border: 1px solid $cHoverLine; + } + &:focus { + border: 1px solid $cBlue; + outline: none; + } + &:disabled { + border-color: $cSecondaryLine; + background: $cThirdBackground; + } + &.has-error { + border: 1px solid rgba($cError, 0.48); + background: rgba($cError, 0.04); + color: $cError; + } +} From 33c4e818470d37cad3bd865137bf584020025070 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 23 Feb 2016 16:35:39 +0100 Subject: [PATCH 267/391] fix hound --- src/scss/cdb-components/forms/selects.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/forms/selects.scss b/src/scss/cdb-components/forms/selects.scss index 89a0125..7e6775a 100644 --- a/src/scss/cdb-components/forms/selects.scss +++ b/src/scss/cdb-components/forms/selects.scss @@ -18,7 +18,7 @@
    @@ -172,6 +172,7 @@ .CDB-HeaderInfo { @include display-flex(); + @include align-items(flex-start); &.is-block { display: block; From 2e276841bf7557bff8d8a07c05b2cc33af728c5f Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 26 Feb 2016 16:53:00 +0100 Subject: [PATCH 284/391] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d03f13..e721206 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.29", + "version": "0.1.30", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", From aa922b2886804ae8bf33ac93c77fe945dd6d23b8 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 29 Feb 2016 18:31:11 +0100 Subject: [PATCH 285/391] add tooltips --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/tooltips.scss | 149 ++++++++++++++++++-------- 4 files changed, 106 insertions(+), 43 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 60395bd08a68c4496daaa89d8aa47d87a534b833..0b1791b04110ae5e1b3b26feca9e3113cfa77e32 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmeYabd-v|q>ksK{^PhpEy=57)-?+k9o8-{va=H{&k`Ah`5PViSzs_~n2%0J?Az*#H0l delta 47 wcmdlolX1&T#tDwhH{Va1=rUE>`MGL5zs*+$ZpL2>Kyc~n^$-}n@yh{k0MGan*Z=?k diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 7fe2d582efed965bf69847de33b3cc5a29321986..7a09d7083d93be0243a131e181ea8999ce53af85 100644 GIT binary patch delta 61 zcmV-D0K)%>VTfUnc?05dPO*H-C@I4&N8|ZzzA|t#{sM|HT>2%k2}Zvu|NosUg7FWK T%fY||5(NN#>JDVTfUnc>~$+lCgZsC@H61w( -
    -

    627K Transactions

    +
    +
    +

    627K Transactions

    -
    -
    -
    -
    - -
    -
    -

    Hello I am a Form error

    +
    +
    +

    627K Transactions

    -
    -
    -
    -
    - -
    -
    -

    627K Transactions

    +
    +
    +

    627K Transactions

    -
    -
    -
    -
    - -
    -
    -

    Hello I am a Form error

    +
    +
    +

    627K Transactions

    +
    +
    +

    627K Transactions

    +
    +
    + +
    +
    +

    627K Transactions

    +
    +
    + + +
    +
    +

    627K Transactions

    +
    +
    + +
    +
    +

    627K Transactions

    +
    +
    ``` */ -@import '../cdb-variables/sizes'; +@import '../cdb-utilities/mixins'; @import '../cdb-variables/colors'; +@import '../cdb-variables/sizes'; .CDB-Tooltip { + display: inline-block; position: absolute; - padding: 8px; - border-radius: 4px; + padding: $baseSize; + border-radius: $halfBaseSize; background: rgba($cMainBg, 0.8); - color: $cWhite; } - -.CDB-Tooltip:before { +.CDB-Tooltip:after { display: block; position: absolute; - top: -12px; - left: calc(50% - 6px); width: 0; height: 0; - border: 6px solid transparent; - border-bottom: 6px solid rgba($cMainBg, 0.8); + border: 4px solid transparent; content: ''; } +.is-black { + &.CDB-Tooltip.CDB-Tooltip--up:after { + border-bottom-color: rgba($cMainBg, 0.8); + } + &.CDB-Tooltip.CDB-Tooltip--down:after { + border-top-color: rgba($cMainBg, 0.8); + } + &.CDB-Tooltip.CDB-Tooltip--left:after { + border-right-color: rgba($cMainBg, 0.8); + } + &.CDB-Tooltip.CDB-Tooltip--right:after { + border-left-color: rgba($cMainBg, 0.8); + } +} + +.is-error { + &.CDB-Tooltip.CDB-Tooltip--up:after { + border-bottom-color: $cError; + } + &.CDB-Tooltip.CDB-Tooltip--down:after { + border-top-color: $cError; + } + &.CDB-Tooltip.CDB-Tooltip--left:after { + border-right-color: $cError; + } + &.CDB-Tooltip.CDB-Tooltip--right:after { + border-left-color: $cError; + } +} + +.CDB-Tooltip.CDB-Tooltip--up:after { + top: -$baseSize; + left: calc(50% - #{$halfBaseSize}); + border-top-width: $halfBaseSize; + border-top-style: solid; +} + +.CDB-Tooltip.CDB-Tooltip--down:after { + bottom: -$baseSize; + left: calc(50% - #{$halfBaseSize}); + border-top-width: $halfBaseSize; + border-top-style: solid; +} + +.CDB-Tooltip.CDB-Tooltip--left:after { + top: calc(50% - #{$halfBaseSize}); + left: -$baseSize; + border-right-width: $halfBaseSize; + border-right-style: solid; +} + +.CDB-Tooltip.CDB-Tooltip--right:after { + top: calc(50% - #{$halfBaseSize}); + right: -$baseSize; + border-right-width: $halfBaseSize; + border-right-style: solid; +} + .CDB-Tooltip.is-error { background: $cError; } -.CDB-Tooltip.is-error:before { - border-bottom: 6px solid $cError; +.CDB-Tooltip-text { + color: $cWhite; } - - From d55ff5823682f34758a06ac7d06fc97a250e6805 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 29 Feb 2016 21:00:03 +0100 Subject: [PATCH 286/391] fix hound --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/tooltips.scss | 26 +++++++++++++------------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 0b1791b04110ae5e1b3b26feca9e3113cfa77e32..051e7c50c57c247ebedb5b704dcbf5762dac9901 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmeSN9rDv|q>kn8j-1hpEzrd#}dx+k9o+v delta 55 zcmaDbi}ArM#tAmeYabd-v|q>ksK{^PhpEy=57)-?+k9o8-{va=H{&k`Ah`5PViSzs_~n2%0J?Az*#H0l diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 7a09d7083d93be0243a131e181ea8999ce53af85..1e0eba1aab60dca79eb2d5e6b117ebb47399750a 100644 GIT binary patch delta 61 zcmV-D0K)%>VTfUnc?07FI6!`0!F_n|NosUg7FWK T%fY||5(NN?DGu|qZz&lEXQUen delta 61 zcmV-D0K)%>VTfUnc?05dPO*H-C@I4&N8|ZzzA|t#{sM|HT>2%k2}Zvu|NosUg7FWK T%fY||5(NN#>JD Date: Fri, 4 Mar 2016 18:19:48 +0100 Subject: [PATCH 287/391] Input dropdown: style minor fix --- src/scss/cdb-components/forms/dropdowns.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index 871bd49..5ca9443 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -95,6 +95,7 @@ } &:hover { background-color: rgba(157, 224, 173, 0.2); + color: $cMainBg; cursor: pointer; } } From 6b684d46e2fad7ae7d59a11b00e998daca8c5d2c Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 17 Mar 2016 16:54:58 +0100 Subject: [PATCH 288/391] Changed class name of the tooltips --- src/scss/cdb-components/tooltips.scss | 68 +++++++++++++-------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/scss/cdb-components/tooltips.scss b/src/scss/cdb-components/tooltips.scss index 8eed3b7..49cd210 100644 --- a/src/scss/cdb-components/tooltips.scss +++ b/src/scss/cdb-components/tooltips.scss @@ -1,57 +1,57 @@ -// Tooltip +// Info Tooltip // ---------------------------------------------- /* SG -# Tooltip +# Info Tooltip ```
    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    -
    -

    627K Transactions

    +
    +

    627K Transactions

    @@ -65,14 +65,14 @@ @import '../cdb-variables/sizes'; -.CDB-Tooltip { +.CDB-InfoTooltip { display: inline-block; position: absolute; padding: $baseSize; border-radius: $halfBaseSize; background: rgba($cMainBg, 0.8); } -.CDB-Tooltip::after { +.CDB-InfoTooltip::after { display: block; position: absolute; width: 0; @@ -82,67 +82,67 @@ } .is-black { - &.CDB-Tooltip.CDB-Tooltip--up::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--up::after { border-bottom-color: rgba($cMainBg, 0.8); } - &.CDB-Tooltip.CDB-Tooltip--down::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--down::after { border-top-color: rgba($cMainBg, 0.8); } - &.CDB-Tooltip.CDB-Tooltip--left::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--left::after { border-right-color: rgba($cMainBg, 0.8); } - &.CDB-Tooltip.CDB-Tooltip--right::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--right::after { border-left-color: rgba($cMainBg, 0.8); } } .is-error { - &.CDB-Tooltip.CDB-Tooltip--up::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--up::after { border-bottom-color: $cError; } - &.CDB-Tooltip.CDB-Tooltip--down::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--down::after { border-top-color: $cError; } - &.CDB-Tooltip.CDB-Tooltip--left::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--left::after { border-right-color: $cError; } - &.CDB-Tooltip.CDB-Tooltip--right::after { + &.CDB-InfoTooltip.CDB-InfoTooltip--right::after { border-left-color: $cError; } } -.CDB-Tooltip.CDB-Tooltip--up::after { +.CDB-InfoTooltip.CDB-InfoTooltip--up::after { top: -$baseSize; left: calc(50% - #{$halfBaseSize}); border-top-width: $halfBaseSize; border-top-style: solid; } -.CDB-Tooltip.CDB-Tooltip--down::after { +.CDB-InfoTooltip.CDB-InfoTooltip--down::after { bottom: -$baseSize; left: calc(50% - #{$halfBaseSize}); border-top-width: $halfBaseSize; border-top-style: solid; } -.CDB-Tooltip.CDB-Tooltip--left::after { +.CDB-InfoTooltip.CDB-InfoTooltip--left::after { top: calc(50% - #{$halfBaseSize}); left: -$baseSize; border-right-width: $halfBaseSize; border-right-style: solid; } -.CDB-Tooltip.CDB-Tooltip--right::after { +.CDB-InfoTooltip.CDB-InfoTooltip--right::after { top: calc(50% - #{$halfBaseSize}); right: -$baseSize; border-right-width: $halfBaseSize; border-right-style: solid; } -.CDB-Tooltip.is-error { +.CDB-InfoTooltip.is-error { background: $cError; } -.CDB-Tooltip-text { +.CDB-InfoTooltip-text { color: $cWhite; } From 2f0b6c785470ef056ee537d43d41f8d72ed0f1d8 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 23 Mar 2016 11:33:18 +0100 Subject: [PATCH 289/391] add new button size and fix size typography --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/buttons.scss | 52 ++++++++++++++++++-- src/scss/cdb-components/shapes/dataset.scss | 4 +- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 051e7c50c57c247ebedb5b704dcbf5762dac9901..e91245e1b39e98329d12cfdc77758ad494c2e2a2 100644 GIT binary patch delta 58 zcmaDbi}ArM#tAkoU#IReoanHI<&WG9t%)C|$QbUL`Zb>4<|_j?<1YpvxGbT)07h?K Iz<9tL0N;rguK)l5 delta 58 zcmaDbi}ArM#tAkoSN9qkO>|hp^7}E1)x-}|WQ+{=UXACs`O3h}_=^DuF8xYe0i!oB IU_9Ur0NmCXEdT%j diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index c7112e76b6da87e0625901f91931ae8a976b9ab9..7855043e93426609f62ec515e88608f703020318 100644 GIT binary patch delta 49 ycmdlolX1&T#t9BAf8=IpO>~(eW4LST*LZ%LuMFIbzZihvvV`^m7`^e!0dD}&ClUw% delta 49 ycmdlolX1&T#t9BAzaO($O>~(eV`RAZYCONqR|amzUkpHS=~vM!zZl a|D7v>@eh#8!N3F(1ptaE4)e2bDH#XUpd66^ diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index a862ec3..3c70554 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -8,14 +8,24 @@ Layout Component: [CDB-Button][CDB-Button--primary | CDB-Button--secondary] ``` - - + + + + + @@ -33,14 +43,23 @@ Layout Component:
    - - + + + + @@ -64,9 +83,11 @@ Layout Component: .CDB-Button { - padding: $baseSize $baseSize + 12; + padding: $baseSize + 1 $baseSize + 12; + border: 1px solid transparent; border-radius: $baseSize / 2; cursor: pointer; + box-sizing: border-box; .CDB-Button-Text { display: block; @@ -80,6 +101,11 @@ Layout Component: .CDB-Button--small { padding: $baseSize - 3 $baseSize + 4; } + +.CDB-Button--big { + padding: $baseSize + 4 $baseSize + 12; +} + .CDB-Button--icon { padding: 7px 9px; } @@ -114,6 +140,14 @@ Layout Component: # Buttons/Secondary ``` + + + + @@ -135,6 +169,14 @@ Layout Component:
    + + + + diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 0639597..71930a1 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -83,10 +83,8 @@ Description .CDB-Shape-Dataset { padding-top: 1px; - padding-left: 10px; &.is-small { padding-top: 0; - padding-left: 7px; } } @@ -101,6 +99,7 @@ Description &:first-child { position: relative; + margin-left: 0; box-shadow: 3px 0 0 $cWhite; z-index: 1; } @@ -112,6 +111,7 @@ Description height: 6px; margin-left: -7px; &:first-child { + margin-left: 0; box-shadow: 2px 0 0 $cWhite; } } From 012ea610b02d903d0b94426c36db5970f8698ed2 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 28 Mar 2016 10:38:09 +0200 Subject: [PATCH 290/391] fix button height --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/buttons.scss | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index e91245e1b39e98329d12cfdc77758ad494c2e2a2..15ca0590cb96891990de084a3149997ae07ad65b 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAme2WKysXupnGd#cOC4^yQV%sv>;Z}XLboADO|5L}j9r3<4sFJL_2 F4FG}_6$k(T delta 55 zcmaDbi}ArM#tAmeU#ISxXupnGZid#x4^yRgP5m0rZ}XLboADO|5L}kfUI3#vFJL_2 F4FHd<6;J>G diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 7855043e93426609f62ec515e88608f703020318..a31c7d96f5d3b9b24987133b11bd85a04c0e6751 100644 GIT binary patch delta 47 wcmdlolX1&T#tDwh+EZO7x=fW`F#BLUzs*+$ZpL2>KyX=Zl`f3l_~n2%0GW*t+W-In delta 47 wcmdlolX1&T#tDwhax=6hx=fYcHT7#ezs*+$ZpL2>KyXE(0AU;r5wmY883*Ez9D@J= delta 67 zcmV-J0KET*VTfUna|tp4001`p9+)bze99;(oteDx{5D@1xEX%|MHntiXfJ@#Z_59F Z=Zawb1LSfrFo8q?K0FLI0JCo?83&p@8ZiI> diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index 3c70554..ec8be31 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -99,7 +99,7 @@ Layout Component: } .CDB-Button--small { - padding: $baseSize - 3 $baseSize + 4; + padding: $baseSize / 2 $baseSize + 4; } .CDB-Button--big { From 00e41cd0518c7e75b08c2de0392769ec3df486ca Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 28 Mar 2016 15:41:36 +0200 Subject: [PATCH 291/391] fix min width --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/headers.scss | 1 + 4 files changed, 1 insertion(+) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 15ca0590cb96891990de084a3149997ae07ad65b..80a7e60755d48e4edca4ebbecc2da50c82ea5b78 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmeN2}&fv|q=pqk3rKhpE!@tB%I=+k9o;Z}XLboADO|5L}j9r3<4sFJL_2 F4FG}_6$k(T diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index a31c7d96f5d3b9b24987133b11bd85a04c0e6751..d434cdf6c00da93a4f2ee256caa7f6d9be2656ed 100644 GIT binary patch delta 47 wcmdlolX1&T#tDwhI;w{zx=fXxUv)H|-{va=H{&k`Ah;~|DF;Sx{Bpn>0HMGU+5i9m delta 47 wcmdlolX1&T#tDwh+EZO7x=fW`F#BLUzs*+$ZpL2>KyX=Zl`f3l_~n2%0GW*t+W-In diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index f1f38813749c887d94e7af98401b6dd1e467cec3..0a80ba47b8f3fd6c453f6568cc6fb92a3fce9408 100644 GIT binary patch delta 61 zcmV-D0K)%>VTfUnc>^pZ!m)hHC@FcqcjNhOzA|t#{sM|HT$cNk1Eb%R|NqVv!T1Nr TVTfUnc>^nzM6rCzC@J}QH{ Date: Tue, 29 Mar 2016 10:23:54 +0200 Subject: [PATCH 292/391] fix move shape and add grey version --- src/scss/cdb-components/shapes/move.scss | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index db5a45f..3cde123 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -23,6 +23,15 @@ Description
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -55,6 +64,15 @@ Description
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -77,6 +95,7 @@ Description padding: 3px 0 0 1px; .CDB-Shape-MoveItem { + height: 2px; margin-bottom: 2px; &::before { @@ -92,6 +111,7 @@ Description } .CDB-Shape-MoveItem { + height: 3px; margin-bottom: 3px; &:last-child { @@ -128,3 +148,10 @@ Description background: $cWhite; } } + +.CDB-Shape-MoveItem.is-grey { + &::before, + &::after { + background: $cHoverLine; + } +} From d247d29120bf57a45f572c070054d8abf29ff54a Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 29 Mar 2016 10:34:32 +0200 Subject: [PATCH 293/391] fix CR --- src/scss/cdb-components/shapes/move.scss | 78 ++++++++++++------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index 3cde123..1d6c720 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -7,37 +7,37 @@ Description

    16px

    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    @@ -48,37 +48,37 @@ Description

    12px

    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    @@ -87,14 +87,14 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape-Move { +.CDB-Shape-move { padding: 1px 0 0; } -.CDB-Shape-Move.is-small { +.CDB-Shape-move.is-small { padding: 3px 0 0 1px; - .CDB-Shape-MoveItem { + .CDB-Shape-moveItem { height: 2px; margin-bottom: 2px; @@ -110,7 +110,7 @@ Description } } -.CDB-Shape-MoveItem { +.CDB-Shape-moveItem { height: 3px; margin-bottom: 3px; @@ -135,21 +135,21 @@ Description } } -.CDB-Shape-MoveItem.is-blue { +.CDB-Shape-moveItem--blue { &::before, &::after { background: $cBlue; } } -.CDB-Shape-MoveItem.is-white { +.CDB-Shape-moveItem--white { &::before, &::after { background: $cWhite; } } -.CDB-Shape-MoveItem.is-grey { +.CDB-Shape-moveItem--grey { &::before, &::after { background: $cHoverLine; From 469850129f8524b5a4a28e81fbfeca7fc65c73db Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 29 Mar 2016 10:47:20 +0200 Subject: [PATCH 294/391] fix CR --- src/scss/cdb-components/shapes/move.scss | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index 1d6c720..7e4b655 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -17,27 +17,27 @@ Description
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    @@ -58,27 +58,27 @@ Description
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    From 4d7455e4ce179453631549d92fd1d4ef534766e6 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 29 Mar 2016 11:13:09 +0200 Subject: [PATCH 295/391] change class name --- src/scss/cdb-components/shapes/move.scss | 78 ++++++++++++------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index 7e4b655..9d7cf25 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -7,37 +7,37 @@ Description

    16px

    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    @@ -48,37 +48,37 @@ Description

    12px

    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    +
    @@ -87,14 +87,14 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape-move { +.CDB-Shape-rectsHandle { padding: 1px 0 0; } -.CDB-Shape-move.is-small { +.CDB-Shape-rectsHandle.is-small { padding: 3px 0 0 1px; - .CDB-Shape-moveItem { + .CDB-Shape-rectsHandleItem { height: 2px; margin-bottom: 2px; @@ -110,7 +110,7 @@ Description } } -.CDB-Shape-moveItem { +.CDB-Shape-rectsHandleItem { height: 3px; margin-bottom: 3px; @@ -135,21 +135,21 @@ Description } } -.CDB-Shape-moveItem--blue { +.CDB-Shape-rectsHandleItem--blue { &::before, &::after { background: $cBlue; } } -.CDB-Shape-moveItem--white { +.CDB-Shape-rectsHandleItem--white { &::before, &::after { background: $cWhite; } } -.CDB-Shape-moveItem--grey { +.CDB-Shape-rectsHandleItem--grey { &::before, &::after { background: $cHoverLine; From 36cac6ccc0a75db3c71fba285922b3a292bddaf6 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Thu, 31 Mar 2016 17:19:16 +0200 Subject: [PATCH 296/391] use box-sizing --- src/scss/cdb-components/forms/textarea.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss index e69e455..79b10e4 100644 --- a/src/scss/cdb-components/forms/textarea.scss +++ b/src/scss/cdb-components/forms/textarea.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; From fd975d00e0e643f747097321317d8d3ea2dfc03d Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 1 Apr 2016 12:40:23 +0200 Subject: [PATCH 297/391] add changes --- src/scss/cdb-components/forms/tabsForms.scss | 101 ++++++++++++++++ src/scss/cdb-components/shapes/paragraph.scss | 112 ++++++++++++++++++ 2 files changed, 213 insertions(+) create mode 100644 src/scss/cdb-components/forms/tabsForms.scss create mode 100644 src/scss/cdb-components/shapes/paragraph.scss diff --git a/src/scss/cdb-components/forms/tabsForms.scss b/src/scss/cdb-components/forms/tabsForms.scss new file mode 100644 index 0000000..d0b5f34 --- /dev/null +++ b/src/scss/cdb-components/forms/tabsForms.scss @@ -0,0 +1,101 @@ +// Tabs Forms styles +// ---------------------------------------------- + +/* SG +# Forms/TabsForms + +``` +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +
    +``` +*/ + +@import '../../cdb-utilities/mixins'; +@import '../../cdb-variables/sizes'; +@import '../../cdb-variables/colors'; + + +.CDB-TabsForms { + border: 1px solid $cMainLine; + border-radius: 4px; +} +.CDB-TabsForms-inner { + @include display-flex(); +} +.CDB-TabsForms-item { + border-left: 1px solid $cSecondaryLine; +} +.CDB-TabsForms-item:first-child { + border-left: 0; +} +.CDB-TabsForms-button { + padding: 7px 8px; +} + + + + + + diff --git a/src/scss/cdb-components/shapes/paragraph.scss b/src/scss/cdb-components/shapes/paragraph.scss new file mode 100644 index 0000000..548b574 --- /dev/null +++ b/src/scss/cdb-components/shapes/paragraph.scss @@ -0,0 +1,112 @@ +/* SG +# Shapes/Paragrapgh + +Description + +``` +

    16px

    +
    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +
    +
    +
    +
    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +
    +
    +
    +
    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +
    +``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape-paragraph { + padding-top: 3px; + text-align: left; +} +.CDB-Shape-paragraph.is-center { + text-align: center; +} +.CDB-Shape-paragraph.is-right { + text-align: right; +} +.CDB-Shape-paragraphItem { + height: 1px; + margin-bottom: 2px; +} +.CDB-Shape-paragraphItem:last-child { + margin-bottom: 0; +} + +.CDB-Shape-paragraphBar { + display: inline-block; + height: 1px; + margin-bottom: 2px; + background: $cSecondaryLine; + vertical-align: top; +} + +.CDB-Shape-paragraph.is-active .CDB-Shape-paragraphBar { + background: $cBlue; +} + +.CDB-Shape-paragraphBar--01 { + width: 12px; +} +.CDB-Shape-paragraphBar--02 { + width: 6px; +} +.CDB-Shape-paragraphBar--03 { + width: 8px; +} +.CDB-Shape-paragraphBar--04 { + width: 4px; +} From 389a834d279548b95169404a3fb6082756db1ff2 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 6 Apr 2016 16:07:34 +0200 Subject: [PATCH 298/391] add type layer --- src/scss/cdb-components/shapes/type.scss | 115 +++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 src/scss/cdb-components/shapes/type.scss diff --git a/src/scss/cdb-components/shapes/type.scss b/src/scss/cdb-components/shapes/type.scss new file mode 100644 index 0000000..2aaa67a --- /dev/null +++ b/src/scss/cdb-components/shapes/type.scss @@ -0,0 +1,115 @@ +/* SG +# Shapes/Type + +Description + +``` +

    8px

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; +} +.CDB-Shape--small { + width: 8px; + height: 8px; +} +.CDB-Shape--medium { + width: 24px; + height: 24px; +} +.CDB-Shape:hover { + cursor: pointer; +} + +.CDB-Type { + position: relative; + width: 100%; + height: 100%; +} + +.CDB-Type-circle { + position: absolute; + width: 3px; + height: 3px; + border-radius: 50%; + background: $cHoverLine; +} +.CDB-Type-circle--01 { + top: 0; + left: 0; +} +.CDB-Type-circle--02 { + top: 0; + right: 0; +} +.CDB-Type-circle--03 { + bottom: 0; + left: 0; +} +.CDB-Type-circle--04 { + right: 0; + bottom: 0; +} + +.CDB-Type--polygon::before { + display: block; + position: absolute; + top: 1px; + right: 1px; + bottom: 1px; + left: 1px; + border: 1px solid $cHoverLine; + content: ''; +} + +.CDB-Type--line::before { + display: block; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 3px; + width: 1px; + transform: rotate(45deg); + background: $cHoverLine; + content: ''; +} + + + + From e010394bb191afc0dcd47f2f5df809ea8089d6f4 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 6 Apr 2016 16:09:46 +0200 Subject: [PATCH 299/391] fix point type --- src/scss/cdb-components/shapes/type.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/shapes/type.scss b/src/scss/cdb-components/shapes/type.scss index 2aaa67a..c4edab5 100644 --- a/src/scss/cdb-components/shapes/type.scss +++ b/src/scss/cdb-components/shapes/type.scss @@ -8,9 +8,9 @@ Description
    -
    +
    From e9728de4201ed2fa516b8201d698cf08cf9f56a5 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 6 Apr 2016 16:21:58 +0200 Subject: [PATCH 300/391] remove blank lines --- src/scss/cdb-components/shapes/type.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/scss/cdb-components/shapes/type.scss b/src/scss/cdb-components/shapes/type.scss index c4edab5..1a6decc 100644 --- a/src/scss/cdb-components/shapes/type.scss +++ b/src/scss/cdb-components/shapes/type.scss @@ -109,7 +109,3 @@ Description background: $cHoverLine; content: ''; } - - - - From 34b33cfd4334c56300dfcefeb41cf75a6e175bf6 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 12 Apr 2016 11:30:09 +0200 Subject: [PATCH 301/391] change toggle color --- src/scss/cdb-components/forms/toggle.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss index 244dbdf..6fb8bae 100644 --- a/src/scss/cdb-components/forms/toggle.scss +++ b/src/scss/cdb-components/forms/toggle.scss @@ -49,7 +49,7 @@ } &:checked + .CDB-ToggleFace { - background: $cMainBg; + background: $cHighlight; &::before { right: 2px; From f5e41a5cc8f201b87e845ca17a46877014072bf5 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 18 Apr 2016 13:51:07 +0200 Subject: [PATCH 302/391] change font-icon --- icon-font/svgs/icon-font_107_Settings.svg | 2 +- src/fonts/cartoIcon.eot | Bin 19808 -> 19720 bytes src/fonts/cartoIcon.svg | 2 +- src/fonts/cartoIcon.ttf | Bin 19636 -> 19548 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12372 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icon-font/svgs/icon-font_107_Settings.svg b/icon-font/svgs/icon-font_107_Settings.svg index aa42f1c..f59b69d 100644 --- a/icon-font/svgs/icon-font_107_Settings.svg +++ b/icon-font/svgs/icon-font_107_Settings.svg @@ -7,7 +7,7 @@ - + diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 80a7e60755d48e4edca4ebbecc2da50c82ea5b78..99e0715feb5dba02fee91da2bb52d3ef6e26efaf 100644 GIT binary patch delta 342 zcmaDbi?L%CBP)k514GP2R&y3f9?rIj4s%4ZXV2ndU|{uOV6b+`NKH)nlN|VH;s+fT zjpI^WlNA`11$!76n3M|gi%T|at6k2(;Iv_K2%~{a8z+xsJipCX25!b*3_x(%s-p%* zZ(hK-l)1i)bsg&+HX$|>wm7yPwkPa->`v@S><#R*I7B$?IQ=*~IM;B#;)>&H;dbCI z;aJ!hb~ML{db~iF^>16Ezbp5Pc*TATA?rXC%HuB1>X{#0`mGk};C&B)>=* zN%=_SNG*^$B6UORkF=Pyn{=A=0U0rw2$>#PCD}gN1)IOIx^qdfgS^4m!|2Dr!N9{H jz#zq-%An6+#lRpuxmLh(@&y5HMwQ8;f*PA`1XXMRWH?=g delta 432 zcmeB}#rR+rBWr>$1H+bytmZ67tL7U{beJR3=iPRIfq~VBfx&u4MrvZpA05?06F=y% z7&I%+nykR6Eck?hfk~+#zqn+>w%X+k49*;rLl_NY4ChxJjpw)d%D~O|ivb8O%YDj$ z(VG`AE@iG?#CnU3gUyaDfvt;e2fF~f6?-0gANv~iV;l|~S)5gzTR3lUiE(vtZQ#z~ zUch~hM~UYFZxQbl-d(&m_`LXP_?Gc)Nx({=K~P9ANpOweJE1h8 zE}Lr>aI!BC8tVY~JJj+P@iNrLCGmQd zfTffu4=3XSP97f4e+isCq7p)k3xp&jg#IN6Nlcy~pe + horiz-adv-x="500" d=" M174.166667 291.5055639999992C174.166667 291.7786340000003 174.392779 292 174.672232 292L395.327768 292C395.606984 292 395.8333330000001 291.7801280000004 395.8333330000001 291.5055639999992L395.8333330000001 271.6611020000001C395.8333330000001 271.3880329999993 395.6082840000001 271.1666669999995 395.3428790000001 271.1666669999995C395.3428790000001 271.1666669999995 268.649937 271.1666669999995 177.3046870000001 271.1666669999995L173.696606 271.1666669999995C173.9562129999999 271.1666669999995 174.166667 271.3865389999992 174.166667 271.6611020000001L174.166667 291.5055639999992z M104.166667 146.1666669999995H245.833334V125.3333336999995H104.166667z M314.166667 146.1666669999995H395.8333337V125.3333336999995H314.166667z M135.416667 250.3333330000005C152.675565 250.3333330000005 166.666667 264.3244350000005 166.666667 281.5833330000005C166.666667 298.8422320000009 152.675565 312.8333330000005 135.416667 312.8333330000005C118.157768 312.8333330000005 104.166667 298.8422320000009 104.166667 281.5833330000005C104.166667 264.3244350000005 118.157768 250.3333330000005 135.416667 250.3333330000005L135.416667 250.3333330000005zM135.416667 229.5L135.416667 229.5C106.651836 229.5 83.3333333000001 252.8185030000004 83.3333333000001 281.5833330000005C83.3333333000001 310.3481639999991 106.651836 333.6666667000009 135.416667 333.6666667000009C164.181497 333.6666667000009 187.5 310.3481639999991 187.5 281.5833330000005C187.5 252.8185030000004 164.181497 229.5 135.416667 229.5L135.416667 229.5z M281.25 104.5C298.5088980000001 104.5 312.5 118.491102 312.5 135.75C312.5 153.0088980000001 298.5088980000001 167 281.25 167C263.991102 167 250 153.0088980000001 250 135.75C250 118.491102 263.991102 104.5 281.25 104.5L281.25 104.5zM281.25 83.6666669999995L281.25 83.6666669999995C252.4851690000001 83.6666669999995 229.166667 106.9851689999996 229.166667 135.75C229.166667 164.5148310000004 252.4851690000001 187.8333330000005 281.25 187.8333330000005C310.014831 187.8333330000005 333.3333330000001 164.5148310000004 333.3333330000001 135.75C333.3333330000001 106.9851689999996 310.014831 83.6666669999995 281.25 83.6666669999995L281.25 83.6666669999995z" /> diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index d434cdf6c00da93a4f2ee256caa7f6d9be2656ed..2198bac6bdcb73252d59ca2acd2a1cd8c8e9c30e 100644 GIT binary patch delta 324 zcmdlolkv_B#t8-@*|TSHF)*>*TfQK!5#(%CZ&S> z;*t&9YL_!GIBl4?!a$~tlSeY1-{va=H{&k`Ah>MRQ3Inlep$*~U&gwQ^$wd5n+aPS zTMye4c0P6|_9XTO_E{Vv9Cn<3oE@BNIA3waakX$eaF=i|;{L|7h1ZQYgSU@&4WAre z0ACef7vB-S5BzfcDg4*?zX|XOga|wnG!twPJS1c#6el!8=z_44@G9XyB61=rBIiUt zh{}nYi57@H5(^NQ5w|lE-yxADu|VR6#4pJh$#s%nq>Q9|q;jMdNF9;7A@xUEOxjI4 zP5OY0m`sFBkF1hxpX`FoUaan1QtTjKF!nI|F>o;OFbFV6F{m==GgvV&2v5GqZ#h{- RK$}rza;AXB<_Q8SHUNeZTB-m5 delta 414 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 delta 10384 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 From 8ea6ac154f7e80295005ad71ec9f62c946887cb3 Mon Sep 17 00:00:00 2001 From: xavijam Date: Mon, 18 Apr 2016 16:04:38 +0200 Subject: [PATCH 303/391] Adding fields error state --- src/scss/cdb-components/forms/inputs.scss | 9 ++++++--- src/scss/cdb-components/forms/selects.scss | 10 +++++++--- src/scss/cdb-components/forms/textarea.scss | 12 +++++++----- src/scss/cdb-utilities/helpers.scss | 9 ++++++++- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 6559fe0..950aa91 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/src/scss/cdb-components/forms/inputs.scss @@ -13,6 +13,7 @@ @import '../../cdb-variables/sizes'; @import '../../cdb-variables/colors'; +@import '../../cdb-utilities/helpers'; .CDB-InputText { width: 100%; @@ -34,8 +35,10 @@ background: $cThirdBackground; } &.has-error { - border: 1px solid rgba($cError, 0.48); - background: rgba($cError, 0.04); - color: $cError; + @include default-form-error-style(); } } + +.CDB-FieldError .CDB-InputText { + @include default-form-error-style(); +} diff --git a/src/scss/cdb-components/forms/selects.scss b/src/scss/cdb-components/forms/selects.scss index 7e6775a..0c6cfe0 100644 --- a/src/scss/cdb-components/forms/selects.scss +++ b/src/scss/cdb-components/forms/selects.scss @@ -31,6 +31,7 @@ @import '../../cdb-variables/sizes'; @import '../../cdb-variables/colors'; +@import '../../cdb-utilities/helpers'; .CDB-Select { position: relative; @@ -64,8 +65,11 @@ background: $cThirdBackground; } &.has-error { - border: 1px solid rgba($cError, 0.48); - background: rgba($cError, 0.04); - color: $cError; + @include default-form-error-style(); } } + +.CDB-FieldError .CDB-Select, +.CDB-FieldError .CDB-SelectFake { + @include default-form-error-style(); +} diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss index e69e455..968c2a4 100644 --- a/src/scss/cdb-components/forms/textarea.scss +++ b/src/scss/cdb-components/forms/textarea.scss @@ -13,6 +13,7 @@ @import '../../cdb-variables/sizes'; @import '../../cdb-variables/colors'; +@import '../../cdb-utilities/helpers'; .CDB-Textarea { width: 100%; @@ -34,9 +35,10 @@ border-color: $cSecondaryLine; background: $cThirdBackground; } -} -.CDB-Textarea.has-error { - border: 1px solid rgba($cError, 0.48); - background: rgba($cError, 0.04); - color: $cError; + &:has-error { + @include default-form-error-style(); } +} +.CDB-FieldError .CDB-Textarea { + @include default-form-error-style(); +} diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index aab62bc..dbcb924 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -49,7 +49,7 @@ } // Colors -// Main Text Color is default color +// Main Text Color is default color // ---------------------------------------------- .u-actionTextColor { @@ -93,3 +93,10 @@ display: block !important; } } + +/* helper mixins */ +@mixin default-form-error-style() { + border: 1px solid rgba($cError, 0.48); + background: rgba($cError, 0.04); + color: $cError; +} From 613e9ec17d91073b9828751a273e374626fbf323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Tue, 19 Apr 2016 16:09:11 +0200 Subject: [PATCH 304/391] subnavbar: separate --- src/scss/cdb-components/menu.scss | 85 +++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 2d43f8b..6c5a21c 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -63,6 +63,77 @@
    + +

    +

    + +
    + +
    ``` */ @@ -99,11 +170,17 @@ color: $cMainText; } +// .CDB-NavSubmenu { +// position: absolute; +// right: 0; +// left: 0; +// padding-top: 14px; +// border-bottom: 1px solid $cSecondaryLine; +// } + .CDB-NavSubmenu { - position: absolute; - right: 0; - left: 0; - padding-top: 14px; + margin-top: -5px; + margin-bottom: 18px; border-bottom: 1px solid $cSecondaryLine; } From 6ed206265757c6d2011d148a08e4719fdc0cabac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Tue, 19 Apr 2016 16:25:45 +0200 Subject: [PATCH 305/391] submenu: inside/outside --- src/scss/cdb-components/menu.scss | 114 ++++++++++-------------------- 1 file changed, 37 insertions(+), 77 deletions(-) diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 6c5a21c..f695c31 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -16,7 +16,7 @@
  • -
      +
        • @@ -48,7 +48,7 @@
      • -
          +
            • @@ -67,73 +67,31 @@



            -
            - -
            +
              +
            • + +
              • +
            • + +
              • +
            + ``` */ @@ -170,18 +128,20 @@ color: $cMainText; } -// .CDB-NavSubmenu { -// position: absolute; -// right: 0; -// left: 0; -// padding-top: 14px; -// border-bottom: 1px solid $cSecondaryLine; -// } - .CDB-NavSubmenu { + border-bottom: 1px solid $cSecondaryLine; +} + +.CDB-NavSubmenu--inside { + position: absolute; + right: 0; + left: 0; + padding-top: 14px; +} + +.CDB-NavSubmenu--outside { margin-top: -5px; margin-bottom: 18px; - border-bottom: 1px solid $cSecondaryLine; } .CDB-NavSubmenu-Link { From dc142c313ba3087ed57fad897ff224b9e77261a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Tue, 19 Apr 2016 17:04:05 +0200 Subject: [PATCH 306/391] fix typo: item => Item --- src/scss/cdb-components/menu.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 2d43f8b..11480bd 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -115,7 +115,7 @@ color: $cBlue; } -.CDB-NavSubmenu-item.is-selected .CDB-NavSubmenu-Link { +.CDB-NavSubmenu-Item.is-selected .CDB-NavSubmenu-Link { border-bottom: 1px solid $cMainLine; color: $cMainText; } @@ -141,7 +141,7 @@ color: $cWhite; } - .CDB-NavSubmenu-item.is-selected .CDB-NavSubmenu-Link { + .CDB-NavSubmenu-Item.is-selected .CDB-NavSubmenu-Link { border-bottom: 1px solid $cMainLine; color: $cWhite; } From cafce865744f7b0f5c828c94721805e3a4a07b68 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 20 Apr 2016 12:33:37 +0200 Subject: [PATCH 307/391] fix CR --- src/scss/cdb-components/shapes/paragraph.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/shapes/paragraph.scss b/src/scss/cdb-components/shapes/paragraph.scss index 548b574..9c9517b 100644 --- a/src/scss/cdb-components/shapes/paragraph.scss +++ b/src/scss/cdb-components/shapes/paragraph.scss @@ -48,7 +48,7 @@ Description

            -
              +
                • From a98dfb5115ff01b098326751e08b02cae370b84b Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 20 Apr 2016 18:40:12 +0200 Subject: [PATCH 308/391] fix icon move --- src/scss/cdb-components/shapes/move.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index 9d7cf25..9a2d53d 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -88,6 +88,7 @@ Description @import '../../cdb-variables/colors'; .CDB-Shape-rectsHandle { + position: relative; padding: 1px 0 0; } @@ -101,11 +102,11 @@ Description &::before { width: 2px; height: 2px; + left: 5px; } &::after { width: 2px; height: 2px; - margin-left: 1px; } } } @@ -118,7 +119,9 @@ Description margin-bottom: 0; } &::before { - display: inline-block; + display: block; + position: absolute; + left: 4px; width: 3px; height: 3px; background: $cMainBg; @@ -126,10 +129,11 @@ Description } &::after { - display: inline-block; + display: block; + position: absolute; + left: 9px; width: 3px; height: 3px; - margin-left: 2px; background: $cMainBg; content: ''; } From d76caab37e5f23b20a346658703ca718d6c956b9 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 20 Apr 2016 18:40:40 +0200 Subject: [PATCH 309/391] fix hound --- src/scss/cdb-components/shapes/move.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index 9a2d53d..622ad77 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -100,9 +100,9 @@ Description margin-bottom: 2px; &::before { + left: 5px; width: 2px; height: 2px; - left: 5px; } &::after { width: 2px; From 306a67e27438bd2a67421db91b03fe8f85210460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Wed, 20 Apr 2016 18:54:00 +0200 Subject: [PATCH 310/391] legend with check --- src/scss/cdb-components/forms/legends.scss | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index 20483ae..6a882bb 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -59,6 +59,27 @@
            +
            +
            +
            + +
            +

            + + + +

            + +
            + +
            +

            + + + +

            + +
            ``` */ @@ -69,6 +90,10 @@ width: $baseSize * 12; } +.CDB-Legend--withcheck { + width: ($baseSize * 24); +} + .CDB-Fieldset { @include display-flex(); @include align-items(center); From f6d5aa0d77abb7a79457d3cdd0127fe8c33cd059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Thu, 21 Apr 2016 16:26:01 +0200 Subject: [PATCH 311/391] CDB-Legend--big --- src/fonts/cartoIcon.eot | Bin 19720 -> 19720 bytes src/fonts/cartoIcon.ttf | Bin 19548 -> 19548 bytes src/fonts/cartoIcon.woff | Bin 12372 -> 12372 bytes src/scss/cdb-components/forms/legends.scss | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 99e0715feb5dba02fee91da2bb52d3ef6e26efaf..6fc0859995ae4b4188ab3c428db9319a308667b2 100644 GIT binary patch delta 57 zcmeB}#n>^6ae@s?>ifT~6CKtvXFRZ(_+g4n>)-dO@%%Pl8MqmLF#y43TmO|Xdh-It G3~vC&pBA+M delta 57 zcmeB}#n>^6ae@ttBoAlXM2EG^$$^h1ewZTD#>pcY&u{aUft&Fc0}x!c>ZpOyn-?%< Gcmn_>%S64Z~T(s4FKQW5~~0J delta 48 wcmcaJgYnJ`#tDwh$$^h1x=fL2
            -

            +

            @@ -73,7 +73,7 @@

            -

            +

            @@ -90,7 +90,7 @@ width: $baseSize * 12; } -.CDB-Legend--withcheck { +.CDB-Legend--big { width: ($baseSize * 24); } From 73af1244e74ea2f661b0dda01c012f5e5e002e56 Mon Sep 17 00:00:00 2001 From: xavijam Date: Fri, 22 Apr 2016 13:42:01 +0200 Subject: [PATCH 312/391] Added options for content input, removing separator and margins --- src/scss/cdb-components/forms/option_input.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index b56f6ad..90b9676 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -107,6 +107,9 @@ @include align-items(center); margin: 0 $baseSize; } +.CDB-OptionInput-container--noMargin { + margin: 0; +} .CDB-OptionInput-item { @include display-flex(); @include align-items(center); @@ -129,6 +132,9 @@ } } } +.CDB-OptionInput-item--noSeparator { + content: ''; +} .CDB-OptionInput-content { @include display-flex(); @include align-items(center); From b8387c90c01dd14134e953c29d7546cd765e0910 Mon Sep 17 00:00:00 2001 From: xavijam Date: Fri, 22 Apr 2016 13:58:41 +0200 Subject: [PATCH 313/391] Fixed noSeparator alternative --- src/scss/cdb-components/forms/option_input.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option_input.scss index 90b9676..721032d 100644 --- a/src/scss/cdb-components/forms/option_input.scss +++ b/src/scss/cdb-components/forms/option_input.scss @@ -132,7 +132,7 @@ } } } -.CDB-OptionInput-item--noSeparator { +.CDB-OptionInput-item--noSeparator::after { content: ''; } .CDB-OptionInput-content { From 19e596b714eb0f5116ee2b9c8f64e483c1c3ef00 Mon Sep 17 00:00:00 2001 From: xavijam Date: Fri, 22 Apr 2016 13:59:58 +0200 Subject: [PATCH 314/391] Renamed file with hyphens instead of underscores --- .../cdb-components/forms/{option_input.scss => option-input.scss} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/scss/cdb-components/forms/{option_input.scss => option-input.scss} (100%) diff --git a/src/scss/cdb-components/forms/option_input.scss b/src/scss/cdb-components/forms/option-input.scss similarity index 100% rename from src/scss/cdb-components/forms/option_input.scss rename to src/scss/cdb-components/forms/option-input.scss From 42790930d6fb07e98356ffbd85d946bf96b1d604 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 25 Apr 2016 18:31:52 +0200 Subject: [PATCH 315/391] add new component --- src/scss/cdb-components/boxes.scss | 9 +++ src/scss/cdb-components/forms/dropdowns.scss | 62 ++++++++++++++++++++ src/scss/cdb-components/forms/inputs.scss | 8 +++ src/scss/cdb-components/menu.scss | 6 ++ 4 files changed, 85 insertions(+) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 7289585..d7211ae 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -21,6 +21,15 @@ box-shadow: 0 $baseSize $baseSize * 2 0 rgba(0, 0, 0, 0.16); } +.CDB-Box-ModalHeader { + background: $cSecondaryBackground; +} +.CDB-Box-ModalHeaderItem { + @include display-flex(); + @include align-items(center); + padding: $baseSize + 4 $baseSize * 2; + border-bottom: 1px solid $cMainLine; +} /* SG # Boxes/Loader diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index 5ca9443..f78bd63 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -44,6 +44,68 @@

    • + + +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    + + ``` */ diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 950aa91..151975c 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/src/scss/cdb-components/forms/inputs.scss @@ -38,6 +38,14 @@ @include default-form-error-style(); } } +.CDB-InputTextPlain { + width: 100%; + border: 0; + background: transparent; + font-size: $sFontSize-medium; + line-height: $sLineHeight-medium; + box-sizing: border-box; +} .CDB-FieldError .CDB-InputText { @include default-form-error-style(); diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index f3d0336..9e260cb 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -107,6 +107,12 @@ margin-bottom: 18px; border-bottom: 1px solid $cMainLine; } +.CDB-NavMenu-Inner--no-margin { + margin-bottom: 0; +} +.CDB-NavMenu-Inner--is-dropdown { + padding: $baseSize 0 0 $baseSize * 2; +} .CDB-NavMenu-Link { display: block; From a7b2fbc6375b994886da704d44b2b8f6529bb31c Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 26 Apr 2016 10:34:21 +0200 Subject: [PATCH 316/391] fix pr --- src/scss/cdb-components/boxes.scss | 4 ++-- src/scss/cdb-components/forms/dropdowns.scss | 6 +++--- src/scss/cdb-components/menu.scss | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index d7211ae..5f4e5e2 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -21,10 +21,10 @@ box-shadow: 0 $baseSize $baseSize * 2 0 rgba(0, 0, 0, 0.16); } -.CDB-Box-ModalHeader { +.CDB-Box-modalHeader { background: $cSecondaryBackground; } -.CDB-Box-ModalHeaderItem { +.CDB-Box-modalHeaderItem { @include display-flex(); @include align-items(center); padding: $baseSize + 4 $baseSize * 2; diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index f78bd63..5258392 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -79,9 +79,9 @@
    -
    +
    -
    +
    -
  • +
    • User Name @@ -42,7 +42,7 @@
    • -
  • +

  • Published 8 days ago

    • @@ -53,19 +53,19 @@
    - -
    -
    -

    Stadiums Affected Stadiums Affected Stadiums AffectedStadiums Affected Stadiums Affected Stadiums Affected Stadiums Affected

    +
    +
    +

    Stadiums Affected Stadiums Affected Stadiums AffectedStadiums Affected Stadiums Affected Stadiums Affected Stadiums Affected