Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REFERENCE PR #11

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/utensils/breadcrumb/_breadcrumb.sass
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $breadcrumb-divider-color: $breadcrumb-color !default
border-radius: $breadcrumb-radii

.breadcrumb > li
+inline-block
display: inline-block
color: $breadcrumb-color
font-weight: $breadcrumb-font-weight
&:after
Expand Down
6 changes: 3 additions & 3 deletions app/assets/utensils/button_group/_button_group.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ $button-group-next-offset: 0.5em !default

.button-group
@extend %clearfix
+box-sizing(border-box)
box-sizing: border-box
position: relative

.button-group + .button-group
margin-left: $button-group-next-offset

.button-toolbar .button-group
+inline-block
display: inline-block

.button-group > a,
.button-group > button
Expand All @@ -26,7 +26,7 @@ $button-group-next-offset: 0.5em !default
z-index: 2

.button-group-vertical
+inline-block
display: inline-block

.button-group-vertical > a,
.button-group-vertical > button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $btn-size-multiplier: 2 !default
margin-top: $btn-block-spacing

.btn-transition
+transition(all $btn-speed $btn-timing-function)
transition: all $btn-speed $btn-timing-function

.btn-xsmall
+font-size($btn-base-font-size - ($btn-size-multiplier * 2))
Expand Down
13 changes: 10 additions & 3 deletions app/assets/utensils/button_semigloss/_button_semigloss.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@ $auto-generate-semigloss: false !default

