Ver Fonte

Restructure variables into a single file, Fix title word break

Jeremy Thomas há 9 anos atrás
pai
commit
b7fb0b9ed3

+ 0 - 2
bulma.sass

@@ -1,8 +1,6 @@
 @charset "utf-8"
 
 @import "sass/utilities/utilities"
-@import "sass/config/variables"
-@import "sass/config/generated-variables"
 @import "sass/base/base"
 @import "sass/elements/elements"
 @import "sass/components/components"

+ 0 - 78
sass/config/generated-variables.sass

@@ -1,78 +0,0 @@
-// Colors
-
-$dark: $grey-darker
-$dark-invert: findColorInvert($dark)
-
-$primary-invert: findColorInvert($primary)
-$info: $blue
-$info-invert: findColorInvert($info)
-$success: $green
-$success-invert: findColorInvert($success)
-$warning: $yellow
-$warning-invert: findColorInvert($warning)
-$danger: $red
-$danger-invert: findColorInvert($danger)
-
-$colors: (dark: ($dark, $dark-invert), primary: ($primary, $primary-invert), info: ($info, $info-invert), success: ($success, $success-invert), warning: ($warning, $warning-invert), danger: ($danger, $danger-invert))
-
-$body-background: $grey-lighter
-
-$background: $grey-lighter
-
-$border: $grey-light
-$border-hover: $grey
-
-// Text
-
-$text: $grey-dark
-$text-invert: findColorInvert($text)
-$text-light: $grey
-$text-strong: $grey-darker
-
-// Code
-
-$code: $red
-$code-background: $background
-
-$pre: $text
-$pre-background: $background
-
-// Links
-
-$link: $primary
-$link-invert: $primary-invert
-$link-visited: $purple
-
-$link-hover: $grey-darker
-$link-hover-background: $grey-lighter
-$link-hover-border: $grey-darker
-
-$link-active: $grey-darker
-$link-active-border: $grey-darker
-
-// Controls
-
-$control: $text-strong
-$control-background: $text-invert
-$control-border: $border
-
-$control-hover: $link-hover
-$control-hover-border: $border-hover
-
-$control-active: $link
-$control-active-background: $link
-$control-active-background-invert: $link-invert
-$control-active-border: $link
-
-// Typography
-
-$family-primary: $family-sans-serif
-$family-code: $family-monospace
-
-$size-small: $size-7
-$size-normal: $size-6
-$size-medium: $size-5
-$size-large: $size-3
-$size-huge: $size-1
-
-$sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6

+ 0 - 52
sass/config/variables.sass

@@ -1,52 +0,0 @@
-// Colors
-
-$grey-darker: #222324
-$grey-dark: #69707a
-$grey: #aeb1b5
-$grey-light: #d3d6db
-$grey-lighter: #f5f7fa
-
-$blue: #42afe3
-$green: #97cd76
-$orange: #f68b39
-$purple: #847bb9
-$red: #ed6c63
-$turquoise: #1fc8db
-$yellow: #fce473
-
-$primary: $turquoise
-
-// Typography
-
-$family-sans-serif: "Helvetica Neue", "Helvetica", "Arial", sans-serif
-$family-monospace: "Source Code Pro", "Monaco", "Inconsolata", monospace
-
-$size-1: 48px
-$size-2: 40px
-$size-3: 28px
-$size-4: 24px
-$size-5: 18px
-$size-6: 14px
-
-$size-7: 11px
-
-$weight-title-normal: 300
-$weight-title-bold: 500
-
-// Breakpoints
-
-$tablet: 769px
-$desktop: 980px
-$widescreen: 1180px
-
-// Dimensions
-
-$column-gap: 20px
-
-$header-height: 50px
-
-// Miscellaneous
-
-$easing: ease-out
-$radius: 3px
-$speed: 86ms

+ 1 - 1
sass/elements/titles.sass

@@ -2,7 +2,7 @@
 .subtitle
   @extend .block
   font-weight: $weight-title-normal
-  word-break: break-all
+  word-break: break-word
   em,
   span
     font-weight: $weight-title-normal

