library-mirrors/bulma
1
0
Fork 0
mirror of https://github.com/jgthms/bulma.git synced 2025-01-09 15:44:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #41 from PuerkitoBio/master

Browse Source 
fix is-withicon when used with is-grouped on controls
This commit is contained in:
Jeremy Thomas 2016-02-14 11:40:46 +00:00
commit f1838e993a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bulma/elements/controls.sass
View File

@ -183,14 +183,14 @@
&:not(:last-child) &:not(:last-child)
margin-bottom: 10px margin-bottom: 10px
&.is-withicon &.is-withicon
.fa & > .fa
+fa(14px, 20px) +fa(14px, 20px)
color: $text-light color: $text-light
left: 6px left: 6px
pointer-events: none pointer-events: none
position: absolute position: absolute
top: 6px top: 6px
z-index: 1 z-index: 4
.input .input
padding-left: 32px padding-left: 32px
&:focus + .fa &:focus + .fa

4
css/bulma.css vendored
View File

@ -1080,7 +1080,7 @@ table th {
margin-bottom: 10px; margin-bottom: 10px;
} }
.control.is-withicon .fa { .control.is-withicon > .fa {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
height: 20px; height: 20px;
@ -1093,7 +1093,7 @@ table th {
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;
top: 6px; top: 6px;
z-index: 1; z-index: 4;
} }
.control.is-withicon .input, .control.is-withicon .textarea { .control.is-withicon .input, .control.is-withicon .textarea {

2
css/bulma.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
package.json
View File

@ -23,7 +23,8 @@
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.3.3", "autoprefixer": "^6.3.3",
"captain-git-hook": "~1.0.5", "captain-git-hook": "~1.0.5",
"node-sass": "^3.4.2" "node-sass": "^3.4.2",
"postcss-cli": "^2.5.1"
}, },
"scripts": { "scripts": {
"autoprefix": "postcss --use autoprefixer --output css/bulma.css css/bulma.css", "autoprefix": "postcss --use autoprefixer --output css/bulma.css css/bulma.css",