// The base mixin for creating a semigloss button
@mixin semigloss-button($bgc, $color:#fff, $hover-percent:10%, $active-percent:15%, $border-percent:30%, $padding:$base-padding, $radii:$radii)
+box-sizing(border-box)
+inline-block
+linear-gradient(rgba(white, 0.2), rgba(black, 0.05), $fallback: $bgc)
box-sizing: border-box
display: inline-block

// The Bourbon linear-gradient mixin has been deprecated. Translated
// replacement CSS from the old source:
// https://github.com/thoughtbot/bourbon/blob/v4.2.2/app/assets/stylesheets/css3/_linear-gradient.scss
//+linear-gradient(rgba(white, 0.2), rgba(black, 0.05), $fallback: $bgc)

background: linear-gradient(rgba(white, 0.2), rgba(black, 0.05))

+font-size($base-font-size)
border: 1px solid darken($bgc, $border-percent)
border-radius: $radii
Expand Down
6 changes: 3 additions & 3 deletions app/assets/utensils/carousel/_carousel.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $carousel-height: 400px !default

.carousel
@extend %clearfix
+box-sizing(border-box)
box-sizing: border-box
overflow: hidden
position: relative
width: 100%
Expand All @@ -25,13 +25,13 @@ $carousel-height: 400px !default
z-index: 2

.carousel .carousel-panel
+box-sizing(border-box)
box-sizing: border-box
+user-select()
position: relative
float: left

.carousel-figure
+box-sizing(border-box)
box-sizing: border-box

.carousel[data-bindable="carousel"]
height: $carousel-height
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/collapse/_collapse.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $collapse-duration: $speed !default
$collapse-timing-function: $ease-in-out-quart !default

.collapse
+transition(height $collapse-duration $collapse-timing-function)
transition: height $collapse-duration $collapse-timing-function
position: relative
overflow: hidden
height: 0
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/container/_container.sass
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $container-padding-right: $container-padding-left !default

.container
@extend %clearfix
+box-sizing(border-box)
box-sizing: border-box
max-width: $base-width * 1px
margin-left: auto
margin-right: auto
Expand Down
4 changes: 2 additions & 2 deletions app/assets/utensils/cursor_hand/_cursor_hand.sass
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $cursor-closed-hand-path: "cursor_hand/cursors/closedhand.cur" !default
cursor: -webkit-grab

.handCursor
cursor: asset-url($cursor-open-hand-path, image), default !important
cursor: image-url($cursor-open-hand-path), default !important

.handGrab
cursor: hand
Expand All @@ -17,5 +17,5 @@ $cursor-closed-hand-path: "cursor_hand/cursors/closedhand.cur" !default
cursor: -webkit-grabbing

.handGrabCursor
cursor: asset-url($cursor-closed-hand-path, image), default !important
cursor: image-url($cursor-closed-hand-path), default !important

28 changes: 14 additions & 14 deletions app/assets/utensils/form_controls/_form_controls.sass
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ $form-actions-well-fill-bgc: darken($form-actions-well-bgc, 10%) !default

// Base container settings
.control-group
+box-sizing(border-box)
box-sizing: border-box
margin-bottom: $form-group-spacing

.form-actions
@extend %clearfix
+box-sizing(border-box)
box-sizing: border-box
background-color: transparent
border-top: 1px solid $form-border
margin-top: $form-group-spacing * 2
Expand Down Expand Up @@ -92,7 +92,7 @@ label
.hint-block
display: block
.hint-inline
+inline-block
display: inline-block

// Text input controls
input[type="text"],
Expand All @@ -110,8 +110,8 @@ input[type="week"],
input[type="number"],
.input-bg,
textarea
+inline-block
+box-sizing(border-box)
display: inline-block
box-sizing: border-box
+font-size($base-font-size)
background-color: $form-bgc
border: 1px solid $form-border
Expand All @@ -126,8 +126,8 @@ textarea
input[type="range"],
input[type="color"],
input[type="file"]
+inline-block
+box-sizing(border-box)
display: inline-block
box-sizing: border-box
+font-size($base-font-size)
color: $form-color
margin-bottom: 0.5em
Expand Down Expand Up @@ -159,17 +159,17 @@ textarea
// Define colors for placeholders
input,
textarea
@include placeholder
::placeholder
color: $placeholder
input.search-query
@include placeholder
::placeholder
color: $placeholder-search

// Select controls
select
+box-sizing(border-box)
box-sizing: border-box
+font-size($base-font-size)
+inline-block
display: inline-block
background-color: $form-bgc
border: 1px solid $form-border
color: $form-color
Expand All @@ -191,7 +191,7 @@ select[size]

.checkbox-inline,
.radio-inline
+inline-block
display: inline-block
margin-right: 1em
margin-bottom: 1.5em

Expand Down Expand Up @@ -265,7 +265,7 @@ input[type="file"]

.control-group.#{$_class_name}
input, textarea
@include placeholder
::placeholder
color: lighten($_color_value, 30%)

input, textarea, select
Expand All @@ -278,7 +278,7 @@ input[type="file"]
.hint-block.#{$_class_name}-msg
display: block
.hint-inline.#{$_class_name}-msg
+inline-block
display: inline-block

// HTML5 invalid states
input:focus:required:invalid,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/utensils/form_inline/_form_inline.sass
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

.form-inline .checkbox-label,
.form-inline .radio-label
+inline-block
display: inline-block
margin-right: 1em

.form-inline .checkbox-label,
Expand All @@ -34,7 +34,7 @@
margin-bottom: 0

.form-inline .control-label
+inline-block
display: inline-block

.form-inline input[type="button"],
.form-inline input[type="submit"],
Expand Down
4 changes: 2 additions & 2 deletions app/assets/utensils/form_stack/_form_stack.sass
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
margin-left: -1em

.form-stack .control-grouping
+box-sizing(border-box)
box-sizing: border-box
margin-bottom: $form-group-spacing
.control-group
+inline-block
display: inline-block
vertical-align: top
width: 31%
margin-right: 2%
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/icon_caret/_caret.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $caret-color-hover: $link-hover !default
$caret-color-active: $link-active !default

.caret
+inline-block
display: inline-block
vertical-align: middle
border-width: $caret-size
border-style: solid
Expand Down
6 changes: 3 additions & 3 deletions app/assets/utensils/lib/index.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import functions
@import mixins
@import placeholders
@import functions/index
@import mixins/index
@import placeholders/index

6 changes: 3 additions & 3 deletions app/assets/utensils/lib/mixins/_containers.sass
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@mixin base-column
+box-sizing(border-box)
box-sizing: border-box
display: block
float: left

@mixin base-column-right
+box-sizing(border-box)
box-sizing: border-box
display: block
float: right

@mixin base-row
+box-sizing(border-box)
box-sizing: border-box
+clearfix
display: block

4 changes: 2 additions & 2 deletions app/assets/utensils/lib/mixins/_float-fill.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// .col-flex
// +float-fill(100px, right)
@mixin float-fill($spacer, $float)
+box-sizing(border-box)
box-sizing: border-box
float: $float
width: 100%
@if $float == right
Expand All @@ -25,7 +25,7 @@
// float: right
// width: 100px
@mixin float-fill-3-col-center($spacer-left, $min-width:0px, $spacer-right:0)
+box-sizing(border-box)
box-sizing: border-box
float: left
min-width: $min-width
padding: 0 $spacer-right 0 $spacer-left
Expand Down
6 changes: 3 additions & 3 deletions app/assets/utensils/media_grid/_media_grid.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ $media-radii: $radii !default

.media-grid
@extend %clearfix
+box-sizing(border-box)
box-sizing: border-box
list-style: none

.media-grid > li
+box-sizing(border-box)
box-sizing: border-box
float: left

.media-item
+box-sizing(border-box)
box-sizing: border-box
border: 1px solid $media-border
border-radius: $media-radii
display: block
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/modal/_modal.sass
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $modal-offset-left: round($modal-width * 0.5) !default
+opacity($modal-opacity-in)

.modal
+box-sizing(border-box)
box-sizing: border-box
display: none
overflow: auto
position: fixed
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/normalize/_normalize.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import normalize-rails
@import normalize-rails/normalize

img
max-width: 100%
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/pager/_pager.sass
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $pager-disabled-bgc: $disabled-bgc !default
display: inline

.pager a
+inline-block
display: inline-block
background-color: $pager-bgc
border: 1px solid $pager-border
border-radius: 1em
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/pagination/_pagination.sass
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $pagination-disabled-bgc: transparent !default
$pagination-radii: $radii !default

.pagination
+inline-block
display: inline-block

.pagination > li
display: inline
Expand Down
4 changes: 2 additions & 2 deletions app/assets/utensils/progress/_progress.sass
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ $progress-list: nil !default
margin: $progress-height 0

.progress .bar
+box-sizing(border-box)
+transition(width $progress-speed)
box-sizing: border-box
transition: width $progress-speed
background-color: $progress-bar-bgc
width: 0
height: $progress-height
Expand Down
2 changes: 1 addition & 1 deletion app/assets/utensils/touch_scroller/_touch_scroller.sass
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// Scroll bar indicator
.scrollbar-pill
+opacity(0)
+transition(opacity 0.2s ease-in-out)
transition: opacity 0.2s ease-in-out
background-color: black
background-color: rgba(black, 0.5)
border-radius: 6px
Expand Down
4 changes: 2 additions & 2 deletions app/assets/utensils/transition/_transition.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ $transall-duration: $speed !default
$transall-timing-function: $ease-in-out-quart !default

.fade
+transition(opacity $fade-duration $fade-timing-function)
transition: opacity $fade-duration $fade-timing-function
+opacity(0)
&.in
+opacity(1)

.transall
+transition(all $transall-duration $transall-timing-function)
transition: all $transall-duration $transall-timing-function

2 changes: 1 addition & 1 deletion app/assets/utensils/well/_well.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $well-spacing: 1.25em !default
$well-bgc-fill: darken($well-bgc, 8%) !default

.well
+box-sizing(border-box)
box-sizing: border-box
background-color: $well-bgc
border: 1px solid $well-border
border-radius: $well-radii
Expand Down