+ 1 - 0
sass/utilities/utilities.sass

@@ -4,3 +4,4 @@
 @import "functions"
 @import "mixins"
 @import "animations"
+@import "variables"

+ 145 - 0
sass/utilities/variables.sass

@@ -0,0 +1,145 @@
+// 1. Initial variables
+
+// Colors
+
+$grey-darker: #222324 !default
+$grey-dark: #69707a !default
+$grey: #aeb1b5 !default
+$grey-light: #d3d6db !default
+$grey-lighter: #f5f7fa !default
+
+$blue: #42afe3 !default
+$green: #97cd76 !default
+$orange: #f68b39 !default
+$purple: #847bb9 !default
+$red: #ed6c63 !default
+$turquoise: #1fc8db !default
+$yellow: #fce473 !default
+
+// Typography
+
+$family-sans-serif: "Helvetica Neue", "Helvetica", "Arial", sans-serif !default
+$family-monospace: "Source Code Pro", "Monaco", "Inconsolata", monospace !default
+
+$size-1: 48px !default
+$size-2: 40px !default
+$size-3: 28px !default
+$size-4: 24px !default
+$size-5: 18px !default
+$size-6: 14px !default
+
+$size-7: 11px !default
+
+$weight-title-normal: 300 !default
+$weight-title-bold: 500 !default
+
+// Breakpoints
+
+$tablet: 769px !default
+$desktop: 980px !default
+$widescreen: 1180px !default
+
+// Dimensions
+
+$column-gap: 20px !default
+
+$header-height: 50px !default
+
+// Miscellaneous
+
+$easing: ease-out !default
+$radius: 3px !default
+$speed: 86ms !default
+
+// 2. Primary colors
+
+$primary: $turquoise !default
+
+$info: $blue !default
+$success: $green !default
+$warning: $yellow !default
+$danger: $red !default
+
+$dark: $grey-darker !default
+
+$text: $grey-dark !default
+
+// 3. Generated variables
+
+// Invert colors
+
+$primary-invert: findColorInvert($primary) !default
+
+$info-invert: findColorInvert($info) !default
+$success-invert: findColorInvert($success) !default
+$warning-invert: findColorInvert($warning) !default
+$danger-invert: findColorInvert($danger) !default
+
+$dark-invert: findColorInvert($dark) !default
+
+// General colors
+
+$body-background: $grey-lighter !default
+
+$background: $grey-lighter !default
+
+$border: $grey-light !default
+$border-hover: $grey !default
+
+// Text colors
+
+$text-invert: findColorInvert($text) !default
+$text-light: $grey !default
+$text-strong: $grey-darker !default
+
+// Code colors
+
+$code: $red !default
+$code-background: $background !default
+
+$pre: $text !default
+$pre-background: $background !default
+
+// Link colors
+
+$link: $primary !default
+$link-invert: $primary-invert !default
+$link-visited: $purple !default
+
+$link-hover: $grey-darker !default
+$link-hover-background: $grey-lighter !default
+$link-hover-border: $grey-darker !default
+
+$link-active: $grey-darker !default
+$link-active-border: $grey-darker !default
+
+// Control colors
+
+$control: $text-strong !default
+$control-background: $text-invert !default
+$control-border: $border !default
+
+$control-hover: $link-hover !default
+$control-hover-border: $border-hover !default
+
+$control-active: $link !default
+$control-active-background: $link !default
+$control-active-background-invert: $link-invert !default
+$control-active-border: $link !default
+
+// Typography
+
+$family-primary: $family-sans-serif !default
+$family-code: $family-monospace !default
+
+$size-small: $size-7 !default
+$size-normal: $size-6 !default
+$size-medium: $size-5 !default
+$size-large: $size-3 !default
+$size-huge: $size-1 !default
+
+// 4. Lists and maps
+
+$colors: (dark: ($dark, $dark-invert), primary: ($primary, $primary-invert), info: ($info, $info-invert), success: ($success, $success-invert), warning: ($warning, $warning-invert), danger: ($danger, $danger-invert)) !default
+
+$sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 !default