diff --git a/src/elements/button.less b/src/elements/button.less index 32301f45f..a2a8d2fc2 100755 --- a/src/elements/button.less +++ b/src/elements/button.less @@ -38,7 +38,7 @@ margin: @verticalMargin @horizontalMargin 0em 0em; padding: @verticalPadding @horizontalPadding (@verticalPadding + @shadowOffset); - font-family: @fontFamily; + font-family: @pageFont; text-transform: @textTransform; text-shadow: @textShadow; font-weight: @fontWeight; diff --git a/src/elements/header.less b/src/elements/header.less index 774b06d68..a583f7632 100755 --- a/src/elements/header.less +++ b/src/elements/header.less @@ -25,7 +25,7 @@ /* Standard */ .ui.header { border: none; - font-family: @fontFamily; + font-family: @pageFont; margin: @topMargin 0em @bottomMargin; padding: @verticalPadding @horizontalPadding; font-weight: @fontWeight; diff --git a/src/elements/input.less b/src/elements/input.less index e8d7338e0..7315cd1e9 100755 --- a/src/elements/input.less +++ b/src/elements/input.less @@ -35,7 +35,7 @@ } .ui.input input { width: 100%; - font-family: @fontFamily; + font-family: @pageFont; margin: 0em; padding: @verticalPadding @horizontalPadding; diff --git a/src/modules/checkbox.less b/src/modules/checkbox.less index c6a25efca..0860df7c0 100755 --- a/src/modules/checkbox.less +++ b/src/modules/checkbox.less @@ -233,6 +233,9 @@ transform: none; border-radius: @circularRadius; + transition: + background 0.3s ease + ; } /* Handle */ @@ -253,7 +256,6 @@ border-radius: @circularRadius; transition: - background 0.3s ease 0s, left 0.3s ease 0s ; } diff --git a/src/site.less b/src/site.less index 65a122917..a29ea753d 100755 --- a/src/site.less +++ b/src/site.less @@ -22,15 +22,23 @@ Page *******************************/ +/* UI Requires Border Box */ +*, +*:before, +*:after { + box-sizing: border-box; +} + html, body { font-size: @fontSize; height: 100%; } + body { background: @bodyBackground; - font-family: @fontFamily; + font-family: @pageFont; margin: 0px; padding: 0px; color: @textColor; diff --git a/src/themes/_site/modules/checkbox.overrides b/src/themes/_site/modules/checkbox.overrides new file mode 100644 index 000000000..c5c53367f --- /dev/null +++ b/src/themes/_site/modules/checkbox.overrides @@ -0,0 +1,3 @@ +/******************************* + Overrides +*******************************/ diff --git a/src/themes/_site/modules/checkbox.variables b/src/themes/_site/modules/checkbox.variables new file mode 100644 index 000000000..6f085f935 --- /dev/null +++ b/src/themes/_site/modules/checkbox.variables @@ -0,0 +1,3 @@ +/******************************* + User Variable Overrides +*******************************/ diff --git a/src/themes/default/elements/header.variables b/src/themes/default/elements/header.variables index 59d962791..3f31c70d8 100755 --- a/src/themes/default/elements/header.variables +++ b/src/themes/default/elements/header.variables @@ -18,7 +18,7 @@ Header --------------------*/ -@fontFamily : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; @fontWeight: bold; @textTransform: none; diff --git a/src/themes/default/elements/input.variables b/src/themes/default/elements/input.variables index 3cf5b1ab0..37f640bd1 100755 --- a/src/themes/default/elements/input.variables +++ b/src/themes/default/elements/input.variables @@ -13,7 +13,7 @@ Element --------------------*/ -@fontFamily: "Helvetica Neue", "Helvetica", Arial; +@pageFont: "Helvetica Neue", "Helvetica", Arial; @verticalPadding: 0.65em; @horizontalPadding: 1em; diff --git a/src/themes/default/site.variables b/src/themes/default/site.variables index 9fb03270e..391fbdb2a 100644 --- a/src/themes/default/site.variables +++ b/src/themes/default/site.variables @@ -14,7 +14,7 @@ --------------------*/ @bodyBackground : #FCFCFC; -@fontSize : 15px; +@fontSize : 14px; @textColor : rgba(0, 0, 0, 0.7); @paragraphMargin : 1em 0em; @@ -40,7 +40,7 @@ Fonts --------------------*/ -@fontFamily : Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont : Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif; /*------------------- Icons diff --git a/src/themes/packaged/bookish/elements/header.variables b/src/themes/packaged/bookish/elements/header.variables index b69e411ef..e85ac0e73 100644 --- a/src/themes/packaged/bookish/elements/header.variables +++ b/src/themes/packaged/bookish/elements/header.variables @@ -2,7 +2,7 @@ Header --------------------*/ -@fontFamily : 'Libre Baskerville', serif; +@pageFont : 'Libre Baskerville', serif; @fontWeight: normal; @iconSize: 1.5em; diff --git a/src/themes/packaged/chubby/elements/button.variables b/src/themes/packaged/chubby/elements/button.variables index 408bc5e78..1115b405b 100644 --- a/src/themes/packaged/chubby/elements/button.variables +++ b/src/themes/packaged/chubby/elements/button.variables @@ -3,7 +3,7 @@ --------------------*/ /* Button Variables */ -@fontFamily: 'Source Sans Pro', sans-serif; +@pageFont: 'Source Sans Pro', sans-serif; @textTransform: none; @fontWeight: normal; diff --git a/src/themes/packaged/chubby/elements/header.variables b/src/themes/packaged/chubby/elements/header.variables index 9c6e51053..ad2068aef 100644 --- a/src/themes/packaged/chubby/elements/header.variables +++ b/src/themes/packaged/chubby/elements/header.variables @@ -2,7 +2,7 @@ Header --------------------*/ -@fontFamily : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; @fontWeight: bold; @textTransform: none; diff --git a/src/themes/packaged/github/elements/button.variables b/src/themes/packaged/github/elements/button.variables index e283abdff..465b4f4c5 100644 --- a/src/themes/packaged/github/elements/button.variables +++ b/src/themes/packaged/github/elements/button.variables @@ -3,7 +3,7 @@ --------------------*/ /* Button Variables */ -@fontFamily: Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif; @textTransform: none; @fontWeight: bold; @textColor: #333333;