cartodb4/CartoAssets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #150 from CartoDB/fix-forms-option

Browse Source 
Remove point in input and add line
This commit is contained in:
piensaenpixel 2016-09-27 16:27:38 +02:00 committed by GitHub
commit 4e9c6706d1
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

28
src/scss/cdb-components/forms/option-input.scss
View File

@ -41,6 +41,25 @@
<br/> <br/>
<div class="CDB-OptionInput is-active CDB-Text">
<ul class="CDB-OptionInput-container">
<li class="CDB-OptionInput-item">
<button type="button" class="CDB-OptionInput-content">8...12</button>
</li>
<li class="CDB-OptionInput-item">
<button type="button" class="CDB-OptionInput-content">solid</button>
</li>
<li class="CDB-OptionInput-item is-active">
<button type="button" class="CDB-ColorBarContainer CDB-OptionInput-content">
<span class="CDB-ColorBar" style="background-color: #FFFFC0;"></span>
</button>
</li>
</ul>
</div>
<br/>
<button type="button" class="CDB-OptionInput"> <button type="button" class="CDB-OptionInput">
<div class="CDB-OptionInput-container"> <div class="CDB-OptionInput-container">
<span class="CDB-ColorBar CDB-ColorBar-gradient" style="background: linear-gradient(90deg, #FFFECA, #9FDAB3, #36B6C5, #207EBA, #203196);"></span> <span class="CDB-ColorBar CDB-ColorBar-gradient" style="background: linear-gradient(90deg, #FFFECA, #9FDAB3, #36B6C5, #207EBA, #203196);"></span>
@ -121,8 +140,8 @@
&::after { &::after {
width: 1px; width: 1px;
height: 1px; height: 100%;
margin: 0 $baseSize - 2; margin-right: $baseSize;
background-color: $cSecondaryLine; background-color: $cSecondaryLine;
content: ''; content: '';
} }
@ -141,6 +160,8 @@
@include display-flex(); @include display-flex();
@include align-items(center); @include align-items(center);
height: 100%; height: 100%;
margin-left: -$baseSize;
padding: 0 $baseSize + 2;
color: $cMainBg; color: $cMainBg;
box-sizing: content-box; box-sizing: content-box;
white-space: nowrap; white-space: nowrap;
@ -149,6 +170,9 @@
text-decoration: none; text-decoration: none;
} }
} }
.CDB-OptionInput-item:first-child .CDB-OptionInput-content {
border-bottom-left-radius: 4px;
}
.CDB-OptionInput-item.is-active > .CDB-OptionInput-content { .CDB-OptionInput-item.is-active > .CDB-OptionInput-content {
border-bottom: 1px solid $cMainBg; border-bottom: 1px solid $cMainBg;
} }