Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

Commit

Permalink
Bulma SCSS 0.7.4
Browse files Browse the repository at this point in the history
Converted from: https://github.com/jgthms/bulma/releases/tag/0.7.4
Many thanks to Jeremy Thomas (@jgthms) and other Bulma contributors
  • Loading branch information
Jim Campbell committed Feb 8, 2019
1 parent 234cd3d commit 3ad510c
Show file tree
Hide file tree
Showing 18 changed files with 184 additions and 85 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Jeremy Thomas
Copyright (c) 2019 Jeremy Thomas

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This is a port of the [Bulma](https://github.com/jgthms/bulma) project SASS
files to the SCSS syntax.

Currently, these files are based on Bulma version 0.7.2, and will be updated
Currently, these files are based on Bulma version 0.7.4, and will be updated
with later releases. The files are converted to SCSS with
[this script](https://gist.github.com/j1mc/ff1ff83e277b1e221761fc0c0ee3b164).

Expand Down
4 changes: 4 additions & 0 deletions base/_generic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ strong {

// Block

fieldset {
border: none;
}

pre {
@include overflow-touch;

Expand Down
20 changes: 20 additions & 0 deletions base/_helpers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,26 @@ $alignments: ("centered": "center", "justified": "justify", "left": "left", "rig
font-weight: $weight-bold !important;
}

.is-family-primary {
font-family: $family-primary !important;
}

.is-family-secondary {
font-family: $family-secondary !important;
}

.is-family-sans-serif {
font-family: $family-sans-serif !important;
}

.is-family-monospace {
font-family: $family-monospace !important;
}

.is-family-code {
font-family: $family-code !important;
}

// Visibility

$displays: "block" "flex" "inline" "inline-block" "inline-flex";
Expand Down
10 changes: 8 additions & 2 deletions base/_minireset.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! minireset.css v0.0.3 | MIT License | github.com/jgthms/minireset.css */
/*! minireset.css v0.0.4 | MIT License | github.com/jgthms/minireset.css */
// Blocks
html,
body,
Expand Down Expand Up @@ -66,12 +66,18 @@ html {

// Media
img,
audio,
embed,
iframe,
object,
video {
height: auto;
max-width: 100%;
}

audio {
max-width: 100%;
}

// Iframe
iframe {
border: 0;
Expand Down
2 changes: 1 addition & 1 deletion bulma.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! bulma.io v0.7.2 | MIT License | github.com/jgthms/bulma */
/*! bulma.io v0.7.4 | MIT License | github.com/jgthms/bulma */
@import "utilities/_all";
@import "base/_all";
@import "elements/_all";
Expand Down
2 changes: 1 addition & 1 deletion components/_message.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $message-header-body-border-width: 0 !default;
color: currentColor;
}

a:not(.button):not(.tag) {
a:not(.button):not(.tag):not(.dropdown-item) {
color: currentColor;
text-decoration: underline;
}
Expand Down
9 changes: 9 additions & 0 deletions components/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -635,3 +635,12 @@ a.navbar-item,
}
}
}


// Combination

.hero {
&.is-fullheight-with-navbar {
min-height: calc(100vh - #{$navbar-height});
}
}
45 changes: 39 additions & 6 deletions elements/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ $button-static-border-color: $grey-lighter !default;
font-size: $size-small;
}

@mixin button-normal {
font-size: $size-normal;
}

@mixin button-medium {
font-size: $size-medium;
}
Expand Down Expand Up @@ -136,7 +140,8 @@ $button-static-border-color: $grey-lighter !default;
color: $button-text-hover-color;
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: transparent;
border-color: transparent;
box-shadow: none;
Expand Down Expand Up @@ -176,7 +181,8 @@ $button-static-border-color: $grey-lighter !default;
color: $color-invert;
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: $color;
border-color: transparent;
box-shadow: none;
Expand All @@ -190,7 +196,8 @@ $button-static-border-color: $grey-lighter !default;
background-color: darken($color-invert, 5%);
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: $color-invert;
border-color: transparent;
box-shadow: none;
Expand Down Expand Up @@ -222,7 +229,8 @@ $button-static-border-color: $grey-lighter !default;
}
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: transparent;
border-color: $color;
box-shadow: none;
Expand All @@ -241,7 +249,8 @@ $button-static-border-color: $grey-lighter !default;
color: $color;
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: transparent;
border-color: $color-invert;
box-shadow: none;
Expand All @@ -256,6 +265,10 @@ $button-static-border-color: $grey-lighter !default;
@include button-small;
}

&.is-normal {
@include button-normal;
}

&.is-medium {
@include button-medium;
}
Expand All @@ -265,7 +278,8 @@ $button-static-border-color: $grey-lighter !default;
}

// Modifiers
&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: $button-disabled-background-color;
border-color: $button-disabled-border-color;
box-shadow: $button-disabled-shadow;
Expand Down Expand Up @@ -327,6 +341,25 @@ $button-static-border-color: $grey-lighter !default;
margin-bottom: 1rem;
}

// Sizes
&.are-small {
.button:not(.is-normal):not(.is-medium):not(.is-large) {
@include button-small;
}
}

&.are-medium {
.button:not(.is-small):not(.is-normal):not(.is-large) {
@include button-medium;
}
}

&.are-large {
.button:not(.is-small):not(.is-normal):not(.is-medium) {
@include button-large;
}
}

&.has-addons {
.button {
&:not(:first-child) {
Expand Down
79 changes: 13 additions & 66 deletions elements/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ $input-background-color: $white !default;
$input-border-color: $grey-lighter !default;
$input-height: $control-height !default;
$input-shadow: inset 0 1px 2px rgba($black, 0.1) !default;
$input-placeholder-color: rgba($input-color, 0.3) !default;

$input-hover-color: $grey-darker !default;
$input-hover-border-color: $grey-light !default;
Expand All @@ -15,6 +16,7 @@ $input-focus-box-shadow-color: rgba($link, 0.25) !default;
$input-disabled-color: $text-light !default;
$input-disabled-background-color: $background !default;
$input-disabled-border-color: $background !default;
$input-disabled-placeholder-color: rgba($input-disabled-color, 0.3) !default;

$input-arrow: $link !default;

Expand Down Expand Up @@ -49,7 +51,7 @@ $help-size: $size-small !default;
color: $input-color;

@include placeholder {
color: rgba($input-color, 0.3);
color: $input-placeholder-color;
}


Expand All @@ -66,14 +68,15 @@ $help-size: $size-small !default;
box-shadow: $input-focus-box-shadow-size $input-focus-box-shadow-color;
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
background-color: $input-disabled-background-color;
border-color: $input-disabled-border-color;
box-shadow: none;
color: $input-disabled-color;

@include placeholder {
color: rgba($input-disabled-color, 0.3);
color: $input-disabled-placeholder-color;
}
}
}
Expand Down Expand Up @@ -184,7 +187,8 @@ $help-size: $size-small !default;
color: $input-hover-color;
}

&[disabled] {
&[disabled],
fieldset[disabled] & {
color: $input-disabled-color;
cursor: not-allowed;
}
Expand Down Expand Up @@ -236,7 +240,8 @@ $help-size: $size-small !default;
display: none;
}

&[disabled]:hover {
&[disabled]:hover,
fieldset[disabled] &:hover {
border-color: $input-disabled-border-color;
}

Expand Down Expand Up @@ -667,7 +672,7 @@ $help-size: $size-small !default;
}
}

&:first-child {
&:first-child:not(:only-child) {
.button,
.input,
.select select {
Expand All @@ -676,7 +681,7 @@ $help-size: $size-small !default;
}
}

&:last-child {
&:last-child:not(:only-child) {
.button,
.input,
.select select {
Expand Down Expand Up @@ -849,71 +854,13 @@ $help-size: $size-small !default;
}

.control {
box-sizing: border-box;
clear: both;
font-size: $size-normal;
position: relative;
text-align: left;

// Modifiers
// DEPRECATED
&.has-icon {
.icon {
color: $input-icon-color;
height: $input-height;
pointer-events: none;
position: absolute;
top: 0;
width: $input-height;
z-index: 4;
}

.input {
&:focus {
& + .icon {
color: $input-icon-active-color;
}
}

&.is-small {
& + .icon {
font-size: $size-small;
}
}

&.is-medium {
& + .icon {
font-size: $size-medium;
}
}

&.is-large {
& + .icon {
font-size: $size-large;
}
}
}

&:not(.has-icon-right) {
.icon {
left: 0;
}

.input {
padding-left: $input-height;
}
}

&.has-icon-right {
.icon {
right: 0;
}

.input {
padding-right: $input-height;
}
}
}

&.has-icons-left,
&.has-icons-right {
.input,
Expand Down
3 changes: 2 additions & 1 deletion elements/_image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ $dimensions: 16 24 32 48 64 96 128 !default;
&.is-9by16,
&.is-1by2,
&.is-1by3 {
img {
img,
.has-ratio {
@extend %overlay;

height: 100%;
Expand Down
Loading

0 comments on commit 3ad510c

Please sign in to comment.